-reducing testing peers and links

[oweals/gnunet.git] / src / testbed / test_testbed_api_testbed_run.c

diff --git a/src/testbed/test_testbed_api_testbed_run.c b/src/testbed/test_testbed_api_testbed_run.c
index 2a7c77af00ad9ddd3ade107a2a5913bbf1e2ae87..349dc492399f30b6424224b39e9750e9d98c61f2 100644 (file)
--- a/src/testbed/test_testbed_api_testbed_run.c
+++ b/src/testbed/test_testbed_api_testbed_run.c
@@ -1,22 +1,22 @@
 /*
-      This file is part of GNUnet
-      (C) 2008--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
-      by the Free Software Foundation; either version 3, or (at your
-      option) any later version.
-
-      GNUnet is distributed in the hope that it will be useful, but
-      WITHOUT ANY WARRANTY; without even the implied warranty of
-      MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-      General Public License for more details.
-
-      You should have received a copy of the GNU General Public License
-      along with GNUnet; see the file COPYING.  If not, write to the
-      Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-      Boston, MA 02111-1307, USA.
- */
+  This file is part of GNUnet
+  (C) 2008--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
+  by the Free Software Foundation; either version 3, or (at your
+  option) any later version.
+
+  GNUnet is distributed in the hope that it will be useful, but
+  WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+  General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with GNUnet; see the file COPYING.  If not, write to the
+  Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+  Boston, MA 02111-1307, USA.
+*/
 
 /**
  * @file testbed/test_testbed_api_testbed_run.c
@@ -31,7 +31,7 @@
 /**
  * Number of peers we want to start
  */
-#define NUM_PEERS 50
+#define NUM_PEERS 5
 
 /**
  * The array of peers; we fill this as the peers are given to us by the testbed
@@ -66,11 +66,11 @@ static int result;
  * @param tc the task context
  */
 static void
-do_shutdown (void *cls, const const struct GNUNET_SCHEDULER_TaskContext *tc)
+do_shutdown (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
 {
   if (GNUNET_SCHEDULER_NO_TASK != abort_task)
     GNUNET_SCHEDULER_cancel (abort_task);
-  GNUNET_SCHEDULER_shutdown ();
+  GNUNET_SCHEDULER_shutdown ();        /* Stop scheduler to shutdown testbed run */
 }
 
 
@@ -86,7 +86,6 @@ do_abort (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
   GNUNET_log (GNUNET_ERROR_TYPE_WARNING, "Test timedout -- Aborting\n");
   abort_task = GNUNET_SCHEDULER_NO_TASK;
   GNUNET_SCHEDULER_add_now (&do_shutdown, NULL);
-  GNUNET_SCHEDULER_shutdown (); /* Stop the scheduler */
 }
 
 
@@ -101,7 +100,7 @@ master_task (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
 {
   result = GNUNET_OK;
   GNUNET_assert (NULL != peers[0]);
-  op = GNUNET_TESTBED_peer_stop (peers[0]);
+  op = GNUNET_TESTBED_peer_stop (peers[0], NULL, NULL);
   GNUNET_assert (NULL != op);
 }
 
@@ -153,14 +152,11 @@ run (void *cls, char *const *args, const char *cfgfile,
   event_mask = 0;
   event_mask |= (1LL << GNUNET_TESTBED_ET_PEER_START);
   event_mask |= (1LL << GNUNET_TESTBED_ET_PEER_STOP);
-  event_mask |= (1LL << GNUNET_TESTBED_ET_CONNECT);
-  event_mask |= (1LL << GNUNET_TESTBED_ET_DISCONNECT);
-  event_mask |= (1LL << GNUNET_TESTBED_ET_OPERATION_FINISHED);
   GNUNET_TESTBED_run (NULL, config, NUM_PEERS, event_mask, &controller_event_cb,
                       NULL, &master_task, NULL);
   abort_task =
       GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_relative_multiply
-                                    (GNUNET_TIME_UNIT_SECONDS, 5), &do_abort,
+                                    (GNUNET_TIME_UNIT_SECONDS, 300), &do_abort,
                                     NULL);
 }
 
@@ -171,23 +167,55 @@ run (void *cls, char *const *args, const char *cfgfile,
 int
 main (int argc, char **argv)
 {
-  int ret;
-
-  char *const argv2[] = {
+  char *argv2[] = {
     "test_testbed_api_testbed_run",
-    "-c", "test_testbed_api.conf",
+    "-c", NULL,
     NULL
   };
   struct GNUNET_GETOPT_CommandLineOption options[] = {
     GNUNET_GETOPT_OPTION_END
   };
+  char *testname;
+  char *config_filename;
+  int ret;
 
+  if (NULL == (testname = strrchr (argv[0], (int) '_')))
+  {
+    GNUNET_break (0);
+    return 1;
+  }
+  testname++;
+  testname = GNUNET_strdup (testname);
+#ifdef MINGW
+  {
+    char *period;
+
+    /* check and remove .exe extension */
+    period = strrchr (testname, (int) '.');
+    if (NULL != period)
+      *period = '\0';
+    else
+      GNUNET_break (0);         /* Windows with no .exe? */
+  }
+#endif
+  if (0 != strcmp ("run", testname))
+  {
+    GNUNET_asprintf (&config_filename, 
+                     "test_testbed_api_testbed_run_%s.conf", testname);
+  }
+  else
+    config_filename = GNUNET_strdup ("test_testbed_api.conf");
+  GNUNET_free (testname);
+  argv2[2] = config_filename;
   result = GNUNET_SYSERR;
   ret =
       GNUNET_PROGRAM_run ((sizeof (argv2) / sizeof (char *)) - 1, argv2,
                           "test_testbed_api_testbed_run", "nohelp", options,
                           &run, NULL);
+  GNUNET_free (config_filename);
   if ((GNUNET_OK != ret) || (GNUNET_OK != result))
     return 1;
   return 0;
 }
+
+/* end of test_testbed_api_testbed_run.c */