Fixed reconnect

[oweals/gnunet.git] / src / peerinfo / perf_peerinfo_api.c

diff --git a/src/peerinfo/perf_peerinfo_api.c b/src/peerinfo/perf_peerinfo_api.c
index ea21b0faefbfda856b43bfefad524c03c5fbadf7..d9107c8fee6cf75c6d273105bb83120d5dbeb582 100755 (executable)
--- a/src/peerinfo/perf_peerinfo_api.c
+++ b/src/peerinfo/perf_peerinfo_api.c
@@ -32,13 +32,12 @@
 #include "gnunet_program_lib.h"
 #include "gnunet_time_lib.h"
 #include "peerinfo.h"
+#include <gauger.h>
 
 #define START_SERVICE 1
 
 #define NUM_REQUESTS 5000
 
-static struct GNUNET_SCHEDULER_Handle *sched;
-
 static const struct GNUNET_CONFIGURATION_Handle *cfg;
 
 static struct GNUNET_PEERINFO_IteratorContext *ic[NUM_REQUESTS];
@@ -48,19 +47,14 @@ static struct GNUNET_PEERINFO_Handle *h;
 static unsigned int numpeers;
 
 static int
-check_it (void *cls,
-          const char *tname,
-          struct GNUNET_TIME_Absolute expiration,
+check_it (void *cls, const char *tname, struct GNUNET_TIME_Absolute expiration,
           const void *addr, uint16_t addrlen)
 {
 #if DEBUG
   if (addrlen > 0)
-    {
-      fprintf (stderr,
-              "name: %s, addr: %s\n", 
-              tname, 
-              (const char*) addr);
-    }
+  {
+    fprintf (stderr, "name: %s, addr: %s\n", tname, (const char *) addr);
+  }
 #endif
   return GNUNET_OK;
 }
@@ -76,13 +70,13 @@ address_generator (void *cls, size_t max, void *buf)
   if (*agc == 0)
     return 0;
 
-  GNUNET_asprintf(&address, "Address%d", *agc);
+  GNUNET_asprintf (&address, "Address%d", *agc);
 
-  ret = GNUNET_HELLO_add_address ("peerinfotest",
-                                  GNUNET_TIME_relative_to_absolute
-                                  (GNUNET_TIME_UNIT_HOURS), 
-                                 address, strlen(address) + 1,
-                                  buf, max);
+  ret =
+      GNUNET_HELLO_add_address ("peerinfotest",
+                                GNUNET_TIME_relative_to_absolute
+                                (GNUNET_TIME_UNIT_HOURS), address,
+                                strlen (address) + 1, buf, max);
   GNUNET_free (address);
   *agc = 0;
   return ret;
@@ -95,9 +89,7 @@ add_peer (size_t i)
   struct GNUNET_CRYPTO_RsaPublicKeyBinaryEncoded pkey;
   struct GNUNET_PeerIdentity pid;
   struct GNUNET_HELLO_Message *h2;
-  size_t agc;
 
-  agc = 2;
   memset (&pkey, i, sizeof (pkey));
   GNUNET_CRYPTO_hash (&pkey, sizeof (pkey), &pid.hashPubKey);
   h2 = GNUNET_HELLO_create (&pkey, &address_generator, &i);
@@ -107,90 +99,94 @@ add_peer (size_t i)
 
 
 static void
-process (void *cls,
-         const struct GNUNET_PeerIdentity *peer,
-         const struct GNUNET_HELLO_Message *hello)
+process (void *cls, const struct GNUNET_PeerIdentity *peer,
+         const struct GNUNET_HELLO_Message *hello, const char *err_msg)
 {
   if (peer == NULL)
-    {
+  {
 #if DEBUG
-      fprintf(stderr, "Process received NULL response\n");
+    fprintf (stderr, "Process received NULL response\n");
 #endif
-    }
+  }
   else
-    {
+  {
 #if DEBUG
-      fprintf(stderr, "Processed a peer\n");
+    fprintf (stderr, "Processed a peer\n");
 #endif
-      numpeers++;
-      if (0 && (hello != NULL))
-        GNUNET_HELLO_iterate_addresses (hello, GNUNET_NO, &check_it, NULL);
+    numpeers++;
+    if (0 && (hello != NULL))
+      GNUNET_HELLO_iterate_addresses (hello, GNUNET_NO, &check_it, NULL);
 
-    }
+  }
 }
 
 
 static void
-run (void *cls,
-     struct GNUNET_SCHEDULER_Handle *s,
-     char *const *args,
-     const char *cfgfile, 
+run (void *cls, char *const *args, const char *cfgfile,
      const struct GNUNET_CONFIGURATION_Handle *c)
 {
   size_t i;
-  sched = s;
+
   cfg = c;
-  h = GNUNET_PEERINFO_connect (sched, cfg);
+  h = GNUNET_PEERINFO_connect (cfg);
   GNUNET_assert (h != NULL);
   for (i = 0; i < NUM_REQUESTS; i++)
-    {
-      add_peer (i);
-      ic[i] = GNUNET_PEERINFO_iterate (h,
-                                      NULL,
-                                      GNUNET_TIME_relative_multiply
-                                      (GNUNET_TIME_UNIT_SECONDS, 30),
-                                      &process, cls);
-    }
+  {
+    add_peer (i);
+    ic[i] =
+        GNUNET_PEERINFO_iterate (h, NULL,
+                                 GNUNET_TIME_relative_multiply
+                                 (GNUNET_TIME_UNIT_SECONDS, 30), &process, cls);
+  }
 }
 
 static int
 check ()
 {
   int ok = 0;
-  char *const argv[] = { "test-peerinfo-hammer",
+
+  char *const argv[] = { "perf-peerinfo-api",
     "-c",
     "test_peerinfo_api_data.conf",
 #if DEBUG_PEERINFO
     "-L", "DEBUG",
+#else
+    "-L", "ERROR",
 #endif
     NULL
   };
 #if START_SERVICE
-  pid_t pid;
+  struct GNUNET_OS_Process *proc;
+
   struct GNUNET_GETOPT_CommandLineOption options[] = {
     GNUNET_GETOPT_OPTION_END
   };
-  pid = GNUNET_OS_start_process (NULL, NULL, "gnunet-service-peerinfo",
-                                 "gnunet-service-peerinfo",
+  proc =
+      GNUNET_OS_start_process (NULL, NULL, "gnunet-service-peerinfo",
+                               "gnunet-service-peerinfo",
 #if DEBUG_PEERINFO
-                                 "-L", "DEBUG",
+                               "-L", "DEBUG",
+#else
+                               "-L", "ERROR",
 #endif
-                                 "-c", "test_peerinfo_api_data.conf", NULL);
+                               "-c", "test_peerinfo_api_data.conf", NULL);
 #endif
-  GNUNET_PROGRAM_run ((sizeof (argv) / sizeof (char *)) - 1,
-                      argv, "perf-peerinfo-api", "nohelp",
-                      options, &run, &ok);
-  fprintf (stderr,
-          "Received %u/%u calls before timeout\n",
-          numpeers,
-          NUM_REQUESTS * NUM_REQUESTS / 2);
+  GNUNET_assert (NULL != proc);
+  GNUNET_PROGRAM_run ((sizeof (argv) / sizeof (char *)) - 1, argv,
+                      "perf-peerinfo-api", "nohelp", options, &run, &ok);
+  fprintf (stderr, "Received %u/%u calls before timeout\n", numpeers,
+           NUM_REQUESTS * NUM_REQUESTS / 2);
+  GAUGER ("PEERINFO", "Peerinfo lookups", numpeers / 30, "peers/s");
 #if START_SERVICE
-  if (0 != PLIBC_KILL (pid, SIGTERM))
-    {
-      GNUNET_log_strerror (GNUNET_ERROR_TYPE_WARNING, "kill");
-      ok = 1;
-    }
-  GNUNET_OS_process_wait(pid);
+  if (0 != GNUNET_OS_process_kill (proc, SIGTERM))
+  {
+    GNUNET_log_strerror (GNUNET_ERROR_TYPE_WARNING, "kill");
+    ok = 1;
+  }
+  GNUNET_OS_process_wait (proc);
+  GNUNET_OS_process_close (proc);
+  proc = NULL;
+
 #endif
   return ok;
 }