[GNUnet-SVN] r24996 - gnunet/src/testbed

[gnunet]

Author: harsha
Date: 2012-11-16 14:08:10 +0100 (Fri, 16 Nov 2012)
New Revision: 24996

Modified:
   gnunet/src/testbed/test_testbed_api.conf
   gnunet/src/testbed/test_testbed_api_testbed_run.c
   gnunet/src/testbed/test_testbed_api_testbed_run_topologyclique.conf
   gnunet/src/testbed/test_testbed_api_testbed_run_topologyline.conf
   gnunet/src/testbed/test_testbed_api_testbed_run_topologyrandom.conf
   gnunet/src/testbed/test_testbed_api_testbed_run_topologyring.conf
   gnunet/src/testbed/test_testbed_api_testbed_run_topologysmallworldring.conf
   gnunet/src/testbed/test_testbed_api_topology.c
   gnunet/src/testbed/test_testbed_api_topology_clique.c
Log:
-reducing testing peers and links

Modified: gnunet/src/testbed/test_testbed_api.conf
===================================================================
--- gnunet/src/testbed/test_testbed_api.conf    2012-11-16 13:06:51 UTC (rev 
24995)
+++ gnunet/src/testbed/test_testbed_api.conf    2012-11-16 13:08:10 UTC (rev 
24996)
@@ -4,7 +4,7 @@
 ACCEPT_FROM = 127.0.0.1;
 HOSTNAME = localhost
 NEIGHBOUR_LIMIT = 100
-MAX_PARALLEL_OVERLAY_CONNECT_OPERATIONS = 10
+MAX_PARALLEL_OVERLAY_CONNECT_OPERATIONS = 3
 TOPOLOGY = RANDOM
 #PREFIX = xterm -geometry 100x85 -T peer1 -e libtool --mode=execute gdb --args
 

