diff options
| author | Sander Vrijders <sander.vrijders@intec.ugent.be> | 2016-05-15 09:51:54 +0200 |
|---|---|---|
| committer | Sander Vrijders <sander.vrijders@intec.ugent.be> | 2016-05-15 09:51:54 +0200 |
| commit | bc94dd6436a62bda6bf3ba11a20dbc50f7094e5a (patch) | |
| tree | eb5162928789f8c0eed25a8d00a53d2f93d9cb9e /src/lib/shm_ap_rbuff.c | |
| parent | 1712f5d78567bbad7a0608fb1428be000a83fe4a (diff) | |
| parent | e79f151adc07538fbb1057442df2c1fe6ac01836 (diff) | |
| download | ouroboros-bc94dd6436a62bda6bf3ba11a20dbc50f7094e5a.tar.gz ouroboros-bc94dd6436a62bda6bf3ba11a20dbc50f7094e5a.zip | |
Merged in dstaesse/ouroboros/udp-lockfix (pull request #86)
ipcpd: shim-udp: fixed locking.
Diffstat (limited to 'src/lib/shm_ap_rbuff.c')
| -rw-r--r-- | src/lib/shm_ap_rbuff.c | 22 |
1 files changed, 9 insertions, 13 deletions
diff --git a/src/lib/shm_ap_rbuff.c b/src/lib/shm_ap_rbuff.c index da6f0e33..0524a96c 100644 --- a/src/lib/shm_ap_rbuff.c +++ b/src/lib/shm_ap_rbuff.c @@ -38,7 +38,7 @@ #define SHM_RBUFF_FILE_SIZE (SHM_RBUFF_SIZE * sizeof(struct rb_entry) \ + 2 * sizeof(size_t) + sizeof(pthread_mutex_t)) -#define shm_rbuff_used(rb)((*rb->ptr_head + SHM_RBUFF_SIZE - *rb->ptr_tail)\ +#define shm_rbuff_used(rb)((*rb->ptr_head + SHM_RBUFF_SIZE - *rb->ptr_tail) \ & (SHM_RBUFF_SIZE - 1)) #define shm_rbuff_free(rb)(shm_rbuff_used(rb) + 1 < SHM_RBUFF_SIZE) @@ -105,12 +105,10 @@ struct shm_ap_rbuff * shm_ap_rbuff_create() return NULL; } - rb->shm_base = shm_base; - rb->ptr_head = (size_t *) (rb->shm_base + SHM_RBUFF_SIZE); - rb->ptr_tail = (size_t *) - ((uint8_t *) rb->ptr_head + sizeof(size_t)); - rb->shm_mutex = (pthread_mutex_t *) - ((uint8_t *) rb->ptr_tail + sizeof(size_t)); + rb->shm_base = shm_base; + rb->ptr_head = (size_t *) (rb->shm_base + SHM_RBUFF_SIZE); + rb->ptr_tail = rb->ptr_head + 1; + rb->shm_mutex = (pthread_mutex_t *) (rb->ptr_tail + 1); pthread_mutexattr_init(&attr); pthread_mutexattr_setpshared(&attr, PTHREAD_PROCESS_SHARED); @@ -165,12 +163,10 @@ struct shm_ap_rbuff * shm_ap_rbuff_open(pid_t pid) return NULL; } - rb->shm_base = shm_base; - rb->ptr_head = (size_t *) (rb->shm_base + SHM_RBUFF_SIZE); - rb->ptr_tail = (size_t *) - ((uint8_t *) rb->ptr_head + sizeof(size_t)); - rb->shm_mutex = (pthread_mutex_t *) - ((uint8_t *) rb->ptr_tail + sizeof(size_t)); + rb->shm_base = shm_base; + rb->ptr_head = (size_t *) (rb->shm_base + SHM_RBUFF_SIZE); + rb->ptr_tail = rb->ptr_head + 1; + rb->shm_mutex = (pthread_mutex_t *) (rb->ptr_tail + 1); rb->fd = shm_fd; rb->pid = pid; |