session time out for http client/server

[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 72cb27ecf703ce5729f05988d12c9523b8259a3a..78bc425c5cb2d0d0fa831bdc94202c5bc9c32d30 100644 (file)
--- a/src/statistics/test_statistics_api_watch.c
+++ b/src/statistics/test_statistics_api_watch.c
@@ -1,6 +1,6 @@
 /*
      This file is part of GNUnet.
-     (C) 2009, 2011 Christian Grothoff (and other contributing authors)
+     (C) 2009, 2011, 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,20 +20,12 @@
 /**
  * @file statistics/test_statistics_api_watch.c
  * @brief testcase for statistics_api.c watch functions
+ * @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 VERBOSE GNUNET_NO
-
-#define START_SERVICE GNUNET_YES
-
-#define ROUNDS (1024 * 1024)
 
 static int ok;
 
@@ -63,9 +55,8 @@ normal_shutdown (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
 
 
 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)
 {
   GNUNET_assert (value == 42);
   GNUNET_assert (0 == strcmp (name, "test-1"));
@@ -80,9 +71,8 @@ watch_1 (void *cls,
 
 
 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)
 {
   GNUNET_assert (value == 43);
   GNUNET_assert (0 == strcmp (name, "test-2"));
@@ -97,29 +87,27 @@ watch_2 (void *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 ("dummy", cfg);
   GNUNET_assert (GNUNET_OK ==
-                 GNUNET_STATISTICS_watch (h,
-                                          "test-statistics-api-watch",
+                 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",
+                 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);
 }
 
 
-static int
-check ()
+int
+main (int argc, char *argv_ign[])
 {
   char *const argv[] = { "test-statistics-api",
     "-c",
@@ -129,41 +117,30 @@ check ()
   struct GNUNET_GETOPT_CommandLineOption options[] = {
     GNUNET_GETOPT_OPTION_END
   };
-#if START_SERVICE
   struct GNUNET_OS_Process *proc;
-
-  proc = GNUNET_OS_start_process (NULL, NULL, "gnunet-service-statistics",
-                                  "gnunet-service-statistics",
-#if VERBOSE
-                                  "-L", "DEBUG",
-#endif
-                                  "-c", "test_statistics_api_data.conf", NULL);
-#endif
+  char *binary;
+
+  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);
   ok = 3;
-  GNUNET_PROGRAM_run (3, argv, "test-statistics-api", "nohelp",
-                      options, &run, NULL);
-#if START_SERVICE
-  if (0 != GNUNET_OS_process_kill (proc, SIGTERM))
+  GNUNET_PROGRAM_run (3, argv, "test-statistics-api", "nohelp", options, &run,
+                      NULL);
+  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;
-
-  ret = check ();
-
-  return ret;
-}
 
 /* end of test_statistics_api_watch.c */