Set robust flag for mutexes to avoid dead locks.

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 72b01cfed09779cdddd06b47af972466318f4f56..1aabfd3a9417150438a224259413892a1f99363f 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -796,6 +796,7 @@ int main (void)
        pthread_mutexattr_t mattr;
        if (pthread_mutexattr_init(&mattr) != 0) return 0;
        if (pthread_mutexattr_setpshared(&mattr, PTHREAD_PROCESS_SHARED) != 0) return 0;
+       if (pthread_mutexattr_setrobust(&mattr, PTHREAD_MUTEX_ROBUST) != 0) return 0;
        return 1;
 }
 ")

diff --git a/src/libutil/mem_pool.c b/src/libutil/mem_pool.c
index 6c9ee6f1637ab4cf3786bd73834eeb55d71f04ab..560ac553965bcc78c0765fb33af57eecc334772d 100644 (file)
--- a/src/libutil/mem_pool.c
+++ b/src/libutil/mem_pool.c
@@ -819,6 +819,7 @@ rspamd_mempool_get_mutex (rspamd_mempool_t * pool)
 
                pthread_mutexattr_init (&mattr);
                pthread_mutexattr_setpshared (&mattr, PTHREAD_PROCESS_SHARED);
+               pthread_mutexattr_setrobust (&mattr, PTHREAD_MUTEX_ROBUST);
                pthread_mutex_init (res, &mattr);
                rspamd_mempool_add_destructor (pool,
                                (rspamd_mempool_destruct_t)pthread_mutex_destroy, res);