manynodes: do not add localhost as node's address

[meshlink] / examples / manynodes.c

diff --git a/examples/manynodes.c b/examples/manynodes.c
index 3b617e4e5b517d7af0a0c33eeccf5cf249afa130..99a3e5b2dd806a15d2f32fd5f337b653695691e6 100644 (file)
--- a/examples/manynodes.c
+++ b/examples/manynodes.c
@@ -13,6 +13,9 @@
 #include <sys/stat.h>
 #include <errno.h>
 
+#include <sys/time.h>
+#include <signal.h>
+
 static int n = 10;
 static meshlink_handle_t **mesh;
 
@@ -101,6 +104,73 @@ static bool exportmeshgraph(const char* path)
        return true;
 }
 
+
+void exportmeshgraph_timer(int signum)
+{
+       struct timeval ts;
+       gettimeofday(&ts, NULL);
+
+       char name[1024];
+       snprintf(name, sizeof(name), "graph_%ld_%03ld.json", ts.tv_sec, ts.tv_usec/1000);
+
+       exportmeshgraph(name);
+}
+
+static bool exportmeshgraph_started = false;
+
+static bool exportmeshgraph_end(const char* none)
+{
+       if(!exportmeshgraph_started)
+               { return false; }
+
+       struct itimerval zero_timer = { 0 };
+       setitimer (ITIMER_REAL, &zero_timer, NULL);
+
+       exportmeshgraph_started = false;
+
+       return true;
+}
+
+static bool exportmeshgraph_begin(const char* timeout_str)
+{
+       if(!timeout_str)
+               return false;
+
+       if(exportmeshgraph_started)
+       {
+               if(!exportmeshgraph_end(NULL))
+                       return false;
+       }
+
+       // get timeout
+       int timeout = atoi(timeout_str);
+
+       if(timeout < 100)
+               { timeout = 100; }
+
+       int timeout_sec = timeout / 1000;
+       int timeout_msec = timeout % 1000;
+
+       /* Install timer_handler as the signal handler for SIGALRM. */
+       signal(SIGALRM, exportmeshgraph_timer);
+
+       /* Configure the timer to expire immediately... */
+       struct itimerval timer;
+       timer.it_value.tv_sec = 0;
+       timer.it_value.tv_usec = 1000;
+
+       /* ... and every X msec after that. */
+       timer.it_interval.tv_sec = timeout_sec;
+       timer.it_interval.tv_usec = timeout_msec * 1000;
+
+       /* Start a real timer. */
+       setitimer (ITIMER_REAL, &timer, NULL);
+
+       exportmeshgraph_started = true;
+
+       return true;
+}
+
 static void parse_command(char *buf) {
        char *arg = strchr(buf, ' ');
        if(arg)
@@ -172,6 +242,10 @@ static void parse_command(char *buf) {
                linkmesh();
        } else if(!strcasecmp(buf, "eg")) {
                exportmeshgraph(arg);
+       } else if(!strcasecmp(buf, "egb")) {
+               exportmeshgraph_begin(arg);
+       } else if(!strcasecmp(buf, "ege")) {
+               exportmeshgraph_end(NULL);
        } else if(!strcasecmp(buf, "test")) {
                testmesh();
        } else if(!strcasecmp(buf, "quit")) {
@@ -256,13 +330,14 @@ static void parse_input(char *buf) {
 int main(int argc, char *argv[]) {
        const char *basebase = ".manynodes";
        const char *namesprefix = "machine1";
+       const char *graphexporttimeout = NULL;
        char buf[1024];
 
        if(argc > 1)
                n = atoi(argv[1]);
 
        if(n < 1) {
-               fprintf(stderr, "Usage: %s [number of local nodes] [confbase] [prefixnodenames]\n", argv[0]);
+               fprintf(stderr, "Usage: %s [number of local nodes] [confbase] [prefixnodenames] [graphexport timeout]\n", argv[0]);
                return 1;
        }
 
@@ -272,9 +347,12 @@ int main(int argc, char *argv[]) {
        if(argc > 3)
                namesprefix = argv[3];
 
+       if(argc > 4)
+               graphexporttimeout = argv[4];
+
        mesh = calloc(n, sizeof *mesh);
 
-       meshlink_set_log_cb(NULL, MESHLINK_INFO, log_message);
+       meshlink_set_log_cb(NULL, MESHLINK_WARNING, log_message);
        mkdir(basebase, 0750);
 
        char filename[PATH_MAX];
@@ -284,9 +362,7 @@ int main(int argc, char *argv[]) {
                snprintf(filename, sizeof filename, "%s/%s", basebase, nodename);
                bool itsnew = access(filename, R_OK);
                mesh[i] = meshlink_open(filename, nodename, "manynodes", i%_DEV_CLASS_MAX);
-               meshlink_set_log_cb(mesh[i], MESHLINK_INFO, log_message);
-               if(itsnew)
-                       meshlink_add_address(mesh[i], "localhost");
+               meshlink_set_log_cb(mesh[i], MESHLINK_WARNING, log_message);
                if(!mesh[i]) {
                        fprintf(stderr, "errno is: %d\n", meshlink_errno);
                        fprintf(stderr, "Could not open %s: %s\n", filename, meshlink_strerror(meshlink_errno));
@@ -308,11 +384,17 @@ int main(int argc, char *argv[]) {
                return 1;
        }
 
+       if(graphexporttimeout)
+               { exportmeshgraph_begin(graphexporttimeout); }
+
        printf("%d nodes started.\nType /help for a list of commands.\n", started);
 
+       // handle input
        while(fgets(buf, sizeof buf, stdin))
                parse_input(buf);
 
+       exportmeshgraph_end(NULL);
+
        printf("Nodes stopping.\n");
 
        for(int i = 0; i < n; i++)