[GNUnet-SVN] r11738 - gnunet/src/testing

[gnunet]

Author: nevans
Date: 2010-06-14 11:37:21 +0200 (Mon, 14 Jun 2010)
New Revision: 11738

Added:
   gnunet/src/testing/test_testing_data_topology_clique_dfs.conf
   gnunet/src/testing/test_testing_data_topology_scale_free.conf
Modified:
   gnunet/src/testing/test_testing_group_remote.c
   gnunet/src/testing/testing_group.c
Log:
test case config files

Added: gnunet/src/testing/test_testing_data_topology_clique_dfs.conf
===================================================================
--- gnunet/src/testing/test_testing_data_topology_clique_dfs.conf               
                (rev 0)
+++ gnunet/src/testing/test_testing_data_topology_clique_dfs.conf       
2010-06-14 09:37:21 UTC (rev 11738)
@@ -0,0 +1,48 @@
+[PATHS]
+SERVICEHOME = /tmp/test-gnunet-testing/
+DEFAULTCONFIG = test_testing_data_topology_clique.conf
+
+[resolver]
+PORT = 2564
+
+[transport]
+PORT = 2565
+PLUGINS = tcp
+#PREFIX = xterm -e xterm -T transport -e gdb --args
+#BINARY = 
/home/mrwiggles/documents/research/gnunet/gnunet-ng/src/transport/.libs/gnunet-service-transport
+#PREFIX = valgrind --tool=memcheck --log-file=logs%p
+#DEBUG = YES
+
+[arm]
+PORT = 2566
+DEFAULTSERVICES = peerinfo transport core
+
+[statistics]
+PORT = 2567
+
+[transport-tcp]
+PORT = 2568
+
+[transport-udp]
+PORT = 2568
+
+[peerinfo]
+PORT = 2569
+#DEBUG = YES
+#PREFIX = xterm -e xterm -T peerinfo -e gdb --args
+#BINARY = 
/home/mrwiggles/documents/research/gnunet/gnunet-ng/src/peerinfo/.libs/gnunet-service-peerinfo
+#PREFIX = valgrind --tool=memcheck --log-file=peerinfo%p
+
+[core]
+PORT = 2570
+#PREFIX = xterm -e xterm -T CORE -e gdb --args
+#PREFIX = valgrind --tool=memcheck --log-file=logs%p
+#DEBUG = YES
+
+[testing]
+NUM_PEERS = 7
+WEAKRANDOM = YES
+TOPOLOGY = 0
+CONNECT_TOPOLOGY_OPTION = 3
+CONNECT_TOPOLOGY_OPTION_MODIFIER = 2.0
+F2F = YES

Added: gnunet/src/testing/test_testing_data_topology_scale_free.conf
===================================================================
--- gnunet/src/testing/test_testing_data_topology_scale_free.conf               
                (rev 0)
+++ gnunet/src/testing/test_testing_data_topology_scale_free.conf       
2010-06-14 09:37:21 UTC (rev 11738)
@@ -0,0 +1,46 @@
+[PATHS]
+SERVICEHOME = /tmp/test-gnunet-testing/
+DEFAULTCONFIG = test_testing_data_topology_scale_free.conf
+
+[resolver]
+PORT = 2564
+
+[transport]
+PORT = 2565
+PLUGINS = tcp
+#PREFIX = xterm -e xterm -T transport -e gdb --args
+#BINARY = 
/home/mrwiggles/documents/research/gnunet/gnunet-ng/src/transport/.libs/gnunet-service-transport
+#PREFIX = valgrind --tool=memcheck --log-file=logs%p
+#DEBUG = YES
+
+[arm]
+PORT = 2566
+DEFAULTSERVICES = peerinfo transport core
+
+[statistics]
+PORT = 2567
+
+[transport-tcp]
+PORT = 2568
+
+[transport-udp]
+PORT = 2568
+
+[peerinfo]
+PORT = 2569
+#DEBUG = YES
+#PREFIX = xterm -e xterm -T peerinfo -e gdb --args
+#BINARY = 
/home/mrwiggles/documents/research/gnunet/gnunet-ng/src/peerinfo/.libs/gnunet-service-peerinfo
+#PREFIX = valgrind --tool=memcheck --log-file=peerinfo%p
+
+[core]
+PORT = 2570
+#PREFIX = xterm -e xterm -T CORE -e gdb --args
+#PREFIX = valgrind --tool=memcheck --log-file=logs%p
+#DEBUG = YES
+
+[testing]
+NUM_PEERS = 500
+WEAKRANDOM = YES
+TOPOLOGY = 7
+F2F = YES

