X-Git-Url: http://git.meshlink.io/?a=blobdiff_plain;f=test%2Fchannels-cornercases.c;h=f2a01ba0b801aece4cafcee99b605f7e3c506d88;hb=9cde0d32cf209388cc59b06b7dcb0c3432f97da5;hp=e76f735fa4fc735890dcd9ef9d8c1479a14a5c9f;hpb=e0d320398121de1fb235e800e60069655a9b68da;p=meshlink

diff --git a/test/channels-cornercases.c b/test/channels-cornercases.c
index e76f735f..f2a01ba0 100644
--- a/test/channels-cornercases.c
+++ b/test/channels-cornercases.c
@@ -11,66 +11,93 @@
 #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 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)
+	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))
+static void a_receive_cb(meshlink_handle_t *mesh, meshlink_channel_t *channel, const void *data, size_t len) {
+	(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;
+		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)
+	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) {
+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,8 +109,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);
@@ -97,6 +123,7 @@ int main(int argc, char *argv[]) {
 	assert(wait_sync_flag(&channel_opened, 20));
 
 	// Re-initialize everything
+	meshlink_channel_close(a, channel);
 	close_meshlink_pair(a, b, "channels-cornercases");
 	b_responded = false;
 	b_closed = false;
@@ -124,22 +151,31 @@ int main(int argc, char *argv[]) {
 
 	// 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);
+
+	meshlink_channel_close(a, channel);
+	meshlink_channel_close(a, channel2);
+	close_meshlink_pair(a, b, "channels-cornercases");
 
 	return 0;
 }