Modified: gnunet/src/testbed/test_testbed_api_testbed_run.c
===================================================================
--- gnunet/src/testbed/test_testbed_api_testbed_run.c   2012-11-16 13:06:51 UTC 
(rev 24995)
+++ gnunet/src/testbed/test_testbed_api_testbed_run.c   2012-11-16 13:08:10 UTC 
(rev 24996)
@@ -31,7 +31,7 @@
 /**
  * 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

Modified: gnunet/src/testbed/test_testbed_api_testbed_run_topologyclique.conf
===================================================================
--- gnunet/src/testbed/test_testbed_api_testbed_run_topologyclique.conf 
2012-11-16 13:06:51 UTC (rev 24995)
+++ gnunet/src/testbed/test_testbed_api_testbed_run_topologyclique.conf 
2012-11-16 13:08:10 UTC (rev 24996)
@@ -4,7 +4,7 @@
 ACCEPT_FROM = 127.0.0.1;
 HOSTNAME = localhost
 NEIGHBOUR_LIMIT = 100
-MAX_PARALLEL_OVERLAY_CONNECT_OPERATIONS = 10
+MAX_PARALLEL_OVERLAY_CONNECT_OPERATIONS = 3
 OVERLAY_TOPOLOGY = CLIQUE
 #PREFIX = xterm -geometry 100x85 -T peer1 -e libtool --mode=execute gdb --args
 

Modified: gnunet/src/testbed/test_testbed_api_testbed_run_topologyline.conf
===================================================================
--- gnunet/src/testbed/test_testbed_api_testbed_run_topologyline.conf   
2012-11-16 13:06:51 UTC (rev 24995)
+++ gnunet/src/testbed/test_testbed_api_testbed_run_topologyline.conf   
2012-11-16 13:08:10 UTC (rev 24996)
@@ -4,7 +4,7 @@
 ACCEPT_FROM = 127.0.0.1;
 HOSTNAME = localhost
 NEIGHBOUR_LIMIT = 100
-MAX_PARALLEL_OVERLAY_CONNECT_OPERATIONS = 10
+MAX_PARALLEL_OVERLAY_CONNECT_OPERATIONS = 1
 OVERLAY_TOPOLOGY = LINE
 #PREFIX = xterm -geometry 100x85 -T peer1 -e libtool --mode=execute gdb --args
 

Modified: gnunet/src/testbed/test_testbed_api_testbed_run_topologyrandom.conf
===================================================================
--- gnunet/src/testbed/test_testbed_api_testbed_run_topologyrandom.conf 
2012-11-16 13:06:51 UTC (rev 24995)
+++ gnunet/src/testbed/test_testbed_api_testbed_run_topologyrandom.conf 
2012-11-16 13:08:10 UTC (rev 24996)
@@ -3,7 +3,7 @@
 PORT = 12113
 ACCEPT_FROM = 127.0.0.1;
 HOSTNAME = localhost
-MAX_PARALLEL_OVERLAY_CONNECT_OPERATIONS = 10
+MAX_PARALLEL_OVERLAY_CONNECT_OPERATIONS = 3
 OVERLAY_TOPOLOGY = RANDOM
 OVERLAY_RANDOM_LINKS = 5
 #PREFIX = xterm -geometry 100x85 -T peer1 -e libtool --mode=execute gdb --args

Modified: gnunet/src/testbed/test_testbed_api_testbed_run_topologyring.conf
===================================================================
--- gnunet/src/testbed/test_testbed_api_testbed_run_topologyring.conf   
2012-11-16 13:06:51 UTC (rev 24995)
+++ gnunet/src/testbed/test_testbed_api_testbed_run_topologyring.conf   
2012-11-16 13:08:10 UTC (rev 24996)
@@ -4,7 +4,7 @@
 ACCEPT_FROM = 127.0.0.1;
 HOSTNAME = localhost
 NEIGHBOUR_LIMIT = 100
-MAX_PARALLEL_OVERLAY_CONNECT_OPERATIONS = 10
+MAX_PARALLEL_OVERLAY_CONNECT_OPERATIONS = 3
 OVERLAY_TOPOLOGY = RING
 #PREFIX = xterm -geometry 100x85 -T peer1 -e libtool --mode=execute gdb --args
 

Modified: 
gnunet/src/testbed/test_testbed_api_testbed_run_topologysmallworldring.conf
===================================================================
--- gnunet/src/testbed/test_testbed_api_testbed_run_topologysmallworldring.conf 
2012-11-16 13:06:51 UTC (rev 24995)
+++ gnunet/src/testbed/test_testbed_api_testbed_run_topologysmallworldring.conf 
2012-11-16 13:08:10 UTC (rev 24996)
@@ -3,9 +3,9 @@
 PORT = 12113
 ACCEPT_FROM = 127.0.0.1;
 HOSTNAME = localhost
-MAX_PARALLEL_OVERLAY_CONNECT_OPERATIONS = 10
+MAX_PARALLEL_OVERLAY_CONNECT_OPERATIONS = 3
 OVERLAY_TOPOLOGY = SMALL_WORLD_RING
-OVERLAY_RANDOM_LINKS = 5
+OVERLAY_RANDOM_LINKS = 3
 #PREFIX = xterm -geometry 100x85 -T peer1 -e libtool --mode=execute gdb --args
 
 [fs]

Modified: gnunet/src/testbed/test_testbed_api_topology.c
===================================================================
--- gnunet/src/testbed/test_testbed_api_topology.c      2012-11-16 13:06:51 UTC 
(rev 24995)
+++ gnunet/src/testbed/test_testbed_api_topology.c      2012-11-16 13:08:10 UTC 
(rev 24996)
@@ -31,7 +31,7 @@
 /**
  * Number of peers we want to start
  */
-#define NUM_PEERS 50
+#define NUM_PEERS 10
 
 /**
  * Array of peers

Modified: gnunet/src/testbed/test_testbed_api_topology_clique.c
===================================================================
--- gnunet/src/testbed/test_testbed_api_topology_clique.c       2012-11-16 
13:06:51 UTC (rev 24995)
+++ gnunet/src/testbed/test_testbed_api_topology_clique.c       2012-11-16 
13:08:10 UTC (rev 24996)
@@ -102,11 +102,6 @@
     break;
   default:
     GNUNET_break (0);
-    if ((GNUNET_TESTBED_ET_OPERATION_FINISHED == event->type) && 
-        (NULL != event->details.operation_finished.emsg))
-      GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
-                  "An operation failed with error: %s\n",
-                  event->details.operation_finished.emsg);
     result = GNUNET_SYSERR;
     GNUNET_SCHEDULER_cancel (shutdown_task);
     shutdown_task = GNUNET_SCHEDULER_add_now (&do_shutdown, NULL);