diff options
| author | Dimitri Staessens <[email protected]> | 2021-06-21 20:24:03 +0200 |
|---|---|---|
| committer | Sander Vrijders <[email protected]> | 2021-06-23 08:36:48 +0200 |
| commit | 8ca960fa0274018cb4f94a1826029d74e6f762e0 (patch) | |
| tree | 268ffb6b24027d65c738a8edd196a1ed52134fcc /src/ipcpd/broadcast | |
| parent | ac53f8ea09b9a24321bc2c00832ba8a117115134 (diff) | |
| download | ouroboros-8ca960fa0274018cb4f94a1826029d74e6f762e0.tar.gz ouroboros-8ca960fa0274018cb4f94a1826029d74e6f762e0.zip | |
lib, ipcpd, irmd: Wrap pthread unlocks for cleanup
This add an ouroboros/pthread.h header that wraps the
pthread_..._unlock() functions for cleanup using
pthread_cleanup_push() as this casting is not safe (and there were
definitely bad casts in the code). The close() function is now also
wrapped for cleanup in ouroboros/sockets.h.
This allows enabling more compiler checks.
Signed-off-by: Dimitri Staessens <[email protected]>
Signed-off-by: Sander Vrijders <[email protected]>
Diffstat (limited to 'src/ipcpd/broadcast')
| -rw-r--r-- | src/ipcpd/broadcast/dt.c | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/src/ipcpd/broadcast/dt.c b/src/ipcpd/broadcast/dt.c index 8b15008b..00476027 100644 --- a/src/ipcpd/broadcast/dt.c +++ b/src/ipcpd/broadcast/dt.c @@ -40,6 +40,7 @@ #include <ouroboros/logs.h> #include <ouroboros/notifier.h> #include <ouroboros/utils.h> +#include <ouroboros/pthread.h> #include "common/comp.h" #include "common/connmgr.h" @@ -49,7 +50,6 @@ #include <stdlib.h> #include <inttypes.h> #include <string.h> -#include <pthread.h> struct nb { struct list_head next; @@ -156,8 +156,7 @@ static void dt_packet(uint8_t * buf, pthread_rwlock_rdlock(&fwd.nbs_lock); - pthread_cleanup_push((void (*))(void *) pthread_rwlock_unlock, - &fwd.nbs_lock); + pthread_cleanup_push(__cleanup_rwlock_unlock, &fwd.nbs_lock); list_for_each(p, &fwd.nbs) { struct nb * nb = list_entry(p, struct nb, next); @@ -168,6 +167,11 @@ static void dt_packet(uint8_t * buf, pthread_cleanup_pop(true); } +static void __cleanup_fqueue_destroy(void * fq) +{ + fqueue_destroy((fqueue_t *) fq); +} + static void * dt_reader(void * o) { fqueue_t * fq; @@ -182,8 +186,7 @@ static void * dt_reader(void * o) if (fq == NULL) return (void *) -1; - pthread_cleanup_push((void (*) (void *)) fqueue_destroy, - (void *) fq); + pthread_cleanup_push(__cleanup_fqueue_destroy, (void *) fq); while (true) { ret = fevent(fwd.set, fq, NULL); |