X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=libringbuffer%2Fshm.c;h=4afb0c6e25b57f0083d1feb4532b54cbb2b612ec;hb=bdcf8d826c422e00a533d99bee937ddd0f877842;hp=fc7fbfb2c0642ca0c410ddae0c6cd1a45b5a792e;hpb=4318ae1be57eb7983ab4857a7a8eeb4a030a8216;p=lttng-ust.git diff --git a/libringbuffer/shm.c b/libringbuffer/shm.c index fc7fbfb2..4afb0c6e 100644 --- a/libringbuffer/shm.c +++ b/libringbuffer/shm.c @@ -17,6 +17,8 @@ #include #include #include +#include +#include struct shm_object_table *shm_object_table_create(size_t max_nb_obj) { @@ -203,15 +205,19 @@ void shmp_object_destroy(struct shm_object *obj) { int ret, i; - ret = munmap(obj->memory_map, obj->memory_map_size); - if (ret) { - PERROR("umnmap"); - assert(0); - } - ret = close(obj->shm_fd); - if (ret) { - PERROR("close"); - assert(0); + if (!obj->is_shadow) { + ret = munmap(obj->memory_map, obj->memory_map_size); + if (ret) { + PERROR("umnmap"); + assert(0); + } + } + if (obj->shm_fd >= 0) { + ret = close(obj->shm_fd); + if (ret) { + PERROR("close"); + assert(0); + } } for (i = 0; i < 2; i++) { if (obj->wait_fd[i] < 0)