X-Git-Url: http://git.meshlink.io/?p=meshlink;a=blobdiff_plain;f=test%2Futils.c;h=d4ba6b6d8cbe530c8d2ff519dc373c765b1d210e;hp=862e033ec0f0ac1ad83bdedfc70345ffbe939b99;hb=3febbb4453f5c6b0286e7e3c68a5dbcec975b6fd;hpb=dc0e52cb3e42620c3139e713b373d130aa30b698

diff --git a/test/utils.c b/test/utils.c
index 862e033e..d4ba6b6d 100644
--- a/test/utils.c
+++ b/test/utils.c
@@ -1,10 +1,15 @@
-#define _GNU_SOURCE
+#define _GNU_SOURCE 1
+
+#ifdef NDEBUG
+#undef NDEBUG
+#endif
 
 #include <stdio.h>
 #include <stdlib.h>
 #include <pthread.h>
 #include <assert.h>
 #include <errno.h>
+#include <time.h>
 
 #include "utils.h"
 
@@ -15,19 +20,49 @@ void set_sync_flag(struct sync_flag *s, bool value) {
 	pthread_mutex_unlock(&s->mutex);
 }
 
+bool check_sync_flag(struct sync_flag *s) {
+	bool flag;
+	pthread_mutex_lock(&s->mutex);
+	flag = s->flag;
+	pthread_mutex_unlock(&s->mutex);
+	return flag;
+}
+
 bool wait_sync_flag(struct sync_flag *s, int seconds) {
 	struct timespec timeout;
 	clock_gettime(CLOCK_REALTIME, &timeout);
 	timeout.tv_sec += seconds;
 
-	while(!s->flag)
+	pthread_mutex_lock(&s->mutex);
+
+	while(!s->flag) {
 		if(!pthread_cond_timedwait(&s->cond, &s->mutex, &timeout) || errno != EINTR) {
 			break;
 		}
+	}
+
+	pthread_mutex_unlock(&s->mutex);
 
 	return s->flag;
 }
 
+void link_meshlink_pair(meshlink_handle_t *a, meshlink_handle_t *b) {
+	// Import and export both side's data
+
+	assert(meshlink_set_canonical_address(a, meshlink_get_self(a), "localhost", NULL));
+	assert(meshlink_set_canonical_address(b, meshlink_get_self(b), "localhost", NULL));
+
+	char *data = meshlink_export(a);
+	assert(data);
+	assert(meshlink_import(b, data));
+	free(data);
+
+	data = meshlink_export(b);
+	assert(data);
+	assert(meshlink_import(a, data));
+	free(data);
+}
+
 void open_meshlink_pair(meshlink_handle_t **pa, meshlink_handle_t **pb, const char *prefix) {
 	// Create two new MeshLink instances
 
@@ -35,34 +70,28 @@ void open_meshlink_pair(meshlink_handle_t **pa, meshlink_handle_t **pb, const ch
 
 	char *a_name, *b_name;
 
-	asprintf(&a_name, "%s_conf.1", prefix);
+	assert(asprintf(&a_name, "%s_conf.1", prefix) > 0);
 	assert(a_name);
 
-	asprintf(&b_name, "%s_conf.2", prefix);
+	assert(asprintf(&b_name, "%s_conf.2", prefix) > 0);
 	assert(b_name);
 
+	assert(meshlink_destroy(a_name));
+	assert(meshlink_destroy(b_name));
+
 	meshlink_handle_t *a = meshlink_open(a_name, "a", prefix, DEV_CLASS_BACKBONE);
 	assert(a);
 
 	meshlink_handle_t *b = meshlink_open(b_name, "b", prefix, DEV_CLASS_BACKBONE);
 	assert(b);
 
+	free(a_name);
+	free(b_name);
+
 	meshlink_enable_discovery(a, false);
 	meshlink_enable_discovery(b, false);
 
-	// Import and export both side's data
-
-	meshlink_add_address(a, "localhost");
-
-	char *data = meshlink_export(a);
-	assert(data);
-	assert(meshlink_import(b, data));
-	free(data);
-
-	data = meshlink_export(b);
-	assert(data);
-	assert(meshlink_import(a, data));
-	free(data);
+	link_meshlink_pair(a, b);
 
 	*pa = a;
 	*pb = b;
@@ -72,7 +101,9 @@ void open_meshlink_pair(meshlink_handle_t **pa, meshlink_handle_t **pb, const ch
 static void pair_status_cb(meshlink_handle_t *mesh, meshlink_node_t *node, bool reachable) {
 	(void)node;
 
-	set_sync_flag(mesh->priv, reachable);
+	if(reachable) {
+		set_sync_flag(mesh->priv, true);
+	}
 }
 
 void start_meshlink_pair(meshlink_handle_t *a, meshlink_handle_t *b) {
@@ -81,15 +112,11 @@ void start_meshlink_pair(meshlink_handle_t *a, meshlink_handle_t *b) {
 	a->priv = &pair_status;
 	meshlink_set_node_status_cb(a, pair_status_cb);
 
-	pthread_mutex_lock(&pair_status.mutex);
-
-	meshlink_start(a);
-	meshlink_start(b);
+	assert(meshlink_start(a));
+	assert(meshlink_start(b));
 
 	assert(wait_sync_flag(&pair_status, 5));
 
-	pthread_mutex_unlock(&pair_status.mutex);
-
 	meshlink_set_node_status_cb(a, NULL);
 	a->priv = NULL;
 }
@@ -99,19 +126,34 @@ void stop_meshlink_pair(meshlink_handle_t *a, meshlink_handle_t *b) {
 	meshlink_stop(b);
 }
 
-void close_meshlink_pair(meshlink_handle_t *a, meshlink_handle_t *b, const char *prefix) {
+void close_meshlink_pair(meshlink_handle_t *a, meshlink_handle_t *b) {
 	meshlink_close(a);
 	meshlink_close(b);
+}
+
+void log_cb(meshlink_handle_t *mesh, meshlink_log_level_t level, const char *text) {
+	static const char *levelstr[] = {
+		[MESHLINK_DEBUG] = "DEBUG",
+		[MESHLINK_INFO] = "INFO",
+		[MESHLINK_WARNING] = "WARNING",
+		[MESHLINK_ERROR] = "ERROR",
+		[MESHLINK_CRITICAL] = "CRITICAL",
+	};
 
-	if(prefix) {
-		char *a_name, *b_name;
+	static struct timespec ts0;
+	struct timespec ts;
 
-		asprintf(&a_name, "%s_conf.1", prefix);
-		assert(a_name);
-		assert(meshlink_destroy(a_name));
+	clock_gettime(CLOCK_MONOTONIC, &ts);
 
-		asprintf(&b_name, "%s_conf.2", prefix);
-		assert(b_name);
-		assert(meshlink_destroy(b_name));
+	if(ts0.tv_sec == 0) {
+		ts0 = ts;
 	}
+
+	float diff = (ts.tv_sec - ts0.tv_sec) + (ts.tv_nsec - ts0.tv_nsec) * 1e-9;
+
+	fprintf(stderr, "%7.3f (%s) [%s] %s\n",
+	        diff,
+	        mesh ? mesh->name : "",
+	        levelstr[level],
+	        text);
 }