X-Git-Url: http://git.meshlink.io/?p=meshlink;a=blobdiff_plain;f=test%2Fchannels-cornercases.c;h=d4644a42c00943a1d9e57d91c4975f02fb192940;hp=e76f735fa4fc735890dcd9ef9d8c1479a14a5c9f;hb=fec95d1221c2d7e2059d6ba2fe244211ccee95ad;hpb=e0d320398121de1fb235e800e60069655a9b68da diff --git a/test/channels-cornercases.c b/test/channels-cornercases.c index e76f735f..d4644a42 100644 --- a/test/channels-cornercases.c +++ b/test/channels-cornercases.c @@ -1,5 +1,9 @@ #define _GNU_SOURCE +#ifdef NDEBUG +#undef NDEBUG +#endif + #include #include #include @@ -11,66 +15,75 @@ #include "../src/meshlink.h" #include "utils.h" -volatile bool b_responded = false; -volatile bool b_closed = false; -volatile bool a_nonzero_poll_cb = false; - -void log_cb(meshlink_handle_t *mesh, meshlink_log_level_t level, const char *text) { - static struct timeval tv0; - struct timeval tv; +static volatile bool b_responded = false; +static volatile bool b_closed = false; +static volatile size_t a_poll_cb_len; - 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) - fprintf(stderr, "(%s) ", mesh->name); - fprintf(stderr, "[%d] %s\n", level, text); -} +static void a_receive_cb(meshlink_handle_t *mesh, meshlink_channel_t *channel, const void *data, size_t len) { + (void)mesh; + (void)channel; -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)) + if(len == 5 && !memcmp(data, "Hello", 5)) { b_responded = true; - else if(len == 0) + } else if(len == 0) { b_closed = true; + set_sync_flag(channel->priv, true); + } } -void b_receive_cb(meshlink_handle_t *mesh, meshlink_channel_t *channel, const void *data, size_t len) { +static 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) - meshlink_channel_send(mesh, channel, data, len); + if(len) { + assert(meshlink_channel_send(mesh, channel, data, len) == (ssize_t)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) { +static 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) { +static 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) { +static 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) - a_nonzero_poll_cb = true; +static void poll_cb2(meshlink_handle_t *mesh, meshlink_channel_t *channel, size_t len) { + (void)mesh; + (void)channel; + + a_poll_cb_len = len; + meshlink_set_channel_poll_cb(mesh, channel, NULL); + set_sync_flag(channel->priv, true); } -int main(int argc, char *argv[]) { +int main() { + meshlink_set_log_cb(NULL, MESHLINK_DEBUG, log_cb); + meshlink_handle_t *a, *b; open_meshlink_pair(&a, &b, "channels-cornercases"); - //meshlink_set_log_cb(a, MESHLINK_DEBUG, log_cb); - //meshlink_set_log_cb(b, MESHLINK_DEBUG, log_cb); // Set the callbacks. @@ -82,13 +95,11 @@ 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); + meshlink_channel_t *channel = meshlink_channel_open(a, nb, 7, a_receive_cb, &channel_opened, 0); assert(channel); - channel->priv = &channel_opened; meshlink_set_channel_poll_cb(a, channel, poll_cb); // Start MeshLink and wait for the channel to become connected. @@ -97,7 +108,8 @@ int main(int argc, char *argv[]) { assert(wait_sync_flag(&channel_opened, 20)); // Re-initialize everything - close_meshlink_pair(a, b, "channels-cornercases"); + meshlink_channel_close(a, channel); + close_meshlink_pair(a, b); b_responded = false; b_closed = false; channel_opened.flag = false; @@ -112,9 +124,8 @@ int main(int argc, char *argv[]) { nb = meshlink_get_node(a, "b"); assert(nb); - channel = meshlink_channel_open(a, nb, 7, a_receive_cb, NULL, 0); + channel = meshlink_channel_open(a, nb, 7, a_receive_cb, &channel_opened, 0); assert(channel); - channel->priv = &channel_opened; meshlink_set_channel_poll_cb(a, channel, poll_cb); assert(wait_sync_flag(&channel_opened, 20)); @@ -124,22 +135,27 @@ int main(int argc, char *argv[]) { // Send a message to b - meshlink_channel_send(a, channel, "Hello", 5); - - sleep(1); + struct sync_flag channel_closed = {.flag = false}; + channel->priv = &channel_closed; + assert(meshlink_channel_send(a, channel, "Hello", 5) == 5); + assert(wait_sync_flag(&channel_closed, 20)); assert(b_responded); assert(b_closed); // Try to create a second channel - - meshlink_channel_t *channel2 = meshlink_channel_open(a, nb, 7, a_receive_cb, NULL, 0); + + struct sync_flag channel_polled = {.flag = false}; + + meshlink_channel_t *channel2 = meshlink_channel_open(a, nb, 7, a_receive_cb, &channel_polled, 0); assert(channel2); meshlink_set_channel_poll_cb(a, channel2, poll_cb2); - sleep(1); + assert(wait_sync_flag(&channel_polled, 20)); - assert(!a_nonzero_poll_cb); + assert(0 == a_poll_cb_len); - return 0; + meshlink_channel_close(a, channel); + meshlink_channel_close(a, channel2); + close_meshlink_pair(a, b); }