Remove extra locks causing deadlocks for wait_sync_flag function

[meshlink] / test / utils.c

diff --git a/test/utils.c b/test/utils.c
index 033b11dc9b5db38868b4ac5db32e58055507b4d4..a2b7b143972991d824ad23b9922860172f279921 100644 (file)
--- a/test/utils.c
+++ b/test/utils.c
@@ -1,4 +1,4 @@
-#define _GNU_SOURCE
+#define _GNU_SOURCE 1
 
 #include <stdio.h>
 #include <stdlib.h>
@@ -38,11 +38,13 @@ void open_meshlink_pair(meshlink_handle_t **pa, meshlink_handle_t **pb, const ch
        *pa = *pb = NULL;
 
        char *a_name, *b_name;
+       int ret_val;
+       (void)ret_val;
 
-       asprintf(&a_name, "%s_conf.1", prefix);
+       ret_val = asprintf(&a_name, "%s_conf.1", prefix);
        assert(a_name);
 
-       asprintf(&b_name, "%s_conf.2", prefix);
+       ret_val = asprintf(&b_name, "%s_conf.2", prefix);
        assert(b_name);
 
        meshlink_handle_t *a = meshlink_open(a_name, "a", prefix, DEV_CLASS_BACKBONE);
@@ -85,15 +87,11 @@ void start_meshlink_pair(meshlink_handle_t *a, meshlink_handle_t *b) {
        a->priv = &pair_status;
        meshlink_set_node_status_cb(a, pair_status_cb);
 
-       pthread_mutex_lock(&pair_status.mutex);
-
        meshlink_start(a);
        meshlink_start(b);
 
        assert(wait_sync_flag(&pair_status, 5));
 
-       pthread_mutex_unlock(&pair_status.mutex);
-
        meshlink_set_node_status_cb(a, NULL);
        a->priv = NULL;
 }
@@ -104,17 +102,19 @@ void stop_meshlink_pair(meshlink_handle_t *a, meshlink_handle_t *b) {
 }
 
 void close_meshlink_pair(meshlink_handle_t *a, meshlink_handle_t *b, const char *prefix) {
+       int ret_val;
+       (void)ret_val;
        meshlink_close(a);
        meshlink_close(b);
 
        if(prefix) {
                char *a_name, *b_name;
 
-               asprintf(&a_name, "%s_conf.1", prefix);
+               ret_val = asprintf(&a_name, "%s_conf.1", prefix);
                assert(a_name);
                assert(meshlink_destroy(a_name));
 
-               asprintf(&b_name, "%s_conf.2", prefix);
+               ret_val = asprintf(&b_name, "%s_conf.2", prefix);
                assert(b_name);
                assert(meshlink_destroy(b_name));
        }