diff options
author | dimitri staessens <dimitri.staessens@intec.ugent.be> | 2016-07-06 17:13:06 +0200 |
---|---|---|
committer | dimitri staessens <dimitri.staessens@intec.ugent.be> | 2016-07-06 19:18:00 +0200 |
commit | 03256707111ce2409de0857c65482512e42d9238 (patch) | |
tree | eccf66deb8f0a8c1d0b610fbedc69142f5886243 /src/lib/shm_du_map.c | |
parent | 90c3c96b5c9b1e4db6bb6d1894a21aec54a965b1 (diff) | |
download | ouroboros-03256707111ce2409de0857c65482512e42d9238.tar.gz ouroboros-03256707111ce2409de0857c65482512e42d9238.zip |
lib: shm_du_map: Clean sdus upon exit
When an application closes the shm_du_map, it will clean all remaining
sdu's for that application. Adds a function to clean the shm_du_map on
close.
Fixes #20.
Diffstat (limited to 'src/lib/shm_du_map.c')
-rw-r--r-- | src/lib/shm_du_map.c | 29 |
1 files changed, 27 insertions, 2 deletions
diff --git a/src/lib/shm_du_map.c b/src/lib/shm_du_map.c index 6289857f..68452158 100644 --- a/src/lib/shm_du_map.c +++ b/src/lib/shm_du_map.c @@ -123,8 +123,10 @@ static void clean_sdus(struct shm_du_map * dum, pid_t api) if (kill(api, 0) == 0) { struct shm_ap_rbuff * rb; rb = shm_ap_rbuff_open(api); - shm_ap_rbuff_reset(rb); - shm_ap_rbuff_close(rb); + if (rb != NULL) { + shm_ap_rbuff_reset(rb); + shm_ap_rbuff_close(rb); + } } *dum->choked = 0; @@ -347,6 +349,24 @@ void * shm_du_map_sanitize(void * o) return (void *) 0; } +void shm_du_map_close_on_exit(struct shm_du_map * dum) +{ + if (dum == NULL) { + LOG_DBGF("Bogus input. Bugging out."); + return; + } + + clean_sdus(dum, getpid()); + + if (close(dum->fd) < 0) + LOG_DBGF("Couldn't close shared memory."); + + if (munmap(dum->shm_base, SHM_FILE_SIZE) == -1) + LOG_DBGF("Couldn't unmap shared memory."); + + free(dum); +} + void shm_du_map_close(struct shm_du_map * dum) { if (dum == NULL) { @@ -370,6 +390,11 @@ void shm_du_map_destroy(struct shm_du_map * dum) return; } + if (getpid() != *dum->api) { + LOG_DBGF("Only IRMd can destroy %s.", SHM_DU_MAP_FILENAME); + return; + } + if (close(dum->fd) < 0) LOG_DBGF("Couldn't close shared memory."); |