Skip to content

Commit

Permalink
change ringbuffer api name
Browse files Browse the repository at this point in the history
  • Loading branch information
cloudwu committed Sep 27, 2012
1 parent 2e9e76d commit a30fb7e
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 6 deletions.
8 changes: 4 additions & 4 deletions mread.c
Expand Up @@ -462,7 +462,7 @@ mread_pull(struct mread_pool * self , int size) {
for (;;) {
int bytes = recv(s->fd, buffer, rd, MSG_DONTWAIT);
if (bytes > 0) {
ringbuffer_resize(rb, blk , bytes);
ringbuffer_shrink(rb, blk , bytes);
if (bytes < sz) {
_link_node(rb, self->active, s , blk);
s->status = SOCKET_SUSPEND;
Expand All @@ -472,20 +472,20 @@ mread_pull(struct mread_pool * self , int size) {
break;
}
if (bytes == 0) {
ringbuffer_resize(rb, blk, 0);
ringbuffer_shrink(rb, blk, 0);
_close_active(self);
return NULL;
}
if (bytes == -1) {
switch(errno) {
case EWOULDBLOCK:
ringbuffer_resize(rb, blk, 0);
ringbuffer_shrink(rb, blk, 0);
s->status = SOCKET_SUSPEND;
return NULL;
case EINTR:
continue;
default:
ringbuffer_resize(rb, blk, 0);
ringbuffer_shrink(rb, blk, 0);
_close_active(self);
return NULL;
}
Expand Down
2 changes: 1 addition & 1 deletion ringbuffer.c
Expand Up @@ -133,7 +133,7 @@ ringbuffer_collect(struct ringbuffer * rb) {
}

void
ringbuffer_resize(struct ringbuffer * rb, struct ringbuffer_block * blk, int size) {
ringbuffer_shrink(struct ringbuffer * rb, struct ringbuffer_block * blk, int size) {
if (size == 0) {
rb->head = block_offset(rb, blk);
return;
Expand Down
2 changes: 1 addition & 1 deletion ringbuffer.h
Expand Up @@ -15,7 +15,7 @@ void ringbuffer_delete(struct ringbuffer * rb);
void ringbuffer_link(struct ringbuffer *rb , struct ringbuffer_block * prev, struct ringbuffer_block * next);
struct ringbuffer_block * ringbuffer_alloc(struct ringbuffer * rb, int size);
int ringbuffer_collect(struct ringbuffer * rb);
void ringbuffer_resize(struct ringbuffer * rb, struct ringbuffer_block * blk, int size);
void ringbuffer_shrink(struct ringbuffer * rb, struct ringbuffer_block * blk, int size);
void ringbuffer_free(struct ringbuffer * rb, struct ringbuffer_block * blk);
int ringbuffer_data(struct ringbuffer * rb, struct ringbuffer_block * blk, int size, int skip, void **ptr);
void * ringbuffer_copy(struct ringbuffer * rb, struct ringbuffer_block * from, int skip, struct ringbuffer_block * to);
Expand Down

0 comments on commit a30fb7e

Please sign in to comment.