-GArik: fix typo

[oweals/gnunet.git] / src / statistics / test_statistics_api_watch.c

diff --git a/src/statistics/test_statistics_api_watch.c b/src/statistics/test_statistics_api_watch.c
index a7ae490a7b8924308bdf987ef8c8a8d1aa01fdac..1323e3ad1f2dfdf8e564497e818f56f6ba25c45e 100644 (file)
--- a/src/statistics/test_statistics_api_watch.c
+++ b/src/statistics/test_statistics_api_watch.c
@@ -29,12 +29,10 @@
 #include "gnunet_scheduler_lib.h"
 #include "gnunet_statistics_service.h"
 
-#define VERBOSE GNUNET_NO
+#define VERBOSE GNUNET_EXTRA_LOGGING
 
 #define START_SERVICE GNUNET_YES
 
-#define ROUNDS (1024 * 1024)
-
 static int ok;
 
 static struct GNUNET_STATISTICS_Handle *h;
@@ -43,9 +41,9 @@ static struct GNUNET_STATISTICS_Handle *h2;
 
 static GNUNET_SCHEDULER_TaskIdentifier shutdown_task;
 
+
 static void
-force_shutdown (void *cls,
-               const struct GNUNET_SCHEDULER_TaskContext *tc)
+force_shutdown (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
 {
   fprintf (stderr, "Timeout, failed to receive notifications: %d\n", ok);
   GNUNET_STATISTICS_destroy (h, GNUNET_NO);
@@ -53,76 +51,64 @@ force_shutdown (void *cls,
   ok = 7;
 }
 
+
 static void
-normal_shutdown (void *cls,
-                const struct GNUNET_SCHEDULER_TaskContext *tc)
+normal_shutdown (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
 {
   GNUNET_STATISTICS_destroy (h, GNUNET_NO);
   GNUNET_STATISTICS_destroy (h2, GNUNET_NO);
 }
 
+
 static int
-watch_1 (void *cls, 
-        const char *subsystem,
-        const char *name,
-        uint64_t value,
-        int is_persistent)
+watch_1 (void *cls, const char *subsystem, const char *name, uint64_t value,
+         int is_persistent)
 {
-  fprintf (stderr, "Value `%s' seen\n", name);
   GNUNET_assert (value == 42);
   GNUNET_assert (0 == strcmp (name, "test-1"));
   ok &= ~1;
   if (0 == ok)
-    {
-      GNUNET_SCHEDULER_cancel (shutdown_task);
-      GNUNET_SCHEDULER_add_now (&normal_shutdown, NULL);
-    }  
+  {
+    GNUNET_SCHEDULER_cancel (shutdown_task);
+    GNUNET_SCHEDULER_add_now (&normal_shutdown, NULL);
+  }
   return GNUNET_OK;
 }
 
+
 static int
-watch_2 (void *cls, 
-        const char *subsystem,
-        const char *name,
-        uint64_t value,
-        int is_persistent)
+watch_2 (void *cls, const char *subsystem, const char *name, uint64_t value,
+         int is_persistent)
 {
-  fprintf (stderr, "Value `%s' seen\n", name);
   GNUNET_assert (value == 43);
   GNUNET_assert (0 == strcmp (name, "test-2"));
   ok &= ~2;
   if (0 == ok)
-    {
-      GNUNET_SCHEDULER_cancel (shutdown_task);
-      GNUNET_SCHEDULER_add_now (&normal_shutdown, NULL);
-    }  
+  {
+    GNUNET_SCHEDULER_cancel (shutdown_task);
+    GNUNET_SCHEDULER_add_now (&normal_shutdown, NULL);
+  }
   return GNUNET_OK;
 }
 
+
 static void
-run (void *cls,
-     char *const *args,
-     const char *cfgfile,
+run (void *cls, char *const *args, const char *cfgfile,
      const struct GNUNET_CONFIGURATION_Handle *cfg)
 {
   h = GNUNET_STATISTICS_create ("dummy", cfg);
   GNUNET_assert (GNUNET_OK ==
-                GNUNET_STATISTICS_watch (h,
-                                         "test-statistics-api-watch",
-                                         "test-1",
-                                         &watch_1,
-                                         NULL));
+                 GNUNET_STATISTICS_watch (h, "test-statistics-api-watch",
+                                          "test-1", &watch_1, NULL));
   GNUNET_assert (GNUNET_OK ==
-                GNUNET_STATISTICS_watch (h,
-                                         "test-statistics-api-watch",
-                                         "test-2",
-                                         &watch_2,
-                                         NULL));
+                 GNUNET_STATISTICS_watch (h, "test-statistics-api-watch",
+                                          "test-2", &watch_2, NULL));
   h2 = GNUNET_STATISTICS_create ("test-statistics-api-watch", cfg);
   GNUNET_STATISTICS_set (h2, "test-1", 42, GNUNET_NO);
   GNUNET_STATISTICS_set (h2, "test-2", 43, GNUNET_NO);
-  shutdown_task = GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_UNIT_MINUTES,
-                                               &force_shutdown, NULL);
+  shutdown_task =
+      GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_UNIT_MINUTES, &force_shutdown,
+                                    NULL);
 }
 
 
@@ -139,23 +125,25 @@ check ()
   };
 #if START_SERVICE
   struct GNUNET_OS_Process *proc;
-  proc = GNUNET_OS_start_process (NULL, NULL, "gnunet-service-statistics",
-                                 "gnunet-service-statistics",
+
+  proc =
+      GNUNET_OS_start_process (NULL, NULL, "gnunet-service-statistics",
+                               "gnunet-service-statistics",
 #if VERBOSE
-                                 "-L", "DEBUG",
+                               "-L", "DEBUG",
 #endif
-                                 "-c", "test_statistics_api_data.conf", NULL);
+                               "-c", "test_statistics_api_data.conf", NULL);
 #endif
   GNUNET_assert (NULL != proc);
   ok = 3;
-  GNUNET_PROGRAM_run (3, argv, "test-statistics-api", "nohelp",
-                      options, &run, NULL);
+  GNUNET_PROGRAM_run (3, argv, "test-statistics-api", "nohelp", options, &run,
+                      NULL);
 #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;