Modified: gnunet/src/testing/test_testing_group_remote.c
===================================================================
--- gnunet/src/testing/test_testing_group_remote.c      2010-06-14 09:31:57 UTC 
(rev 11737)
+++ gnunet/src/testing/test_testing_group_remote.c      2010-06-14 09:37:21 UTC 
(rev 11738)
@@ -40,6 +40,8 @@
 
 static int peers_left;
 
+static int peers_failed;
+
 static struct GNUNET_TESTING_PeerGroup *pg;
 
 static struct GNUNET_SCHEDULER_Handle *sched;
@@ -55,13 +57,22 @@
        const struct GNUNET_CONFIGURATION_Handle *cfg,
        struct GNUNET_TESTING_Daemon *d, const char *emsg)
 {
-  GNUNET_assert (id != NULL);
+  if (emsg != NULL)
+    {
+      peers_failed++;
+    }
+
   peers_left--;
   if (peers_left == 0)
     {
       GNUNET_TESTING_daemons_stop (pg, TIMEOUT);
       ok = 0;
     }
+  else if (failed_peers == peers_left)
+    {
+      GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Too many peers failed, ending 
test!\n");
+      GNUNET_TESTING_daemons_stop (pg, TIMEOUT);
+    }
 }
 
 

Modified: gnunet/src/testing/testing_group.c
===================================================================
--- gnunet/src/testing/testing_group.c  2010-06-14 09:31:57 UTC (rev 11737)
+++ gnunet/src/testing/testing_group.c  2010-06-14 09:37:21 UTC (rev 11738)
@@ -2209,9 +2209,9 @@
   uint32_t pg_iter;
 
   for (pg_iter = 0; pg_iter < pg->total; pg_iter++)
-    {
-      pg->peers[pg_iter].connect_peers_working_set = 
GNUNET_CONTAINER_multihashmap_create(num);
-    }
+   {
+     pg->peers[pg_iter].connect_peers_working_set = 
GNUNET_CONTAINER_multihashmap_create(num);
+   }
 
   for (pg_iter = 0; pg_iter < pg->total; pg_iter++)
     {
@@ -2222,7 +2222,6 @@
       minimum_ctx.pg = pg;
       minimum_ctx.num_to_add = num;
       minimum_ctx.current = 0;
-      pg->peers[pg_iter].connect_peers_working_set = 
GNUNET_CONTAINER_multihashmap_create(pg->total);
       GNUNET_CONTAINER_multihashmap_iterate(pg->peers[pg_iter].connect_peers,
                                            &minimum_connect_iterator, 
                                            &minimum_ctx);
@@ -2234,9 +2233,6 @@
       GNUNET_CONTAINER_multihashmap_destroy(pg->peers[pg_iter].connect_peers);
       /* And replace with the working set */
       pg->peers[pg_iter].connect_peers = 
pg->peers[pg_iter].connect_peers_working_set;
-      fprintf(stderr, 
-             "Finished! Hashmap size %u\n", 
-             
GNUNET_CONTAINER_multihashmap_size(pg->peers[pg_iter].connect_peers));
     }
 
 }
@@ -2336,18 +2332,11 @@
 
   for (pg_iter = 0; pg_iter < pg->total; pg_iter++)
     {
-
-    }
-
-  for (pg_iter = 0; pg_iter < pg->total; pg_iter++)
-    {
       /* Remove the "old" connections */
       GNUNET_CONTAINER_multihashmap_destroy(pg->peers[pg_iter].connect_peers);
       /* And replace with the working set */
       pg->peers[pg_iter].connect_peers = 
pg->peers[pg_iter].connect_peers_working_set;
-      fprintf(stderr, "Finished! Hashmap size %u\n", 
GNUNET_CONTAINER_multihashmap_size(pg->peers[pg_iter].connect_peers));
     }
-
 }
 
 /**
@@ -2872,10 +2861,12 @@
   {
     if (pg->peers[i].daemon->running == GNUNET_YES)
     {
+      GNUNET_assert(running != -1);
       running++;
     }
     else
     {
+      GNUNET_assert(stopped != -1);
       stopped++;
     }
   }