From a3fa3d4fec3994597b9c745709b4b85887913308 Mon Sep 17 00:00:00 2001 From: Dimitri Staessens Date: Wed, 29 Nov 2017 23:20:51 +0100 Subject: lib: Refactor shm_rdrbuff and shm_rbuff This refactors the creation of shm_rdrbuff and shm_rbuff elements. All cleanup is now handled and the common code between the _open() and _create() calls is moved to a static function. Common code between the pthread and lockless rbuff implementations was moved to shm_rbuff.c Signed-off-by: Dimitri Staessens Signed-off-by: Sander Vrijders --- src/lib/shm_rbuff_ll.c | 189 +------------------------------------------------ 1 file changed, 2 insertions(+), 187 deletions(-) (limited to 'src/lib/shm_rbuff_ll.c') diff --git a/src/lib/shm_rbuff_ll.c b/src/lib/shm_rbuff_ll.c index b77c4374..6ac9af47 100644 --- a/src/lib/shm_rbuff_ll.c +++ b/src/lib/shm_rbuff_ll.c @@ -20,193 +20,9 @@ * Foundation, Inc., http://www.fsf.org/about/contact/. */ -#include "config.h" - -#include -#include -#include -#include -#include - -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include - -#define FN_MAX_CHARS 255 - -#define SHM_RBUFF_FILE_SIZE ((SHM_BUFFER_SIZE) * sizeof(ssize_t) \ - + 3 * sizeof(size_t) \ - + sizeof(pthread_mutex_t) \ - + 2 * sizeof (pthread_cond_t)) - #define RB_HEAD __sync_fetch_and_add(rb->head, 0) #define RB_TAIL __sync_fetch_and_add(rb->tail, 0) -#define shm_rbuff_used(rb) ((RB_HEAD + (SHM_BUFFER_SIZE) - RB_TAIL) \ - & ((SHM_BUFFER_SIZE) - 1)) -#define shm_rbuff_free(rb) (shm_rbuff_used(rb) + 1 < (SHM_BUFFER_SIZE)) -#define shm_rbuff_empty(rb) (RB_HEAD == RB_TAIL) -#define head_el_ptr(rb) (rb->shm_base + RB_HEAD) -#define tail_el_ptr(rb) (rb->shm_base + RB_TAIL) - -struct shm_rbuff { - ssize_t * shm_base; /* start of entry */ - size_t * head; /* start of ringbuffer head */ - size_t * tail; /* start of ringbuffer tail */ - size_t * acl; /* access control */ - pthread_mutex_t * lock; /* lock all free space in shm */ - pthread_cond_t * add; /* SDU arrived */ - pthread_cond_t * del; /* SDU removed */ - pid_t api; /* api of the owner */ - int port_id; /* port_id of the flow */ -}; - -struct shm_rbuff * shm_rbuff_create(pid_t api, int port_id) -{ - struct shm_rbuff * rb; - int shm_fd; - ssize_t * shm_base; - pthread_mutexattr_t mattr; - pthread_condattr_t cattr; - char fn[FN_MAX_CHARS]; - mode_t mask; - - sprintf(fn, SHM_RBUFF_PREFIX "%d.%d", api, port_id); - - rb = malloc(sizeof(*rb)); - if (rb == NULL) - return NULL; - - mask = umask(0); - - shm_fd = shm_open(fn, O_CREAT | O_EXCL | O_RDWR, 0666); - if (shm_fd == -1) { - free(rb); - return NULL; - } - - umask(mask); - - if (ftruncate(shm_fd, SHM_RBUFF_FILE_SIZE - 1) < 0) { - free(rb); - close(shm_fd); - return NULL; - } - - shm_base = mmap(NULL, - SHM_RBUFF_FILE_SIZE, - PROT_READ | PROT_WRITE, - MAP_SHARED, - shm_fd, - 0); - - close(shm_fd); - - if (shm_base == MAP_FAILED) { - shm_unlink(fn); - free(rb); - return NULL; - } - - rb->shm_base = shm_base; - rb->head = (size_t *) (rb->shm_base + (SHM_BUFFER_SIZE)); - rb->tail = rb->head + 1; - rb->acl = rb->tail + 1; - rb->lock = (pthread_mutex_t *) (rb->acl + 1); - rb->add = (pthread_cond_t *) (rb->lock + 1); - rb->del = rb->add + 1; - - pthread_mutexattr_init(&mattr); -#ifdef HAVE_ROBUST_MUTEX - pthread_mutexattr_setrobust(&mattr, PTHREAD_MUTEX_ROBUST); -#endif - pthread_mutexattr_setpshared(&mattr, PTHREAD_PROCESS_SHARED); - pthread_mutex_init(rb->lock, &mattr); - - pthread_condattr_init(&cattr); - pthread_condattr_setpshared(&cattr, PTHREAD_PROCESS_SHARED); -#ifndef __APPLE__ - pthread_condattr_setclock(&cattr, PTHREAD_COND_CLOCK); -#endif - pthread_cond_init(rb->add, &cattr); - pthread_cond_init(rb->del, &cattr); - - *rb->acl = ACL_RDWR; - *rb->head = 0; - *rb->tail = 0; - - rb->api = api; - rb->port_id = port_id; - - return rb; -} - -struct shm_rbuff * shm_rbuff_open(pid_t api, int port_id) -{ - struct shm_rbuff * rb; - int shm_fd; - ssize_t * shm_base; - char fn[FN_MAX_CHARS]; - - sprintf(fn, SHM_RBUFF_PREFIX "%d.%d", api, port_id); - - rb = malloc(sizeof(*rb)); - if (rb == NULL) - return NULL; - - shm_fd = shm_open(fn, O_RDWR, 0666); - if (shm_fd == -1) { - free(rb); - return NULL; - } - - shm_base = mmap(NULL, - SHM_RBUFF_FILE_SIZE, - PROT_READ | PROT_WRITE, - MAP_SHARED, - shm_fd, - 0); - - close(shm_fd); - - if (shm_base == MAP_FAILED) { - shm_unlink(fn); - free(rb); - return NULL; - } - - rb->shm_base = shm_base; - rb->head = (size_t *) (rb->shm_base + (SHM_BUFFER_SIZE)); - rb->tail = rb->head + 1; - rb->acl = rb->tail + 1; - rb->lock = (pthread_mutex_t *) (rb->acl + 1); - rb->add = (pthread_cond_t *) (rb->lock + 1); - rb->del = rb->add + 1; - - rb->api = api; - rb->port_id = port_id; - - return rb; -} - -void shm_rbuff_close(struct shm_rbuff * rb) -{ - assert(rb); - - munmap(rb->shm_base, SHM_RBUFF_FILE_SIZE); - - free(rb); -} - void shm_rbuff_destroy(struct shm_rbuff * rb) { char fn[FN_MAX_CHARS]; @@ -215,10 +31,9 @@ void shm_rbuff_destroy(struct shm_rbuff * rb) sprintf(fn, SHM_RBUFF_PREFIX "%d.%d", rb->api, rb->port_id); - munmap(rb->shm_base, SHM_RBUFF_FILE_SIZE); - shm_unlink(fn); + shm_rbuff_close(rb); - free(rb); + shm_unlink(fn); } int shm_rbuff_write(struct shm_rbuff * rb, -- cgit v1.2.3