projects
/
oweals
/
gnunet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
refactoring ARM api to use new MQ
[oweals/gnunet.git]
/
src
/
testbed
/
test_testbed_api_topology.c
diff --git
a/src/testbed/test_testbed_api_topology.c
b/src/testbed/test_testbed_api_topology.c
index 4933f4793b733d8e61564063d431c70b89e6ca1e..49b46b0dfd3e8c79ce6f0069974cc716f0a50d76 100644
(file)
--- a/
src/testbed/test_testbed_api_topology.c
+++ b/
src/testbed/test_testbed_api_topology.c
@@
-1,6
+1,6
@@
/*
This file is part of GNUnet
/*
This file is part of GNUnet
- (C) 2008--2013 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
GNUnet is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published
@@
-14,8
+14,8
@@
You should have received a copy of the GNU General Public License
along with GNUnet; see the file COPYING. If not, write to the
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., 5
9 Temple Place - Suite 330
,
- Boston, MA 0211
1-1307
, USA.
+ Free Software Foundation, Inc., 5
1 Franklin Street, Fifth Floor
,
+ Boston, MA 0211
0-1301
, USA.
*/
/**
*/
/**
@@
-25,7
+25,7
@@
*/
#include "platform.h"
*/
#include "platform.h"
-#include "gnunet_
common
.h"
+#include "gnunet_
util_lib
.h"
#include "gnunet_testbed_service.h"
/**
#include "gnunet_testbed_service.h"
/**
@@
-46,7
+46,7
@@
static struct GNUNET_TESTBED_Operation *op;
/**
* Shutdown task
*/
/**
* Shutdown task
*/
-static
GNUNET_SCHEDULER_TaskIdentifier
shutdown_task;
+static
struct GNUNET_SCHEDULER_Task *
shutdown_task;
/**
* Testing result
/**
* Testing result
@@
-63,12
+63,11
@@
static unsigned int overlay_connects;
* Shutdown nicely
*
* @param cls NULL
* Shutdown nicely
*
* @param cls NULL
- * @param tc the task context
*/
static void
*/
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);
if (NULL != op)
{
GNUNET_TESTBED_operation_done (op);
@@
-94,7
+93,8
@@
controller_event_cb (void *cls,
if ((NUM_PEERS) == overlay_connects)
{
result = GNUNET_OK;
if ((NUM_PEERS) == 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:
}
break;
case GNUNET_TESTBED_ET_OPERATION_FINISHED:
@@
-118,6
+118,7
@@
controller_event_cb (void *cls,
* Signature of a main function for a testcase.
*
* @param cls closure
* 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 links_succeeded the number of overlay link connection attempts that
* @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
@@
-126,7
+127,9
@@
controller_event_cb (void *cls,
* failed
*/
static void
* failed
*/
static void
-test_master (void *cls, unsigned int num_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)
struct GNUNET_TESTBED_Peer **peers_,
unsigned int links_succeeded,
unsigned int links_failed)
@@
-134,8
+137,12
@@
test_master (void *cls, unsigned int num_peers,
unsigned int peer;
GNUNET_assert (NULL == cls);
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 (NUM_PEERS == num_peers);
- GNUNET_assert (NULL != peers_);
for (peer = 0; peer < num_peers; peer++)
GNUNET_assert (NULL != peers_[peer]);
peers = peers_;
for (peer = 0; peer < num_peers; peer++)
GNUNET_assert (NULL != peers_[peer]);
peers = peers_;