X-Git-Url: http://git.meshlink.io/?p=meshlink;a=blobdiff_plain;f=test%2Fecho-fork.c;h=94000c68cecfb157ddf70ce2395ed2ca4c9b0b99;hp=ee0dfb263da36b7ca640545bba7a16d857fc1860;hb=fec95d1221c2d7e2059d6ba2fe244211ccee95ad;hpb=53eb21510cf90c47f11d81a5b45a5f4d34d738f1

diff --git a/test/echo-fork.c b/test/echo-fork.c
old mode 100755
new mode 100644
index ee0dfb26..94000c68
--- a/test/echo-fork.c
+++ b/test/echo-fork.c
@@ -1,223 +1,197 @@
 #define _GNU_SOURCE
+
+#ifdef NDEBUG
+#undef NDEBUG
+#endif
+
 #include <stdio.h>
 #include <unistd.h>
 #include <stdlib.h>
 #include <string.h>
+#include <limits.h>
+#include <assert.h>
+#include <sys/types.h>
+#include <sys/wait.h>
 
-#include "../src/meshlink.h"
+#ifdef __linux__
+#include <sys/prctl.h>
+#endif
 
-volatile bool bar_reachable = false;
-volatile bool bar_responded = false;
+#include "meshlink.h"
+#include "utils.h"
 
-void log_cb(meshlink_handle_t *mesh, meshlink_log_level_t level, const char *text) {
-	if(mesh)
-		fprintf(stderr, "(%s) ", mesh->name);
-	fprintf(stderr, "[%d] %s\n", level, text);
-}
+/*
+ * To run this test case, direct a large file to strd
+ */
 
