X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=src%2Fstatistics%2Ftest_statistics_api.c;h=aa9088f3595daba78daf5c04a97a93eaf8e737df;hb=372afebb55cc8b40d5f7115a398564e6ffd61434;hp=de05d6c69623c0048862635a849bd338168518fa;hpb=502af2167f7c218366666ca4944bd7cc54b5b19a;p=oweals%2Fgnunet.git

diff --git a/src/statistics/test_statistics_api.c b/src/statistics/test_statistics_api.c
index de05d6c69..aa9088f35 100644
--- a/src/statistics/test_statistics_api.c
+++ b/src/statistics/test_statistics_api.c
@@ -1,6 +1,6 @@
 /*
      This file is part of GNUnet.
-     (C) 2009 Christian Grothoff (and other contributing authors)
+     (C) 2009, 2012 Christian Grothoff (and other contributing authors)
 
      GNUnet is free software; you can redistribute it and/or modify
      it under the terms of the GNU General Public License as published
@@ -20,26 +20,21 @@
 /**
  * @file statistics/test_statistics_api.c
  * @brief testcase for statistics_api.c
+ * @author Christian Grothoff
  */
 #include "platform.h"
-#include "gnunet_common.h"
-#include "gnunet_getopt_lib.h"
-#include "gnunet_os_lib.h"
-#include "gnunet_program_lib.h"
-#include "gnunet_scheduler_lib.h"
+#include "gnunet_util_lib.h"
 #include "gnunet_statistics_service.h"
 
-#define DEBUG_STATISTICS GNUNET_NO
 
-#define START_SERVICE GNUNET_YES
+static struct GNUNET_STATISTICS_Handle *h;
+
 
 static int
