indentation

[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 1de0f46151fb926b3caf5d7365ac7964bd9cd5fb..d0eadaf943bc498c8496b8a4dceb29aed9104f39 100755 (executable)
--- a/src/peerinfo/perf_peerinfo_api.c
+++ b/src/peerinfo/perf_peerinfo_api.c
@@ -32,6 +32,7 @@
 #include "gnunet_program_lib.h"
 #include "gnunet_time_lib.h"
 #include "peerinfo.h"
+#include <gauger.h>
 
 #define START_SERVICE 1
 
@@ -53,12 +54,9 @@ check_it (void *cls,
 {
 #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;
 }
@@ -74,13 +72,12 @@ 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);
+                                  (GNUNET_TIME_UNIT_HOURS),
+                                  address, strlen (address) + 1, buf, max);
   GNUNET_free (address);
   *agc = 0;
   return ret;
@@ -93,9 +90,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,52 +102,53 @@ add_peer (size_t i)
 static void
 process (void *cls,
          const struct GNUNET_PeerIdentity *peer,
-         const struct GNUNET_HELLO_Message *hello)
+         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,
      char *const *args,
-     const char *cfgfile, 
-     const struct GNUNET_CONFIGURATION_Handle *c)
+     const char *cfgfile, const struct GNUNET_CONFIGURATION_Handle *c)
 {
   size_t i;
+
   cfg = c;
   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[] = { "perf-peerinfo-api",
     "-c",
     "test_peerinfo_api_data.conf",
@@ -165,32 +161,32 @@ check ()
   };
 #if START_SERVICE
   struct GNUNET_OS_Process *proc;
+
   struct GNUNET_GETOPT_CommandLineOption options[] = {
     GNUNET_GETOPT_OPTION_END
   };
   proc = GNUNET_OS_start_process (NULL, NULL, "gnunet-service-peerinfo",
-                                 "gnunet-service-peerinfo",
+                                  "gnunet-service-peerinfo",
 #if DEBUG_PEERINFO
-                                 "-L", "DEBUG",
+                                  "-L", "DEBUG",
 #else
-                               "-L", "ERROR",
+                                  "-L", "ERROR",
 #endif
-                                 "-c", "test_peerinfo_api_data.conf", NULL);
+                                  "-c", "test_peerinfo_api_data.conf", NULL);
 #endif
   GNUNET_assert (NULL != proc);
   GNUNET_PROGRAM_run ((sizeof (argv) / sizeof (char *)) - 1,
-                      argv, "perf-peerinfo-api", "nohelp",
-                      options, &run, &ok);
+                      argv, "perf-peerinfo-api", "nohelp", options, &run, &ok);
   fprintf (stderr,
-          "Received %u/%u calls before timeout\n",
-          numpeers,
-          NUM_REQUESTS * NUM_REQUESTS / 2);
+           "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 != GNUNET_OS_process_kill (proc, SIGTERM))
-    {
-      GNUNET_log_strerror (GNUNET_ERROR_TYPE_WARNING, "kill");
-      ok = 1;
-    }
+  {
+    GNUNET_log_strerror (GNUNET_ERROR_TYPE_WARNING, "kill");
+    ok = 1;
+  }
   GNUNET_OS_process_wait (proc);
   GNUNET_OS_process_close (proc);
   proc = NULL;