X-Git-Url: http://git.meshlink.io/?a=blobdiff_plain;f=test%2Fchannels-cornercases.c;h=3e70686842fae824b5ef503f5a6d16331c8df836;hb=9a2520c36431a8a5fd90451e97f488c22f4decc5;hp=ba4843d8672b4a65be456b58a357f931ccd2ff44;hpb=dc0e52cb3e42620c3139e713b373d130aa30b698;p=meshlink

diff --git a/test/channels-cornercases.c b/test/channels-cornercases.c
index ba4843d8..3e706868 100644
--- a/test/channels-cornercases.c
+++ b/test/channels-cornercases.c
@@ -11,29 +11,11 @@
 #include "../src/meshlink.h"
 #include "utils.h"
 
-volatile bool b_responded = false;
-volatile bool b_closed = false;
-volatile bool a_nonzero_poll_cb = false;
+static volatile bool b_responded = false;
+static volatile bool b_closed = false;
+static volatile size_t a_poll_cb_len;
 
-void log_cb(meshlink_handle_t *mesh, meshlink_log_level_t level, const char *text) {
-	static struct timeval tv0;
-	struct timeval tv;
-
-	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);
-}
-
-void a_receive_cb(meshlink_handle_t *mesh, meshlink_channel_t *channel, const void *data, size_t len) {
+static void a_receive_cb(meshlink_handle_t *mesh, meshlink_channel_t *channel, const void *data, size_t len) {
 	(void)mesh;
 	(void)channel;
 
@@ -41,10 +23,11 @@ void a_receive_cb(meshlink_handle_t *mesh, meshlink_channel_t *channel, const vo
 		b_responded = true;
 	} 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);
@@ -53,7 +36,7 @@ void b_receive_cb(meshlink_handle_t *mesh, meshlink_channel_t *channel, const vo
 	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;
@@ -63,7 +46,7 @@ bool reject_cb(meshlink_handle_t *mesh, meshlink_channel_t *channel, uint16_t po
 	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);
@@ -76,27 +59,27 @@ bool accept_cb(meshlink_handle_t *mesh, meshlink_channel_t *channel, uint16_t po
 	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, true);
 }
 
-void poll_cb2(meshlink_handle_t *mesh, meshlink_channel_t *channel, size_t len) {
+static void poll_cb2(meshlink_handle_t *mesh, meshlink_channel_t *channel, size_t len) {
 	(void)mesh;
 	(void)channel;
 
-	if(len) {
-		a_nonzero_poll_cb = true;
-	}
+	a_poll_cb_len = len;
+	meshlink_set_channel_poll_cb(mesh, channel, NULL);
+	set_sync_flag(channel->priv, true);
 }
 
 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.
 
@@ -109,7 +92,6 @@ int main() {
 	assert(nb);
 
 	struct sync_flag channel_opened = {.flag = false};
-	pthread_mutex_lock(&channel_opened.mutex);
 
 	meshlink_channel_t *channel = meshlink_channel_open(a, nb, 7, a_receive_cb, NULL, 0);
 	assert(channel);
@@ -123,7 +105,8 @@ int main() {
 	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;
@@ -150,22 +133,29 @@ int main() {
 
 	// Send a message to b
 
-	meshlink_channel_send(a, channel, "Hello", 5);
+	struct sync_flag channel_closed = {.flag = false};
+	channel->priv = &channel_closed;
 
-	sleep(1);
+	meshlink_channel_send(a, channel, "Hello", 5);
 
+	assert(wait_sync_flag(&channel_closed, 20));
 	assert(b_responded);
 	assert(b_closed);
 
 	// Try to create a second channel
 
+	struct sync_flag channel_polled = {.flag = false};
+
 	meshlink_channel_t *channel2 = meshlink_channel_open(a, nb, 7, a_receive_cb, NULL, 0);
 	assert(channel2);
+	channel2->priv = &channel_polled;
 	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);
 }