/*
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
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.
+ Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ Boston, MA 02110-1301, USA.
*/
/**
*/
#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 50
+#define NUM_PEERS 5
/**
* The array of peers; we fill this as the peers are given to us by the testbed
/**
* Abort task identifier
*/
-static GNUNET_SCHEDULER_TaskIdentifier abort_task;
+static struct GNUNET_SCHEDULER_Task * abort_task;
/**
* 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
*
* @param cls NULL
- * @param tc the task context
*/
static void
-do_shutdown (void *cls, const const struct GNUNET_SCHEDULER_TaskContext *tc)
+do_shutdown (void *cls)
{
- if (GNUNET_SCHEDULER_NO_TASK != abort_task)
+ if (NULL != abort_task)
GNUNET_SCHEDULER_cancel (abort_task);
- GNUNET_SCHEDULER_shutdown ();
+ GNUNET_SCHEDULER_shutdown (); /* Stop scheduler to shutdown testbed run */
}
* abort task to run on test timed out
*
* @param cls NULL
- * @param tc the task context
*/
static void
-do_abort (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
+do_abort (void *cls)
{
- GNUNET_log (GNUNET_ERROR_TYPE_WARNING, "Test timedout -- Aborting\n");
- abort_task = GNUNET_SCHEDULER_NO_TASK;
+ abort_task = NULL;
+ GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
+ "Test timed out -- Aborting\n");
GNUNET_SCHEDULER_add_now (&do_shutdown, NULL);
- GNUNET_SCHEDULER_shutdown (); /* Stop the scheduler */
}
/**
- * 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 (NULL == abort_task)
+ return; /* abort already scheduled */
+ GNUNET_SCHEDULER_cancel (abort_task);
+ abort_task = NULL;
+ GNUNET_SCHEDULER_add_shutdown (&do_shutdown, NULL);
+ return;
+ }
GNUNET_assert (NULL != peers[0]);
- op = GNUNET_TESTBED_peer_stop (peers[0]);
+ op = GNUNET_TESTBED_peer_stop (NULL, peers[0], NULL, NULL);
GNUNET_assert (NULL != op);
}
* @param cfg the configuration file handle
*/
static void
-run (void *cls, char *const *args, const char *cfgfile,
+run (void *cls,
+ char *const *args,
+ const char *cfgfile,
const struct GNUNET_CONFIGURATION_Handle *config)
{
uint64_t event_mask;
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);
+ GNUNET_TESTBED_run (NULL, config, NUM_PEERS, event_mask,
+ &controller_event_cb, NULL,
+ &test_master, 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);
}
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 ("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);
+ }
+ 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;
projects / oweals / gnunet.git / blobdiff