-remove unnecessary arguments from ARM callbacks

[oweals/gnunet.git] / src / testing / gnunet-testing-run-service.c

diff --git a/src/testing/gnunet-testing-run-service.c b/src/testing/gnunet-testing-run-service.c
index 38351d75e737f61ac00ff5a1b1bd98c4e15cd782..ed60a409bc51a72de6e3103e624ecb0f927f3e23 100644 (file)
--- a/src/testing/gnunet-testing-run-service.c
+++ b/src/testing/gnunet-testing-run-service.c
@@ -28,28 +28,22 @@
  * Outputs the path to the temporary configuration file to stdout.
  *
  * The peer will run until this program is killed,
- * or stdin is closed. When reading the character 'r' from stdin, the running service is
- * restarted with the same configuration.
+ * or stdin is closed. When reading the character 'r' from stdin,
+ * the running service is restarted with the same configuration.
  *
  * This executable is intended to be used by gnunet-java, in order to reliably
  * start and stop services for test cases.
  */
-
 #include "platform.h"
-#include "gnunet_getopt_lib.h"
-#include "gnunet_program_lib.h"
 #include "gnunet_util_lib.h"
-#include "gnunet_signal_lib.h"
-#include "gnunet_testing_lib-new.h"
-#include "gnunet_os_lib.h"
-
+#include "gnunet_testing_lib.h"
 
 #define LOG(kind,...)                                           \
   GNUNET_log_from (kind, "gnunet-testing", __VA_ARGS__)
 
 
 /**
- * FIXME
+ * File handle to STDIN, for reading restart/quit commands.
  */
 static struct GNUNET_DISK_FileHandle *fh;
 
@@ -135,7 +129,8 @@ stdin_cb (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
     fprintf (stderr, _("Unknown command, use 'q' to quit or 'r' to restart peer\n"));
     break;
   }
-  tid = GNUNET_SCHEDULER_add_read_file (GNUNET_TIME_UNIT_FOREVER_REL, fh, &stdin_cb, NULL);    
+  tid = GNUNET_SCHEDULER_add_read_file (GNUNET_TIME_UNIT_FOREVER_REL, fh,
+                                        &stdin_cb, NULL);    
 }
 
 
@@ -149,9 +144,9 @@ stdin_cb (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
  */
 static void
 testing_main (void *cls, const struct GNUNET_CONFIGURATION_Handle *cfg,
-              const struct GNUNET_TESTING_Peer *peer)
+              struct GNUNET_TESTING_Peer *peer)
 {
-  my_peer = (struct GNUNET_TESTING_Peer *) peer;
+  my_peer = peer;
   if (NULL == (tmpfilename = GNUNET_DISK_mktemp ("gnunet-testing")))
   {
     GNUNET_break (0);
@@ -159,16 +154,18 @@ testing_main (void *cls, const struct GNUNET_CONFIGURATION_Handle *cfg,
     return;
   }
   if (GNUNET_SYSERR == 
-      GNUNET_CONFIGURATION_write ((struct GNUNET_CONFIGURATION_Handle *) cfg, tmpfilename))
+      GNUNET_CONFIGURATION_write ((struct GNUNET_CONFIGURATION_Handle *) cfg,
+                                  tmpfilename))
   {
     GNUNET_break (0);
     return;
   }
-  printf("%s\n", tmpfilename);
+  printf("ok\n%s\n", tmpfilename);
   fflush(stdout);
   GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_UNIT_FOREVER_REL, &cleanup, NULL);
   fh = GNUNET_DISK_get_handle_from_native (stdin);
-  tid = GNUNET_SCHEDULER_add_read_file (GNUNET_TIME_UNIT_FOREVER_REL, fh, &stdin_cb, NULL);
+  tid = GNUNET_SCHEDULER_add_read_file (GNUNET_TIME_UNIT_FOREVER_REL, fh,
+                                        &stdin_cb, NULL);
 }
 
 
@@ -186,7 +183,7 @@ main (int argc, char *const *argv)
   static char *srv_name;
   static const struct GNUNET_GETOPT_CommandLineOption options[] = {
     {'c', "config", "FILENAME",
-     gettext_noop ("name of the configuration file to use"), 1,
+     gettext_noop ("name of the template configuration file to use (optional)"), 1,
      &GNUNET_GETOPT_set_string, &cfg_name},
     {'s', "service", "SERVICE",
      gettext_noop ("name of the service to run"), 1,
@@ -199,8 +196,8 @@ main (int argc, char *const *argv)
   if (GNUNET_SYSERR ==
       GNUNET_GETOPT_run("gnunet-testing-run-service", options, argc, argv))
     return 1;
-  ret = GNUNET_TESTING_service_run_restartable ("gnunet_service_test", srv_name,
-                                               cfg_name, &testing_main, NULL);
+  ret = GNUNET_TESTING_service_run ("gnunet_service_test", srv_name,
+                                   cfg_name, &testing_main, NULL);
   if (0 != ret)
   {
     printf ("error\n");