[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] r26650 - in gnunet/src: ats consensus dht dv fs gns include
|
From: |
gnunet |
|
Subject: |
[GNUnet-SVN] r26650 - in gnunet/src: ats consensus dht dv fs gns include mesh nse stream testbed topology |
|
Date: |
Thu, 28 Mar 2013 17:47:02 +0100 |
Author: harsha
Date: 2013-03-28 17:47:02 +0100 (Thu, 28 Mar 2013)
New Revision: 26650
Modified:
gnunet/src/ats/gnunet-service-ats_addresses.c
gnunet/src/consensus/gnunet-consensus-start-peers.c
gnunet/src/consensus/gnunet-consensus.c
gnunet/src/dht/dht_test_lib.c
gnunet/src/dv/test_transport_blacklist.c
gnunet/src/dv/test_transport_dv.c
gnunet/src/fs/gnunet-fs-profiler.c
gnunet/src/fs/perf_gnunet_service_fs_p2p.c
gnunet/src/fs/perf_gnunet_service_fs_p2p_respect.c
gnunet/src/fs/test_fs_test_lib.c
gnunet/src/fs/test_gnunet_service_fs_migration.c
gnunet/src/fs/test_gnunet_service_fs_p2p.c
gnunet/src/gns/test_gns_dht_three_peers.c
gnunet/src/include/gnunet_testbed_service.h
gnunet/src/mesh/mesh_test_lib.c
gnunet/src/nse/gnunet-nse-profiler.c
gnunet/src/nse/test_nse_multipeer.c
gnunet/src/stream/perf_stream_api.c
gnunet/src/stream/test_stream_2peers.c
gnunet/src/stream/test_stream_2peers_halfclose.c
gnunet/src/testbed/gnunet-testbed-profiler.c
gnunet/src/testbed/test_testbed_api_statistics.c
gnunet/src/testbed/test_testbed_api_test.c
gnunet/src/testbed/test_testbed_api_test_timeout.c
gnunet/src/testbed/test_testbed_api_testbed_run.c
gnunet/src/testbed/test_testbed_api_topology.c
gnunet/src/testbed/test_testbed_api_topology_clique.c
gnunet/src/testbed/testbed_api_testbed.c
gnunet/src/topology/test_gnunet_daemon_topology.c
Log:
provide how many links succeeded and how many failed in test master callback
from GNUNET_TESTBED_run() and GNUNET_TESTBED_test_run() functions
Modified: gnunet/src/ats/gnunet-service-ats_addresses.c
===================================================================
--- gnunet/src/ats/gnunet-service-ats_addresses.c 2013-03-28 16:01:51 UTC
(rev 26649)
+++ gnunet/src/ats/gnunet-service-ats_addresses.c 2013-03-28 16:47:02 UTC
(rev 26650)
@@ -803,9 +803,9 @@
session_id, atsi, atsi_count);
if (aa == NULL)
{
- GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Tried to update unknown address for
peer `%s' `%s' session id %u\n",
- GNUNET_i2s (peer), plugin_name, session_id);
- GNUNET_break (0);
+ /* GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Tried to update unknown address
for peer `%s' `%s' session id %u\n", */
+ /* GNUNET_i2s (peer), plugin_name, session_id); */
+ /* GNUNET_break (0); */
return;
}
Modified: gnunet/src/consensus/gnunet-consensus-start-peers.c
===================================================================
--- gnunet/src/consensus/gnunet-consensus-start-peers.c 2013-03-28 16:01:51 UTC
(rev 26649)
+++ gnunet/src/consensus/gnunet-consensus-start-peers.c 2013-03-28 16:47:02 UTC
(rev 26650)
@@ -105,10 +105,24 @@
+/**
+ * Signature of a main function for a testcase.
+ *
+ * @param cls closure
+ * @param num_peers number of peers in 'peers'
+ * @param peers handle to peers run in the testbed. NULL upon timeout (see
+ * GNUNET_TESTBED_test_run()).
+ * @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 **started_peers)
+ struct GNUNET_TESTBED_Peer **started_peers,
+ unsigned int links_succeeded,
+ unsigned int links_failed)
{
int i;
Modified: gnunet/src/consensus/gnunet-consensus.c
===================================================================
--- gnunet/src/consensus/gnunet-consensus.c 2013-03-28 16:01:51 UTC (rev
26649)
+++ gnunet/src/consensus/gnunet-consensus.c 2013-03-28 16:47:02 UTC (rev
26650)
@@ -276,10 +276,24 @@
}
+/**
+ * Signature of a main function for a testcase.
+ *
+ * @param cls closure
+ * @param num_peers number of peers in 'peers'
+ * @param peers handle to peers run in the testbed. NULL upon timeout (see
+ * GNUNET_TESTBED_test_run()).
+ * @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 **started_peers)
+ struct GNUNET_TESTBED_Peer **started_peers,
+ unsigned int links_succeeded,
+ unsigned int links_failed)
{
int i;
Modified: gnunet/src/dht/dht_test_lib.c
===================================================================
--- gnunet/src/dht/dht_test_lib.c 2013-03-28 16:01:51 UTC (rev 26649)
+++ gnunet/src/dht/dht_test_lib.c 2013-03-28 16:47:02 UTC (rev 26650)
@@ -160,7 +160,9 @@
static void
dht_test_run (void *cls,
unsigned int num_peers,
- struct GNUNET_TESTBED_Peer **peers)
+ struct GNUNET_TESTBED_Peer **peers,
+ unsigned int links_succeeded,
+ unsigned int links_failed)
{
struct GNUNET_DHT_TEST_Context *ctx = cls;
unsigned int i;
Modified: gnunet/src/dv/test_transport_blacklist.c
===================================================================
--- gnunet/src/dv/test_transport_blacklist.c 2013-03-28 16:01:51 UTC (rev
26649)
+++ gnunet/src/dv/test_transport_blacklist.c 2013-03-28 16:47:02 UTC (rev
26650)
@@ -34,7 +34,9 @@
static void
test_connection (void *cls,
unsigned int num_peers,
- struct GNUNET_TESTBED_Peer **peers)
+ struct GNUNET_TESTBED_Peer **peers,
+ unsigned int links_succeeded,
+ unsigned int links_failed)
{
if (4 == num_peers)
{
Modified: gnunet/src/dv/test_transport_dv.c
===================================================================
--- gnunet/src/dv/test_transport_dv.c 2013-03-28 16:01:51 UTC (rev 26649)
+++ gnunet/src/dv/test_transport_dv.c 2013-03-28 16:47:02 UTC (rev 26650)
@@ -34,7 +34,9 @@
static void
test_connection (void *cls,
unsigned int num_peers,
- struct GNUNET_TESTBED_Peer **peers)
+ struct GNUNET_TESTBED_Peer **peers,
+ unsigned int links_succeeded,
+ unsigned int links_failed)
{
if (4 != num_peers)
{
Modified: gnunet/src/fs/gnunet-fs-profiler.c
===================================================================
--- gnunet/src/fs/gnunet-fs-profiler.c 2013-03-28 16:01:51 UTC (rev 26649)
+++ gnunet/src/fs/gnunet-fs-profiler.c 2013-03-28 16:47:02 UTC (rev 26650)
@@ -130,9 +130,16 @@
* @param cls closure
* @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
-test_master (void *cls, unsigned int num_peers, struct GNUNET_TESTBED_Peer
**peers)
+test_master (void *cls, unsigned int num_peers,
+ struct GNUNET_TESTBED_Peer **peers,
+ unsigned int links_succeeded,
+ unsigned int links_failed)
{
// const struct GNUNET_CONFIGURATION_Handle *cfg = cls;
// FIXME: enable clients to signal 'completion' before timeout;
Modified: gnunet/src/fs/perf_gnunet_service_fs_p2p.c
===================================================================
--- gnunet/src/fs/perf_gnunet_service_fs_p2p.c 2013-03-28 16:01:51 UTC (rev
26649)
+++ gnunet/src/fs/perf_gnunet_service_fs_p2p.c 2013-03-28 16:47:02 UTC (rev
26650)
@@ -306,7 +306,9 @@
static void
do_publish (void *cls,
unsigned int num_peers,
- struct GNUNET_TESTBED_Peer **peers)
+ struct GNUNET_TESTBED_Peer **peers,
+ unsigned int links_succeeded,
+ unsigned int links_failed)
{
unsigned int i;
int do_index;
Modified: gnunet/src/fs/perf_gnunet_service_fs_p2p_respect.c
===================================================================
--- gnunet/src/fs/perf_gnunet_service_fs_p2p_respect.c 2013-03-28 16:01:51 UTC
(rev 26649)
+++ gnunet/src/fs/perf_gnunet_service_fs_p2p_respect.c 2013-03-28 16:47:02 UTC
(rev 26650)
@@ -435,7 +435,9 @@
static void
do_connect (void *cls,
unsigned int num_peers,
- struct GNUNET_TESTBED_Peer **peers)
+ struct GNUNET_TESTBED_Peer **peers,
+ unsigned int links_succeeded,
+ unsigned int links_failed)
{
static unsigned int coco;
unsigned int i;
Modified: gnunet/src/fs/test_fs_test_lib.c
===================================================================
--- gnunet/src/fs/test_fs_test_lib.c 2013-03-28 16:01:51 UTC (rev 26649)
+++ gnunet/src/fs/test_fs_test_lib.c 2013-03-28 16:47:02 UTC (rev 26650)
@@ -117,11 +117,17 @@
* @param cls closure
* @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
run (void *cls,
unsigned int num_peers,
- struct GNUNET_TESTBED_Peer **peers)
+ struct GNUNET_TESTBED_Peer **peers,
+ unsigned int links_succeeded,
+ unsigned int links_failed)
{
unsigned int i;
Modified: gnunet/src/fs/test_gnunet_service_fs_migration.c
===================================================================
--- gnunet/src/fs/test_gnunet_service_fs_migration.c 2013-03-28 16:01:51 UTC
(rev 26649)
+++ gnunet/src/fs/test_gnunet_service_fs_migration.c 2013-03-28 16:47:02 UTC
(rev 26650)
@@ -162,7 +162,9 @@
static void
do_publish (void *cls,
unsigned int num_peers,
- struct GNUNET_TESTBED_Peer **peers)
+ struct GNUNET_TESTBED_Peer **peers,
+ unsigned int links_succeeded,
+ unsigned int links_failed)
{
unsigned int i;
Modified: gnunet/src/fs/test_gnunet_service_fs_p2p.c
===================================================================
--- gnunet/src/fs/test_gnunet_service_fs_p2p.c 2013-03-28 16:01:51 UTC (rev
26649)
+++ gnunet/src/fs/test_gnunet_service_fs_p2p.c 2013-03-28 16:47:02 UTC (rev
26650)
@@ -115,7 +115,9 @@
static void
do_publish (void *cls,
unsigned int num_peers,
- struct GNUNET_TESTBED_Peer **peers)
+ struct GNUNET_TESTBED_Peer **peers,
+ unsigned int links_succeeded,
+ unsigned int links_failed)
{
unsigned int i;
Modified: gnunet/src/gns/test_gns_dht_three_peers.c
===================================================================
--- gnunet/src/gns/test_gns_dht_three_peers.c 2013-03-28 16:01:51 UTC (rev
26649)
+++ gnunet/src/gns/test_gns_dht_three_peers.c 2013-03-28 16:47:02 UTC (rev
26650)
@@ -585,7 +585,9 @@
void testbed_master (void *cls,
unsigned int num_peers,
- struct GNUNET_TESTBED_Peer **peers)
+ struct GNUNET_TESTBED_Peer **peers,
+ unsigned int links_succeeded,
+ unsigned int links_failed)
{
GNUNET_assert (NULL != peers);
cpeers = peers;
Modified: gnunet/src/include/gnunet_testbed_service.h
===================================================================
--- gnunet/src/include/gnunet_testbed_service.h 2013-03-28 16:01:51 UTC (rev
26649)
+++ gnunet/src/include/gnunet_testbed_service.h 2013-03-28 16:47:02 UTC (rev
26650)
@@ -1364,10 +1364,16 @@
* @param num_peers number of peers in 'peers'
* @param peers handle to peers run in the testbed. NULL upon timeout (see
* GNUNET_TESTBED_test_run()).
+ * @param links_succeeded the number of overlay link connection attempts that
+ * succeeded
+ * @param links_failed the number of overlay link connection attempts that
+ * failed
*/
typedef void (*GNUNET_TESTBED_TestMaster)(void *cls,
unsigned int num_peers,
- struct GNUNET_TESTBED_Peer **peers);
+ struct GNUNET_TESTBED_Peer **peers,
+ unsigned int links_succeeded,
+ unsigned int links_failed);
/**
Modified: gnunet/src/mesh/mesh_test_lib.c
===================================================================
--- gnunet/src/mesh/mesh_test_lib.c 2013-03-28 16:01:51 UTC (rev 26649)
+++ gnunet/src/mesh/mesh_test_lib.c 2013-03-28 16:47:02 UTC (rev 26650)
@@ -224,7 +224,9 @@
static void
mesh_test_run (void *cls,
unsigned int num_peers,
- struct GNUNET_TESTBED_Peer **peers)
+ struct GNUNET_TESTBED_Peer **peers,
+ unsigned int links_succeeded,
+ unsigned int links_failed)
{
struct GNUNET_MESH_TEST_Context *ctx = cls;
unsigned int i;
Modified: gnunet/src/nse/gnunet-nse-profiler.c
===================================================================
--- gnunet/src/nse/gnunet-nse-profiler.c 2013-03-28 16:01:51 UTC (rev
26649)
+++ gnunet/src/nse/gnunet-nse-profiler.c 2013-03-28 16:47:02 UTC (rev
26650)
@@ -768,11 +768,17 @@
* @param num_peers_ number of peers in 'peers'
* @param peers handle to peers run in the testbed. NULL upon timeout (see
* GNUNET_TESTBED_test_run()).
+ * @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)
+ struct GNUNET_TESTBED_Peer **peers,
+ unsigned int links_succeeded,
+ unsigned int links_failed)
{
if (NULL == peers)
{
Modified: gnunet/src/nse/test_nse_multipeer.c
===================================================================
--- gnunet/src/nse/test_nse_multipeer.c 2013-03-28 16:01:51 UTC (rev 26649)
+++ gnunet/src/nse/test_nse_multipeer.c 2013-03-28 16:47:02 UTC (rev 26650)
@@ -181,11 +181,17 @@
* @param cls closure
* @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
run (void *cls,
unsigned int num_peers,
- struct GNUNET_TESTBED_Peer **peers)
+ struct GNUNET_TESTBED_Peer **peers,
+ unsigned int links_succeeded,
+ unsigned int links_failed)
{
unsigned int i;
Modified: gnunet/src/stream/perf_stream_api.c
===================================================================
--- gnunet/src/stream/perf_stream_api.c 2013-03-28 16:01:51 UTC (rev 26649)
+++ gnunet/src/stream/perf_stream_api.c 2013-03-28 16:47:02 UTC (rev 26650)
@@ -950,10 +950,16 @@
* @param cls closure
* @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
test_master (void *cls, unsigned int num_peers_,
- struct GNUNET_TESTBED_Peer **peers)
+ struct GNUNET_TESTBED_Peer **peers,
+ unsigned int links_succeeded,
+ unsigned int links_failed)
{
GNUNET_assert (NULL != peers);
GNUNET_assert (NULL != peers[0]);
Modified: gnunet/src/stream/test_stream_2peers.c
===================================================================
--- gnunet/src/stream/test_stream_2peers.c 2013-03-28 16:01:51 UTC (rev
26649)
+++ gnunet/src/stream/test_stream_2peers.c 2013-03-28 16:47:02 UTC (rev
26650)
@@ -618,10 +618,16 @@
* @param cls closure
* @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
test_master (void *cls, unsigned int num_peers,
- struct GNUNET_TESTBED_Peer **peers)
+ struct GNUNET_TESTBED_Peer **peers,
+ unsigned int links_succeeded,
+ unsigned int links_failed)
{
GNUNET_assert (NULL != peers);
GNUNET_assert (NULL != peers[0]);
Modified: gnunet/src/stream/test_stream_2peers_halfclose.c
===================================================================
--- gnunet/src/stream/test_stream_2peers_halfclose.c 2013-03-28 16:01:51 UTC
(rev 26649)
+++ gnunet/src/stream/test_stream_2peers_halfclose.c 2013-03-28 16:47:02 UTC
(rev 26650)
@@ -842,10 +842,16 @@
* @param cls closure
* @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
test_master (void *cls, unsigned int num_peers,
- struct GNUNET_TESTBED_Peer **peers)
+ struct GNUNET_TESTBED_Peer **peers,
+ unsigned int links_succeeded,
+ unsigned int links_failed)
{
GNUNET_assert (NULL != peers);
GNUNET_assert (NULL != peers[0]);
Modified: gnunet/src/testbed/gnunet-testbed-profiler.c
===================================================================
--- gnunet/src/testbed/gnunet-testbed-profiler.c 2013-03-28 16:01:51 UTC
(rev 26649)
+++ gnunet/src/testbed/gnunet-testbed-profiler.c 2013-03-28 16:47:02 UTC
(rev 26650)
@@ -204,9 +204,14 @@
* @param cls closure
* @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
*/
static void
-test_run (void *cls, unsigned int num_peers, struct GNUNET_TESTBED_Peer
**peers)
+test_run (void *cls, unsigned int num_peers, struct GNUNET_TESTBED_Peer
**peers,
+ unsigned int links_succeeded,
+ unsigned int links_failed)
{
result = GNUNET_OK;
fprintf (stdout, "\n");
Modified: gnunet/src/testbed/test_testbed_api_statistics.c
===================================================================
--- gnunet/src/testbed/test_testbed_api_statistics.c 2013-03-28 16:01:51 UTC
(rev 26649)
+++ gnunet/src/testbed/test_testbed_api_statistics.c 2013-03-28 16:47:02 UTC
(rev 26650)
@@ -151,11 +151,17 @@
*
* @param cls closure
* @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_)
+ struct GNUNET_TESTBED_Peer **peers_,
+ unsigned int links_succeeded,
+ unsigned int links_failed)
{
FAIL_TEST (NUM_PEERS == num_peers, return);
peers = peers_;
Modified: gnunet/src/testbed/test_testbed_api_test.c
===================================================================
--- gnunet/src/testbed/test_testbed_api_test.c 2013-03-28 16:01:51 UTC (rev
26649)
+++ gnunet/src/testbed/test_testbed_api_test.c 2013-03-28 16:47:02 UTC (rev
26650)
@@ -194,11 +194,17 @@
*
* @param cls closure
* @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_)
+ struct GNUNET_TESTBED_Peer **peers_,
+ unsigned int links_succeeded,
+ unsigned int links_failed)
{
unsigned int peer;
Modified: gnunet/src/testbed/test_testbed_api_test_timeout.c
===================================================================
--- gnunet/src/testbed/test_testbed_api_test_timeout.c 2013-03-28 16:01:51 UTC
(rev 26649)
+++ gnunet/src/testbed/test_testbed_api_test_timeout.c 2013-03-28 16:47:02 UTC
(rev 26650)
@@ -79,11 +79,17 @@
*
* @param cls closure
* @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_)
+ struct GNUNET_TESTBED_Peer **peers_,
+ unsigned int links_succeeded,
+ unsigned int links_failed)
{
FAIL_TEST (NULL == cls);
FAIL_TEST (0 == num_peers);
Modified: gnunet/src/testbed/test_testbed_api_testbed_run.c
===================================================================
--- gnunet/src/testbed/test_testbed_api_testbed_run.c 2013-03-28 16:01:51 UTC
(rev 26649)
+++ gnunet/src/testbed/test_testbed_api_testbed_run.c 2013-03-28 16:47:02 UTC
(rev 26650)
@@ -94,11 +94,17 @@
*
* @param cls closure
* @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_)
+ struct GNUNET_TESTBED_Peer **peers_,
+ unsigned int links_succeeded,
+ unsigned int links_failed)
{
result = GNUNET_OK;
GNUNET_assert (NULL != peers[0]);
Modified: gnunet/src/testbed/test_testbed_api_topology.c
===================================================================
--- gnunet/src/testbed/test_testbed_api_topology.c 2013-03-28 16:01:51 UTC
(rev 26649)
+++ gnunet/src/testbed/test_testbed_api_topology.c 2013-03-28 16:47:02 UTC
(rev 26650)
@@ -119,11 +119,17 @@
*
* @param cls closure
* @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_)
+ struct GNUNET_TESTBED_Peer **peers_,
+ unsigned int links_succeeded,
+ unsigned int links_failed)
{
unsigned int peer;
Modified: gnunet/src/testbed/test_testbed_api_topology_clique.c
===================================================================
--- gnunet/src/testbed/test_testbed_api_topology_clique.c 2013-03-28
16:01:51 UTC (rev 26649)
+++ gnunet/src/testbed/test_testbed_api_topology_clique.c 2013-03-28
16:47:02 UTC (rev 26650)
@@ -114,11 +114,17 @@
*
* @param cls closure
* @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_)
+ struct GNUNET_TESTBED_Peer **peers_,
+ unsigned int links_succeeded,
+ unsigned int links_failed)
{
unsigned int peer;
Modified: gnunet/src/testbed/testbed_api_testbed.c
===================================================================
--- gnunet/src/testbed/testbed_api_testbed.c 2013-03-28 16:01:51 UTC (rev
26649)
+++ gnunet/src/testbed/testbed_api_testbed.c 2013-03-28 16:47:02 UTC (rev
26650)
@@ -295,6 +295,16 @@
*/
unsigned int random_links;
+ /**
+ * the number of overlay link connection attempts that succeeded
+ */
+ unsigned int links_succeeded;
+
+ /**
+ * the number of overlay link connection attempts that failed
+ */
+ unsigned int links_failed;
+
};
@@ -540,7 +550,8 @@
GNUNET_SCHEDULER_cancel (rc->timeout_task);
rc->timeout_task = GNUNET_SCHEDULER_NO_TASK;
if (NULL != rc->test_master)
- rc->test_master (rc->test_master_cls, rc->num_peers, rc->peers);
+ rc->test_master (rc->test_master_cls, rc->num_peers, rc->peers,
+ rc->links_succeeded, rc->links_failed);
}
@@ -562,6 +573,8 @@
DEBUG ("Overlay topology generated in %s\n", prof_time (rc));
GNUNET_TESTBED_operation_done (rc->topology_operation);
rc->topology_operation = NULL;
+ rc->links_succeeded = nsuccess;
+ rc->links_failed = nfailures;
rc->state = RC_READY;
call_master (rc);
}
@@ -1001,7 +1014,7 @@
LOG (GNUNET_ERROR_TYPE_ERROR, _("Shutting down testbed due to timeout while
setup.\n"));
shutdown_now (rc);
if (NULL != rc->test_master)
- rc->test_master (rc->test_master_cls, 0, NULL);
+ rc->test_master (rc->test_master_cls, 0, NULL, 0, 0);
rc->test_master = NULL;
}
Modified: gnunet/src/topology/test_gnunet_daemon_topology.c
===================================================================
--- gnunet/src/topology/test_gnunet_daemon_topology.c 2013-03-28 16:01:51 UTC
(rev 26649)
+++ gnunet/src/topology/test_gnunet_daemon_topology.c 2013-03-28 16:47:02 UTC
(rev 26650)
@@ -64,7 +64,9 @@
static void
do_connect (void *cls,
unsigned int num_peers,
- struct GNUNET_TESTBED_Peer **peers)
+ struct GNUNET_TESTBED_Peer **peers,
+ unsigned int links_succeeded,
+ unsigned int links_failed)
{
unsigned int i;
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [GNUnet-SVN] r26650 - in gnunet/src: ats consensus dht dv fs gns include mesh nse stream testbed topology,
gnunet <=