-void status_cb(meshlink_handle_t *mesh, meshlink_node_t *node, bool reachable) {
-	if(!strcmp(node->name, "bar"))
-		bar_reachable = reachable;
-}
+static struct sync_flag a_started;
+static struct sync_flag a_stopped;
+static struct sync_flag b_responded;
+
+static void a_receive_cb(meshlink_handle_t *mesh, meshlink_channel_t *channel, const void *data, size_t len) {
+	(void)mesh;
+	(void)channel;
+	(void)data;
+	(void)len;
 
-void foo_receive_cb(meshlink_handle_t *mesh, meshlink_channel_t *channel, const void *data, size_t len) {
-	fprintf(stderr, "Foo received from Bar:\n%s", (char*)data);
-	fprintf(stderr, "==============================\n");
-	fprintf(stderr, "%s", (char*)data );
-	fprintf(stdout, "%s", (char*)data );
+	// One way only.
 }
 
-void bar_receive_cb(meshlink_handle_t *mesh, meshlink_channel_t *channel, const void *data, size_t len) {
-	// Echo the data back.
-	fprintf(stderr, "Bar received:\n%s", (char*)data);
-	fprintf(stderr, "==============================\n");
-	meshlink_channel_send(mesh, channel, data, len);
+static void b_receive_cb(meshlink_handle_t *mesh, meshlink_channel_t *channel, const void *data, size_t len) {
+	(void)mesh;
+	(void)channel;
+
+	if(!len) {
+		set_sync_flag(&a_stopped, true);
+		meshlink_channel_close(mesh, channel);
+		return;
+	}
+
+	assert(write(1, data, len) == (ssize_t)len);
 }
 
-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) {
-	if(port != 7)
+static bool accept_cb(meshlink_handle_t *mesh, meshlink_channel_t *channel, uint16_t port, const void *data, size_t len) {
+	if(port != 7) {
 		return false;
-	meshlink_set_channel_receive_cb(mesh, channel, bar_receive_cb);
-	if(data)
-		bar_receive_cb(mesh, channel, data, len);
-	return true;
-}
+	}
 
-void poll_cb(meshlink_handle_t *mesh, meshlink_channel_t *channel, size_t len) {
-	meshlink_set_channel_poll_cb(mesh, channel, NULL);
-	bar_responded=true;
-}
+	set_sync_flag(&a_started, true);
 
-int main1(int rfd, int wfd) {
-	meshlink_set_log_cb(NULL, MESHLINK_DEBUG, log_cb);
+	meshlink_set_channel_receive_cb(mesh, channel, b_receive_cb);
 
-	meshlink_handle_t *mesh1 = meshlink_open("channels_conf.1", "foo", "channels", DEV_CLASS_BACKBONE);
-	if(!mesh1) {
-		fprintf(stderr, "Could not initialize configuration for foo\n");
-		return 1;
+	if(data) {
+		b_receive_cb(mesh, channel, data, len);
 	}
 
-	meshlink_add_address(mesh1, "localhost");
-
-	char *data = meshlink_export(mesh1);
-	if(!data) {
-		fprintf(stderr, "Foo could not export its configuration\n");
-		return 1;
-	}
+	return true;
+}
 
-	size_t len = strlen(data);
-	write(wfd, &len, sizeof len);
-	write(wfd, data, len);
-	free(data);
+static void poll_cb(meshlink_handle_t *mesh, meshlink_channel_t *channel, size_t len) {
+	(void)len;
 
-	read(rfd, &len, sizeof len);
-	char indata[len + 1];
-	read(rfd, indata, len);
-	indata[len] = 0;
+	meshlink_set_channel_poll_cb(mesh, channel, NULL);
+	set_sync_flag(&b_responded, true);
+}
 
-	fprintf(stderr, "Foo exchanged data\n");
+static int main1(void) {
+	close(1);
 
-	meshlink_import(mesh1, indata);
+	meshlink_handle_t *mesh = meshlink_open("echo-fork_conf.1", "a", "echo-fork", DEV_CLASS_BACKBONE);
+	assert(mesh);
 
-	meshlink_set_channel_accept_cb(mesh1, reject_cb);
-	meshlink_set_node_status_cb(mesh1, status_cb);
+	meshlink_set_channel_accept_cb(mesh, reject_cb);
 
-	if(!meshlink_start(mesh1)) {
-		fprintf(stderr, "Foo could not start\n");
-		return 1;
-	}
+	assert(meshlink_start(mesh));
 
-	for(int i = 0; i < 20; i++) {
-		sleep(1);
-		if(bar_reachable)
-			break;
-	}
+	// Open a channel.
 
-	if(!bar_reachable) {
-		fprintf(stderr, "Bar not reachable for foo after 20 seconds\n");
-		return 1;
-	}
+	meshlink_node_t *b = meshlink_get_node(mesh, "b");
+	assert(b);
 
-	// Open a channel from foo to bar.
-	
-	meshlink_node_t *bar = meshlink_get_node(mesh1, "bar");
-	if(!bar) {
-		fprintf(stderr, "Foo could not find bar\n");
-		return 1;
-	}
+	meshlink_channel_t *channel = meshlink_channel_open(mesh, b, 7, a_receive_cb, NULL, 0);
+	assert(channel);
 
-	meshlink_channel_t *channel = meshlink_channel_open(mesh1, bar, 7, foo_receive_cb, NULL, 0);
-	meshlink_set_channel_poll_cb(mesh1, channel, poll_cb);
+	meshlink_set_channel_poll_cb(mesh, channel, poll_cb);
 
 	// read and buffer stdin
-	int BUF_SIZE = 1024;
+	int BUF_SIZE = 1024 * 1024;
 	char buffer[BUF_SIZE];
-	size_t contentSize = 1;
-	char *content = malloc( sizeof(char) * BUF_SIZE );
-	if (!content) {
-		fprintf(stderr, "Could not allocate buffer\n");
-	}
 
-	fprintf(stderr, "Foo reading from stdin...\n");
-	content[0] = '\0';
-	while(fgets(buffer,BUF_SIZE,stdin)) {
-		char *old = content;
-		contentSize += strlen(buffer);
-		content = realloc(content, contentSize);
-		strcat(content,buffer);
-	}
+	assert(wait_sync_flag(&b_responded, 20));
 
-	for(int i = 0; i < 5; i++) {
-		sleep(1);
-		if(bar_responded)
-			break;
-	}
+	do {
+		ssize_t len = read(0, buffer, BUF_SIZE);
 
-	if(!bar_responded) {
-		fprintf(stderr, "Bar did not respond to foo's channel message\n");
-		return 1;
-	}
+		if(len <= 0) {
+			break;
+		}
 
-	fprintf(stderr, "Foo sending:\n%s", content);
-	fprintf(stderr, "==============================\n");
+		char *p = buffer;
 
-	if(meshlink_channel_send(mesh1, channel, content, contentSize) != contentSize)
-		fprintf(stderr, "Could not send whole message\n");
+		while(len > 0) {
+			ssize_t sent = meshlink_channel_send(mesh, channel, p, len);
 
-	sleep(20);
+			if(sent < 0) {
+				fprintf(stderr, "Sending message failed\n");
+				return 1;
+			}
 
-	free(content);
+			if(!sent) {
+				usleep(100000);
+			} else {
+				len -= sent;
+				p += sent;
+			}
+		}
+	} while(true);
 
-	meshlink_channel_close(mesh1, channel);
+	meshlink_channel_close(mesh, channel);
 
 	// Clean up.
 
-	meshlink_close(mesh1);
+	meshlink_close(mesh);
 
 	return 0;
 }
 
 
-int main2(int rfd, int wfd) {
-	sleep(1);
+static int main2(void) {
+#ifdef __linux__
+	prctl(PR_SET_PDEATHSIG, SIGTERM);
+#endif
 
-	meshlink_set_log_cb(NULL, MESHLINK_DEBUG, log_cb);
+	close(0);
 
-	meshlink_handle_t *mesh2 = meshlink_open("channels_conf.2", "bar", "channels", DEV_CLASS_BACKBONE);
-	if(!mesh2) {
-		fprintf(stderr, "Could not initialize configuration for bar\n");
-		return 1;
-	}
+	// Start mesh and wait for incoming channels.
 
-	char *data = meshlink_export(mesh2);
-	if(!data) {
-		fprintf(stderr, "Bar could not export its configuration\n");
-		return 1;
-	}
-
-	size_t len = strlen(data);
-	if(write(wfd, &len, sizeof len) <= 0) abort();
-	if(write(wfd, data, len) <= 0) abort();
-	free(data);
-
-	read(rfd, &len, sizeof len);
-	char indata[len + 1];
-	read(rfd, indata, len);
-	indata[len] = 0;
+	meshlink_handle_t *mesh = meshlink_open("echo-fork_conf.2", "b", "echo-fork", DEV_CLASS_BACKBONE);
+	assert(mesh);
 
-	fprintf(stderr, "Bar exchanged data\n");
+	meshlink_set_channel_accept_cb(mesh, accept_cb);
 
-	meshlink_import(mesh2, indata);
+	assert(meshlink_start(mesh));
 
-	meshlink_set_channel_accept_cb(mesh2, accept_cb);
-
-	if(!meshlink_start(mesh2)) {
-		fprintf(stderr, "Bar could not start\n");
-		return 1;
-	}
+	// Let it run until a disappears.
 
-	sleep(20);
+	assert(wait_sync_flag(&a_started, 20));
+	assert(wait_sync_flag(&a_stopped, 1000000));
 
 	// Clean up.
 
-	meshlink_close(mesh2);
+	meshlink_close(mesh);
 
 	return 0;
 }
 
 
-int main(int argc, char *argv[]) {
-	int fda[2], fdb[2], result;
+int main() {
+	meshlink_set_log_cb(NULL, MESHLINK_WARNING, log_cb);
+
+	// Initialize and exchange configuration.
+
+	meshlink_handle_t *mesh_a, *mesh_b;
+
+	open_meshlink_pair(&mesh_a, &mesh_b, "echo-fork");
+	close_meshlink_pair(mesh_a, mesh_b);
+
+	if(!fork()) {
+		return main2();
+	}
 
-	pipe2(fda, 0);
-	pipe2(fdb, 0);
+	assert(main1() == 0);
 
-	if(fork())
-		return main1(fda[0], fdb[1]);
-	else
-		return main2(fdb[0], fda[1]);
+	int wstatus = 0;
+	assert(wait(&wstatus) != -1);
+	assert(WIFEXITED(wstatus));
+	assert(WEXITSTATUS(wstatus) == 0);
 }