diff options
author | Jérémy Zurcher <jeremy@asynk.ch> | 2010-01-07 18:00:21 +0100 |
---|---|---|
committer | Jérémy Zurcher <jeremy@asynk.ch> | 2010-01-07 18:00:21 +0100 |
commit | de7ceedae12efca39ec9128e9accdbc3e6f416f9 (patch) | |
tree | 150b0754af9bbf3c7ffb963351a2a490b6e752de /lf_ring_buffer.c | |
parent | 82a5bc70e5f85d7d40e04e6a7dc567b086025421 (diff) | |
download | lock_free-de7ceedae12efca39ec9128e9accdbc3e6f416f9.zip lock_free-de7ceedae12efca39ec9128e9accdbc3e6f416f9.tar.gz |
parallel tests
Diffstat (limited to 'lf_ring_buffer.c')
-rw-r--r-- | lf_ring_buffer.c | 22 |
1 files changed, 15 insertions, 7 deletions
diff --git a/lf_ring_buffer.c b/lf_ring_buffer.c index ad866e0..30532fc 100644 --- a/lf_ring_buffer.c +++ b/lf_ring_buffer.c @@ -63,7 +63,7 @@ #endif /* initialize an empty lf_ring_buffer struct */ -lf_ring_buffer_t* lf_ring_buffer_create( int n_buf ) { +lf_ring_buffer_t* lf_ring_buffer_create( size_t n_buf ) { /* alloc ring_buffer struct */ lf_ring_buffer_t *r = malloc(sizeof(lf_ring_buffer_t)); if(r==NULL) return NULL; @@ -77,8 +77,8 @@ lf_ring_buffer_t* lf_ring_buffer_create( int n_buf ) { r->n_buf = n_buf; r->read_from = -1; r->write_to = 0; - r->write_delay=BACKOFF_DELAY_INIT; - r->read_delay=BACKOFF_DELAY_INIT; + r->write_delay = BACKOFF_DELAY_INIT; + r->read_delay = BACKOFF_DELAY_INIT; return r; } @@ -119,7 +119,9 @@ int lf_ring_buffer_write( lf_ring_buffer_t *r, void *data, int flags ) { if(IS_NOT_BLOCKING(flags)) return -1; st.tv_nsec=r->write_delay; nanosleep(&st,NULL); - if(r->write_delay<BACKOFF_DELAY_MAX) r->write_delay+=BACKOFF_DELAY_INC; + if( !(BACKOFF_INC_NOT(flags)) ) { + if(r->write_delay<BACKOFF_DELAY_MAX) r->write_delay+=BACKOFF_DELAY_INC; + } } } /* try to set read_from on idx if it has not been initialized yet @@ -132,7 +134,9 @@ int lf_ring_buffer_write( lf_ring_buffer_t *r, void *data, int flags ) { /* fill this buffer and mark it as filled */ memcpy( r->buffer[idx].data, data, LFRB_DATA_SIZE ); LFRB_MARK_AS_FILLED( r->buffer[idx] ); - if(r->write_delay>BACKOFF_DELAY_INIT) r->write_delay-=BACKOFF_DELAY_INC; + if( !(BACKOFF_INC_NOT(flags)) ) { + if(r->write_delay>BACKOFF_DELAY_INIT) r->write_delay-=BACKOFF_DELAY_INC; + } return 0; } @@ -163,12 +167,16 @@ int lf_ring_buffer_read( lf_ring_buffer_t *r, void *data, int flags ) { if(IS_NOT_BLOCKING(flags)) return -1; st.tv_nsec=r->read_delay; nanosleep(&st,NULL); - if(r->read_delay<BACKOFF_DELAY_MAX) r->read_delay+=BACKOFF_DELAY_INC; + if( !(BACKOFF_INC_NOT(flags)) ) { + if(r->read_delay<BACKOFF_DELAY_MAX) r->read_delay+=BACKOFF_DELAY_INC; + } } } /* finish the read process */ LFRB_MARK_AS_READ( r->buffer[idx] ); - if(r->read_delay>BACKOFF_DELAY_INIT) r->read_delay-=BACKOFF_DELAY_INC; + if( !(BACKOFF_INC_NOT(flags)) ) { + if(r->read_delay>BACKOFF_DELAY_INIT) r->read_delay-=BACKOFF_DELAY_INC; + } return 0; } |