-check_1 (void *cls,
-         const char *subsystem,
-         const char *name, uint64_t value, int is_persistent)
+check_1 (void *cls, const char *subsystem, const char *name, uint64_t value,
+         int is_persistent)
 {
-  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-              "Received value %llu for `%s:%s\n",
+  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Received value %llu for `%s:%s\n",
               (unsigned long long) value, subsystem, name);
   GNUNET_assert (0 == strcmp (name, "test-1"));
   GNUNET_assert (0 == strcmp (subsystem, "test-statistics-api"));
@@ -48,13 +43,12 @@ check_1 (void *cls,
   return GNUNET_OK;
 }
 
+
 static int
-check_2 (void *cls,
-         const char *subsystem,
-         const char *name, uint64_t value, int is_persistent)
+check_2 (void *cls, const char *subsystem, const char *name, uint64_t value,
+         int is_persistent)
 {
-  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-              "Received value %llu for `%s:%s\n",
+  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Received value %llu for `%s:%s\n",
               (unsigned long long) value, subsystem, name);
   GNUNET_assert (0 == strcmp (name, "test-2"));
   GNUNET_assert (0 == strcmp (subsystem, "test-statistics-api"));
@@ -63,13 +57,12 @@ check_2 (void *cls,
   return GNUNET_OK;
 }
 
+
 static int
-check_3 (void *cls,
-         const char *subsystem,
-         const char *name, uint64_t value, int is_persistent)
+check_3 (void *cls, const char *subsystem, const char *name, uint64_t value,
+         int is_persistent)
 {
-  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-              "Received value %llu for `%s:%s\n",
+  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Received value %llu for `%s:%s\n",
               (unsigned long long) value, subsystem, name);
   GNUNET_assert (0 == strcmp (name, "test-3"));
   GNUNET_assert (0 == strcmp (subsystem, "test-statistics-api"));
@@ -78,7 +71,6 @@ check_3 (void *cls,
   return GNUNET_OK;
 }
 
-static struct GNUNET_STATISTICS_Handle *h;
 
 static void
 next_fin (void *cls, int success)
@@ -90,6 +82,7 @@ next_fin (void *cls, int success)
   *ok = 0;
 }
 
+
 static void
 next (void *cls, int success)
 {
@@ -101,10 +94,10 @@ next (void *cls, int success)
                                        &check_2, cls));
 }
 
+
 static void
-run (void *cls,
-     char *const *args,
-     const char *cfgfile, const struct GNUNET_CONFIGURATION_Handle *cfg)
+run (void *cls, char *const *args, const char *cfgfile,
+     const struct GNUNET_CONFIGURATION_Handle *cfg)
 {
   h = GNUNET_STATISTICS_create ("test-statistics-api", cfg);
   GNUNET_STATISTICS_set (h, "test-1", 1, GNUNET_NO);
@@ -118,10 +111,10 @@ run (void *cls,
                                        &check_1, cls));
 }
 
+
 static void
-run_more (void *cls,
-          char *const *args,
-          const char *cfgfile, const struct GNUNET_CONFIGURATION_Handle *cfg)
+run_more (void *cls, char *const *args, const char *cfgfile,
+          const struct GNUNET_CONFIGURATION_Handle *cfg)
 {
   h = GNUNET_STATISTICS_create ("test-statistics-api", cfg);
   GNUNET_break (NULL !=
@@ -130,89 +123,68 @@ run_more (void *cls,
                                        &check_3, cls));
 }
 
-static int
-check ()
+
+int
+main (int argc, char *argv_ign[])
 {
   int ok = 1;
 
   char *const argv[] = { "test-statistics-api",
     "-c",
     "test_statistics_api_data.conf",
-#if DEBUG_STATISTICS
-    "-L", "DEBUG",
-#else
     "-L", "WARNING",
-#endif
     NULL
   };
   struct GNUNET_GETOPT_CommandLineOption options[] = {
     GNUNET_GETOPT_OPTION_END
   };
-#if START_SERVICE
   struct GNUNET_OS_Process *proc;
+  char *binary;
 
-  proc = GNUNET_OS_start_process (NULL, NULL, "gnunet-service-statistics",
-                                  "gnunet-service-statistics",
-#if DEBUG_STATISTICS
-                                  "-L", "DEBUG",
-#endif
-                                  "-c", "test_statistics_api_data.conf", NULL);
-#endif
+  GNUNET_log_setup ("test_statistics_api",
+                    "WARNING",
+                    NULL);
+  binary = GNUNET_OS_get_libexec_binary_path ("gnunet-service-statistics");
+  proc =
+      GNUNET_OS_start_process (GNUNET_YES, GNUNET_OS_INHERIT_STD_OUT_AND_ERR, NULL, NULL,
+			       binary,
+                               "gnunet-service-statistics",
+                               "-c", "test_statistics_api_data.conf", NULL);
   GNUNET_assert (NULL != proc);
-  GNUNET_PROGRAM_run (5, argv, "test-statistics-api", "nohelp",
-                      options, &run, &ok);
-#if START_SERVICE
-  if (0 != GNUNET_OS_process_kill (proc, SIGTERM))
+  GNUNET_PROGRAM_run (5, argv, "test-statistics-api", "nohelp", options, &run,
+                      &ok);
+  if (0 != GNUNET_OS_process_kill (proc, GNUNET_TERM_SIG))
   {
     GNUNET_log_strerror (GNUNET_ERROR_TYPE_WARNING, "kill");
     ok = 1;
   }
   GNUNET_OS_process_wait (proc);
-  GNUNET_OS_process_close (proc);
+  GNUNET_OS_process_destroy (proc);
   proc = NULL;
-#endif
   if (ok != 0)
+  {
+    GNUNET_free (binary);
     return ok;
+  }
   ok = 1;
-#if START_SERVICE
   /* restart to check persistence! */
-  proc = GNUNET_OS_start_process (NULL, NULL, "gnunet-service-statistics",
-                                  "gnunet-service-statistics",
-#if DEBUG_STATISTICS
-                                  "-L", "DEBUG",
-#endif
-                                  "-c", "test_statistics_api_data.conf", NULL);
-#endif
-  GNUNET_PROGRAM_run (5, argv, "test-statistics-api", "nohelp",
-                      options, &run_more, &ok);
-#if START_SERVICE
-  if (0 != GNUNET_OS_process_kill (proc, SIGTERM))
+  proc =
+      GNUNET_OS_start_process (GNUNET_YES, GNUNET_OS_INHERIT_STD_OUT_AND_ERR, NULL, NULL,
+			       binary,
+                               "gnunet-service-statistics",
+                               "-c", "test_statistics_api_data.conf", NULL);
+  GNUNET_PROGRAM_run (5, argv, "test-statistics-api", "nohelp", options,
+                      &run_more, &ok);
+  if (0 != GNUNET_OS_process_kill (proc, GNUNET_TERM_SIG))
   {
     GNUNET_log_strerror (GNUNET_ERROR_TYPE_WARNING, "kill");
     ok = 1;
   }
   GNUNET_OS_process_wait (proc);
-  GNUNET_OS_process_close (proc);
+  GNUNET_OS_process_destroy (proc);
   proc = NULL;
-#endif
+  GNUNET_free (binary);
   return ok;
 }
 
-int
-main (int argc, char *argv[])
-{
-  int ret;
-
-  GNUNET_log_setup ("test_statistics_api",
-#if DEBUG_STATISTICS
-                    "DEBUG",
-#else
-                    "WARNING",
-#endif
-                    NULL);
-  ret = check ();
-
-  return ret;
-}
-
 /* end of test_statistics_api.c */