/*
This file is part of GNUnet
- (C) 2008--2012 Christian Grothoff (and other contributing authors)
+ (C) 2008--2013 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
*/
#include "platform.h"
-#include "gnunet_common.h"
+#include "gnunet_util_lib.h"
#include "gnunet_testbed_service.h"
/**
* Number of peers we want to start
*/
-#define NUM_PEERS 13
+#define NUM_PEERS 5
/**
* The array of peers; we fill this as the peers are given to us by the testbed
/**
* Current peer id
*/
-unsigned int peer_id;
+static unsigned int peer_id;
/**
* Testing result
*/
static int result;
+/**
+ * Should we wait forever after testbed is initialized?
+ */
+static int wait_forever;
+
/**
* Shutdown nicely
{
if (GNUNET_SCHEDULER_NO_TASK != abort_task)
GNUNET_SCHEDULER_cancel (abort_task);
- GNUNET_SCHEDULER_shutdown (); /* Stop scheduler to shutdown testbed run */
+ GNUNET_SCHEDULER_shutdown (); /* Stop scheduler to shutdown testbed run */
}
{
GNUNET_log (GNUNET_ERROR_TYPE_WARNING, "Test timedout -- Aborting\n");
abort_task = GNUNET_SCHEDULER_NO_TASK;
- GNUNET_SCHEDULER_add_now (&do_shutdown, NULL);
+ (void) GNUNET_SCHEDULER_add_now (&do_shutdown, NULL);
}
/**
- * Task to be executed when peers are ready
+ * Signature of a main function for a testcase.
*
- * @param cls NULL
- * @param tc the task context
+ * @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 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
-master_task (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
+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)
{
result = GNUNET_OK;
+ if (GNUNET_YES == wait_forever)
+ {
+ if (GNUNET_SCHEDULER_NO_TASK == abort_task)
+ return; /* abort already scheduled */
+ GNUNET_SCHEDULER_cancel (abort_task);
+ abort_task = GNUNET_SCHEDULER_NO_TASK;
+ (void) GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_UNIT_FOREVER_REL,
+ &do_shutdown, NULL);
+ return;
+ }
GNUNET_assert (NULL != peers[0]);
- op = GNUNET_TESTBED_peer_stop (peers[0], NULL, NULL);
+ op = GNUNET_TESTBED_peer_stop (NULL, peers[0], NULL, NULL);
GNUNET_assert (NULL != op);
}
event_mask |= (1LL << GNUNET_TESTBED_ET_PEER_START);
event_mask |= (1LL << GNUNET_TESTBED_ET_PEER_STOP);
GNUNET_TESTBED_run (NULL, config, NUM_PEERS, event_mask, &controller_event_cb,
- NULL, &master_task, NULL);
+ NULL, &test_master, NULL);
abort_task =
GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_relative_multiply
- (GNUNET_TIME_UNIT_SECONDS, 60), &do_abort,
+ (GNUNET_TIME_UNIT_SECONDS, 300), &do_abort,
NULL);
}
GNUNET_break (0); /* Windows with no .exe? */
}
#endif
- if (0 != strcmp ("run", testname))
+ if (0 == strcmp ("waitforever", testname))
+ wait_forever = GNUNET_YES;
+ if ( (GNUNET_YES != wait_forever) && (0 != strcmp ("run", testname)) )
{
- GNUNET_asprintf (&config_filename,
- "test_testbed_api_testbed_run_%s.conf", testname);
+ GNUNET_asprintf (&config_filename, "test_testbed_api_testbed_run_%s.conf",
+ testname);
}
else
config_filename = GNUNET_strdup ("test_testbed_api.conf");