Merge branch 'master' of gnunet.org:gnunet

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

diff --git a/src/testbed/test_testbed_api_topology_clique.c b/src/testbed/test_testbed_api_topology_clique.c
index f1330277b13a0d28ec09f242de718babf80f9a70..69315f95c48fe00a2b1241e8488877285d6d920f 100644 (file)
--- a/src/testbed/test_testbed_api_topology_clique.c
+++ b/src/testbed/test_testbed_api_topology_clique.c
@@ -1,21 +1,19 @@
 /*
   This file is part of GNUnet
-  (C) 2008--2012 Christian Grothoff (and other contributing authors)
+  Copyright (C) 2008--2013 GNUnet e.V.
 
-  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 free software: you can redistribute it and/or modify it
+  under the terms of the GNU Affero General Public License as published
+  by the Free Software Foundation, either version 3 of the License,
+  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.
+  Affero General Public License for more details.
+ 
+  You should have received a copy of the GNU Affero General Public License
+  along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
 /**
@@ -25,7 +23,7 @@
  */
 
 #include "platform.h"
-#include "gnunet_common.h"
+#include "gnunet_util_lib.h"
 #include "gnunet_testbed_service.h"
 
 /**
@@ -46,7 +44,7 @@ static struct GNUNET_TESTBED_Operation *op;
 /**
  * Shutdown task
  */
-static GNUNET_SCHEDULER_TaskIdentifier shutdown_task;
+static struct GNUNET_SCHEDULER_Task * shutdown_task;
 
 /**
  * Testing result
@@ -63,12 +61,11 @@ static unsigned int overlay_connects;
  * Shutdown nicely
  *
  * @param cls NULL
- * @param tc the task context
  */
 static void
-do_shutdown (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
+do_shutdown (void *cls)
 {
-  shutdown_task = GNUNET_SCHEDULER_NO_TASK;
+  shutdown_task = NULL;
   if (NULL != op)
   {
     GNUNET_TESTBED_operation_done (op);
@@ -94,7 +91,8 @@ controller_event_cb (void *cls,
     if ((NUM_PEERS * (NUM_PEERS - 1)) == overlay_connects)
     {
       result = GNUNET_OK;
-      GNUNET_SCHEDULER_add_now (&do_shutdown, NULL);
+      GNUNET_SCHEDULER_cancel (shutdown_task);
+      shutdown_task = GNUNET_SCHEDULER_add_now (&do_shutdown, NULL);
     }
     break;
   case GNUNET_TESTBED_ET_OPERATION_FINISHED:
@@ -102,15 +100,10 @@ controller_event_cb (void *cls,
     break;
   default:
     GNUNET_break (0);
-    if ((GNUNET_TESTBED_ET_OPERATION_FINISHED == event->type) && 
-        (NULL != event->details.operation_finished.emsg))
-      GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
-                  "An operation failed with error: %s\n",
-                  event->details.operation_finished.emsg);
     result = GNUNET_SYSERR;
     GNUNET_SCHEDULER_cancel (shutdown_task);
     shutdown_task = GNUNET_SCHEDULER_add_now (&do_shutdown, NULL);
-  }  
+  }
 }
 
 
@@ -118,31 +111,47 @@ controller_event_cb (void *cls,
  * Signature of a main function for a testcase.
  *
  * @param cls closure
+ * @param h the run handle
  * @param num_peers number of peers in 'peers'
- * @param peers handle to peers run in the testbed
+ * @param peers_ handle to peers run in the testbed
+ * @param links_succeeded the number of overlay link connection attempts that
+ *          succeeded
+ * @param links_failed the number of overlay link connection attempts that
+ *          failed
  */
 static void
-test_master (void *cls, unsigned int num_peers,
-             struct GNUNET_TESTBED_Peer **peers_)
+test_master (void *cls,
+             struct GNUNET_TESTBED_RunHandle *h,
+             unsigned int num_peers,
+             struct GNUNET_TESTBED_Peer **peers_,
+             unsigned int links_succeeded,
+             unsigned int links_failed)
 {
   unsigned int peer;
 
   GNUNET_assert (NULL == cls);
+  if (NULL == peers_)
+  {
+    GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Failing test due to timeout\n");
+    return;
+  }
   GNUNET_assert (NUM_PEERS == num_peers);
-  GNUNET_assert (NULL != peers_);
   for (peer = 0; peer < num_peers; peer++)
     GNUNET_assert (NULL != peers_[peer]);
   peers = peers_;
   overlay_connects = 0;
-  op = GNUNET_TESTBED_overlay_configure_topology (NULL, NUM_PEERS, peers,
+  op = GNUNET_TESTBED_overlay_configure_topology (NULL, NUM_PEERS, peers, NULL,
+                                                  NULL,
+                                                  NULL,
                                                   GNUNET_TESTBED_TOPOLOGY_CLIQUE,
-                                                 /* GNUNET_TESTBED_TOPOLOGY_ERDOS_RENYI, */
-                                                  /* NUM_PEERS, */ 
+                                                  /* GNUNET_TESTBED_TOPOLOGY_ERDOS_RENYI, */
+                                                  /* NUM_PEERS, */
                                                   GNUNET_TESTBED_TOPOLOGY_OPTION_END);
   GNUNET_assert (NULL != op);
-  shutdown_task = GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_relative_multiply
-                                                (GNUNET_TIME_UNIT_SECONDS, 120),
-                                                do_shutdown, NULL);
+  shutdown_task =
+      GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_relative_multiply
+                                    (GNUNET_TIME_UNIT_SECONDS, 300),
+                                    do_shutdown, NULL);
 }
 
 
@@ -158,9 +167,10 @@ main (int argc, char **argv)
   event_mask = 0;
   event_mask |= (1LL << GNUNET_TESTBED_ET_CONNECT);
   event_mask |= (1LL << GNUNET_TESTBED_ET_OPERATION_FINISHED);
-  GNUNET_TESTBED_test_run ("test_testbed_api_test", "test_testbed_api.conf",
-                           NUM_PEERS, event_mask, &controller_event_cb, NULL,
-                           &test_master, NULL);
+  (void) GNUNET_TESTBED_test_run ("test_testbed_api_test",
+                                  "test_testbed_api.conf", NUM_PEERS,
+                                  event_mask, &controller_event_cb, NULL,
+                                  &test_master, NULL);
   if (GNUNET_OK != result)
     return 1;
   return 0;