[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] r24193 - gnunet/src/mesh
From: |
gnunet |
Subject: |
[GNUnet-SVN] r24193 - gnunet/src/mesh |
Date: |
Fri, 5 Oct 2012 15:17:31 +0200 |
Author: bartpolot
Date: 2012-10-05 15:17:30 +0200 (Fri, 05 Oct 2012)
New Revision: 24193
Modified:
gnunet/src/mesh/
gnunet/src/mesh/Makefile.am
gnunet/src/mesh/test_mesh_small.c
Log:
- Makefile changes to compile new tests for leaf to root speed
Index: gnunet/src/mesh
===================================================================
--- gnunet/src/mesh 2012-10-05 11:54:54 UTC (rev 24192)
+++ gnunet/src/mesh 2012-10-05 13:17:30 UTC (rev 24193)
Property changes on: gnunet/src/mesh
___________________________________________________________________
Modified: svn:ignore
## -8,6 +8,10 ##
test_mesh_small_speed_min
test_mesh_small_speed_nobuf
test_mesh_small_speed_ack
+test_mesh_small_speed_backwards
+test_mesh_small_speed_min_backwards
+test_mesh_small_speed_nobuf_backwards
+test_mesh_small_speed_ack
test_mesh_api
test_mesh_tree_api
test_mesh_local_1
Modified: gnunet/src/mesh/Makefile.am
===================================================================
--- gnunet/src/mesh/Makefile.am 2012-10-05 11:54:54 UTC (rev 24192)
+++ gnunet/src/mesh/Makefile.am 2012-10-05 13:17:30 UTC (rev 24193)
@@ -101,7 +101,10 @@
test_mesh_small_speed \
test_mesh_small_speed_nobuf \
test_mesh_small_speed_min \
- test_mesh_small_speed_ack
+ test_mesh_small_speed_backwards \
+ test_mesh_small_speed_nobuf_backwards \
+ test_mesh_small_speed_min_backwards \
+ test_mesh_small_speed_ack
test_mesh_api_SOURCES = \
test_mesh_api.c
@@ -202,6 +205,15 @@
test_mesh_small_multicast_DEPENDENCIES = \
libgnunetmesh.la
+test_mesh_small_speed_ack_SOURCES = \
+ test_mesh_small.c
+test_mesh_small_speed_ack_LDADD = \
+ $(top_builddir)/src/mesh/libgnunetmesh.la \
+ $(top_builddir)/src/util/libgnunetutil.la \
+ $(top_builddir)/src/testing_old/libgnunettesting_old.la
+test_mesh_small_speed_ack_DEPENDENCIES = \
+ libgnunetmesh.la
+
test_mesh_small_speed_SOURCES = \
test_mesh_small.c
test_mesh_small_speed_LDADD = \
@@ -229,15 +241,34 @@
test_mesh_small_speed_nobuf_DEPENDENCIES = \
libgnunetmesh.la
-test_mesh_small_speed_ack_SOURCES = \
+test_mesh_small_speed_backwards_SOURCES = \
test_mesh_small.c
-test_mesh_small_speed_ack_LDADD = \
+test_mesh_small_speed_backwards_LDADD = \
$(top_builddir)/src/mesh/libgnunetmesh.la \
$(top_builddir)/src/util/libgnunetutil.la \
$(top_builddir)/src/testing_old/libgnunettesting_old.la
-test_mesh_small_speed_ack_DEPENDENCIES = \
+test_mesh_small_speed_backwards_DEPENDENCIES = \
libgnunetmesh.la
+test_mesh_small_speed_min_backwards_SOURCES = \
+ test_mesh_small.c
+test_mesh_small_speed_min_backwards_LDADD = \
+ $(top_builddir)/src/mesh/libgnunetmesh.la \
+ $(top_builddir)/src/util/libgnunetutil.la \
+ $(top_builddir)/src/testing_old/libgnunettesting_old.la
+test_mesh_small_speed_min_backwards_DEPENDENCIES = \
+ libgnunetmesh.la
+
+test_mesh_small_speed_nobuf_backwards_SOURCES = \
+ test_mesh_small.c
+test_mesh_small_speed_nobuf_backwards_LDADD = \
+ $(top_builddir)/src/mesh/libgnunetmesh.la \
+ $(top_builddir)/src/util/libgnunetutil.la \
+ $(top_builddir)/src/testing_old/libgnunettesting_old.la
+test_mesh_small_speed_nobuf_backwards_DEPENDENCIES = \
+ libgnunetmesh.la
+
+
if ENABLE_TEST_RUN
TESTS = test_mesh_api \
test_mesh_tree_api \
Modified: gnunet/src/mesh/test_mesh_small.c
===================================================================
--- gnunet/src/mesh/test_mesh_small.c 2012-10-05 11:54:54 UTC (rev 24192)
+++ gnunet/src/mesh/test_mesh_small.c 2012-10-05 13:17:30 UTC (rev 24193)
@@ -71,18 +71,38 @@
static int test;
/**
+ * Flag to send traffic leaf->root in speed tests to test BCK_ACK logic.
+ */
+static int test_backwards = GNUNET_NO;
+
+/**
* How many events have happened
*/
static int ok;
+/**
+ * Peers that have been connected
+ */
static int peers_in_tunnel;
+/**
+ * Peers that have responded
+ */
static int peers_responded;
+/**
+ * Number of payload packes sent
+ */
static int data_sent;
+/**
+ * Number of payload packets received
+ */
static int data_received;
+/**
+ * Number of payload packed explicitly (app/level) acknowledged
+ */
static int data_ack;
/**
@@ -1017,6 +1037,12 @@
ok_goal = 0;
}
+ if (strstr (argv[0], "backwards") != NULL)
+ {
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "BACKWARDS (LEAF TO ROOT)\n");
+ test_backwards = GNUNET_YES;
+ }
+
GNUNET_PROGRAM_run (argc2, argv2,
"test_mesh_small",
gettext_noop ("Test mesh in a small network."), options,
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [GNUnet-SVN] r24193 - gnunet/src/mesh,
gnunet <=