[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] r31844 - gnunet/src/testbed
From: |
gnunet |
Subject: |
[GNUnet-SVN] r31844 - gnunet/src/testbed |
Date: |
Wed, 8 Jan 2014 22:29:00 +0100 |
Author: harsha
Date: 2014-01-08 22:29:00 +0100 (Wed, 08 Jan 2014)
New Revision: 31844
Modified:
gnunet/src/testbed/gnunet-daemon-testbed-underlay.c
gnunet/src/testbed/test_testbed_underlay.c
gnunet/src/testbed/test_testbed_underlay.conf.in
gnunet/src/testbed/testbed_api_testbed.c
Log:
-fixes
Modified: gnunet/src/testbed/gnunet-daemon-testbed-underlay.c
===================================================================
--- gnunet/src/testbed/gnunet-daemon-testbed-underlay.c 2014-01-08 21:16:41 UTC
(rev 31843)
+++ gnunet/src/testbed/gnunet-daemon-testbed-underlay.c 2014-01-08 21:29:00 UTC
(rev 31844)
@@ -158,7 +158,13 @@
GNUNET_assert (NULL != map);
contains = GNUNET_CONTAINER_multipeermap_contains (map, pid);
- return (contains) ? GNUNET_OK : GNUNET_SYSERR;
+ if (GNUNET_YES == contains)
+ {
+ DEBUG ("Permitting `%s'\n", GNUNET_i2s (pid));
+ return GNUNET_OK;
+ }
+ DEBUG ("Not permitting `%s'\n", GNUNET_i2s (pid));
+ return GNUNET_SYSERR;
}
Modified: gnunet/src/testbed/test_testbed_underlay.c
===================================================================
--- gnunet/src/testbed/test_testbed_underlay.c 2014-01-08 21:16:41 UTC (rev
31843)
+++ gnunet/src/testbed/test_testbed_underlay.c 2014-01-08 21:29:00 UTC (rev
31844)
@@ -43,6 +43,21 @@
/**
+ * Shutdown testcase
+ *
+ * @param cls NULL
+ * @param tc scheduler task context
+ */
+static void
+do_shutdown (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
+{
+ if (NULL != op)
+ GNUNET_TESTBED_operation_done (op);
+ op = NULL;
+}
+
+
+/**
* Callback to be called when an operation is completed
*
* @param cls the callback closure from functions generating an operation
@@ -90,6 +105,7 @@
if (NULL == peers_)
{
GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Failing test due to timeout\n");
+ GNUNET_SCHEDULER_shutdown ();
return;
}
GNUNET_assert (NUM_PEERS == num_peers);
@@ -99,6 +115,9 @@
NULL,
peers_[0],
peers_[2]);
+ GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_relative_multiply
(GNUNET_TIME_UNIT_SECONDS,
+ 15),
+ &do_shutdown, NULL);
}
Modified: gnunet/src/testbed/test_testbed_underlay.conf.in
===================================================================
--- gnunet/src/testbed/test_testbed_underlay.conf.in 2014-01-08 21:16:41 UTC
(rev 31843)
+++ gnunet/src/testbed/test_testbed_underlay.conf.in 2014-01-08 21:29:00 UTC
(rev 31844)
@@ -2,6 +2,7 @@
[testbed]
OVERLAY_TOPOLOGY = LINE
+OPERATION_TIMEOUT = 5 s
[testbed-underlay]
AUTOSTART = NO
Modified: gnunet/src/testbed/testbed_api_testbed.c
===================================================================
--- gnunet/src/testbed/testbed_api_testbed.c 2014-01-08 21:16:41 UTC (rev
31843)
+++ gnunet/src/testbed/testbed_api_testbed.c 2014-01-08 21:29:00 UTC (rev
31844)
@@ -448,12 +448,11 @@
/**
* Assuming all peers have been destroyed cleanup run handle
*
- * @param cls the run handle
+ * @param rc the run context
*/
static void
-cleanup (void *cls)
+cleanup (struct GNUNET_TESTBED_RunHandle *rc)
{
- struct GNUNET_TESTBED_RunHandle *rc = cls;
unsigned int hid;
GNUNET_assert (GNUNET_SCHEDULER_NO_TASK == rc->register_hosts_task);
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [GNUnet-SVN] r31844 - gnunet/src/testbed,
gnunet <=