Merge branch 'mutex-1' of https://github.com/mannol/toxcore

3 files changed, 24 insertions, 12 deletions

diff --git a/toxcore/net_crypto.c b/toxcore/net_crypto.c
index 2f125fdc..87541d9f 100644
--- a/toxcore/net_crypto.c
+++ b/toxcore/net_crypto.c
@@ -2696,22 +2696,12 @@ Net_Crypto *new_net_crypto(DHT *dht, TCP_Proxy_Info *proxy_info)
     if (temp == NULL)
         return NULL;
 
-    pthread_mutexattr_t attr;
-
-    if (pthread_mutexattr_init(&attr) == 0) {
-        if (pthread_mutexattr_settype(&attr, PTHREAD_MUTEX_RECURSIVE) != 0 || pthread_mutex_init(&temp->tcp_mutex, &attr) != 0
-                || pthread_mutex_init(&temp->connections_mutex, NULL) != 0) {
-            pthread_mutexattr_destroy(&attr);
-            free(temp);
-            return NULL;
-        }
-    } else {
+    if (create_recursive_mutex(&temp->tcp_mutex) != 0 ||
+            pthread_mutex_init(&temp->connections_mutex, NULL) != 0) {
         free(temp);
         return NULL;
     }
 
-    pthread_mutexattr_destroy(&attr);
-
     temp->dht = dht;
 
     new_keys(temp);
diff --git a/toxcore/util.c b/toxcore/util.c
index 3d444b07..93e63ac2 100644
--- a/toxcore/util.c
+++ b/toxcore/util.c
@@ -162,3 +162,22 @@ int load_state(load_state_callback_func load_state_callback, void *outer,
 
     return length == 0 ? 0 : -1;
 };
+
+int create_recursive_mutex(pthread_mutex_t *mutex)
+{
+    pthread_mutexattr_t attr;
+
+    if (pthread_mutexattr_init(&attr) != 0)
+        return -1;
+
+    if (pthread_mutexattr_settype(&attr, PTHREAD_MUTEX_RECURSIVE) != 0)
+        return -1;
+
+    /* Create queue mutex */
+    if (pthread_mutex_init(mutex, &attr) != 0)
+        return -1;
+
+    pthread_mutexattr_destroy(&attr);
+
+    return 0;
+}
diff --git a/toxcore/util.h b/toxcore/util.h
index 007db079..7cd6bb8b 100644
--- a/toxcore/util.h
+++ b/toxcore/util.h
@@ -27,6 +27,7 @@
 
 #include <stdbool.h>
 #include <stdint.h>
+#include <pthread.h>
 
 #define MIN(a,b) (((a)<(b))?(a):(b))
 
@@ -52,4 +53,6 @@ typedef int (*load_state_callback_func)(void *outer, const uint8_t *data, uint32
 int load_state(load_state_callback_func load_state_callback, void *outer,
                const uint8_t *data, uint32_t length, uint16_t cookie_inner);
 
+int create_recursive_mutex(pthread_mutex_t *mutex);
+
 #endif /* __UTIL_H__ */