Remove extra locks causing deadlocks for wait_sync_flag function

[meshlink] / test / channels-cornercases.c

diff --git a/test/channels-cornercases.c b/test/channels-cornercases.c
index e76f735fa4fc735890dcd9ef9d8c1479a14a5c9f..90762bc55566fe7ca4bee604f546e6262006e130 100644 (file)
--- a/test/channels-cornercases.c
+++ b/test/channels-cornercases.c
@@ -19,54 +19,80 @@ void log_cb(meshlink_handle_t *mesh, meshlink_log_level_t level, const char *tex
        static struct timeval tv0;
        struct timeval tv;
 
-       if(tv0.tv_sec == 0)
+       if(tv0.tv_sec == 0) {
                gettimeofday(&tv0, NULL);
+       }
+
        gettimeofday(&tv, NULL);
        fprintf(stderr, "%u.%.03u ", (unsigned int)(tv.tv_sec - tv0.tv_sec), (unsigned int)tv.tv_usec / 1000);
 
-       if(mesh)
+       if(mesh) {
                fprintf(stderr, "(%s) ", mesh->name);
+       }
+
        fprintf(stderr, "[%d] %s\n", level, text);
 }
 
 void a_receive_cb(meshlink_handle_t *mesh, meshlink_channel_t *channel, const void *data, size_t len) {
-       if(len == 5 && !memcmp(data, "Hello", 5))
+       (void)mesh;
+       (void)channel;
+
+       if(len == 5 && !memcmp(data, "Hello", 5)) {
                b_responded = true;
-       else if(len == 0)
+       } else if(len == 0) {
                b_closed = true;
+       }
 }
 
 void b_receive_cb(meshlink_handle_t *mesh, meshlink_channel_t *channel, const void *data, size_t len) {
        // Send one message back, then close the channel.
-       if(len)
+       if(len) {
                meshlink_channel_send(mesh, channel, data, len);
+       }
 
        meshlink_channel_close(mesh, channel);
 }
 
 bool reject_cb(meshlink_handle_t *mesh, meshlink_channel_t *channel, uint16_t port, const void *data, size_t len) {
+       (void)mesh;
+       (void)channel;
+       (void)port;
+       (void)data;
+       (void)len;
+
        return false;
 }
 
 bool accept_cb(meshlink_handle_t *mesh, meshlink_channel_t *channel, uint16_t port, const void *data, size_t len) {
+       (void)port;
+
        meshlink_set_channel_accept_cb(mesh, NULL);
        meshlink_set_channel_receive_cb(mesh, channel, b_receive_cb);
-       if(data)
+
+       if(data) {
                b_receive_cb(mesh, channel, data, len);
+       }
+
        return true;
 }
 
 void poll_cb(meshlink_handle_t *mesh, meshlink_channel_t *channel, size_t len) {
+       (void)len;
+
        meshlink_set_channel_poll_cb(mesh, channel, NULL);
-       set_sync_flag(channel->priv);
+       set_sync_flag(channel->priv, true);
 }
 
 void poll_cb2(meshlink_handle_t *mesh, meshlink_channel_t *channel, size_t len) {
-       if(len)
+       (void)mesh;
+       (void)channel;
+
+       if(len) {
                a_nonzero_poll_cb = true;
+       }
 }
 
-int main(int argc, char *argv[]) {
+int main() {
        meshlink_handle_t *a, *b;
        open_meshlink_pair(&a, &b, "channels-cornercases");
        //meshlink_set_log_cb(a, MESHLINK_DEBUG, log_cb);
@@ -82,8 +108,7 @@ int main(int argc, char *argv[]) {
        meshlink_node_t *nb = meshlink_get_node(a, "b");
        assert(nb);
 
-       struct sync_flag channel_opened = {};
-       pthread_mutex_lock(&channel_opened.mutex);
+       struct sync_flag channel_opened = {.flag = false};
 
        meshlink_channel_t *channel = meshlink_channel_open(a, nb, 7, a_receive_cb, NULL, 0);
        assert(channel);
@@ -132,7 +157,7 @@ int main(int argc, char *argv[]) {
        assert(b_closed);
 
        // Try to create a second channel
-       
+
        meshlink_channel_t *channel2 = meshlink_channel_open(a, nb, 7, a_receive_cb, NULL, 0);
        assert(channel2);
        meshlink_set_channel_poll_cb(a, channel2, poll_cb2);