-more benchmarking results

4 files changed, 14 insertions, 14 deletions

diff --git a/src/scalarproduct/gnunet-service-scalarproduct_alice.c b/src/scalarproduct/gnunet-service-scalarproduct_alice.c
index 69e2db9bb..03770144d 100644
--- a/src/scalarproduct/gnunet-service-scalarproduct_alice.c
+++ b/src/scalarproduct/gnunet-service-scalarproduct_alice.c
@@ -1170,8 +1170,6 @@ GSS_handle_alice_client_message_multipart (void *cls,
   elements = (const struct GNUNET_SCALARPRODUCT_Element *) &msg[1];
   for (i = 0; i < contained_count; i++)
   {
-    if (0 == GNUNET_ntohll (elements[i].value))
-      continue;
     elem = GNUNET_new (struct GNUNET_SCALARPRODUCT_Element);
     memcpy (elem,
             &elements[i],
diff --git a/src/scalarproduct/gnunet-service-scalarproduct_bob.c b/src/scalarproduct/gnunet-service-scalarproduct_bob.c
index 6d41668e3..cc218287d 100644
--- a/src/scalarproduct/gnunet-service-scalarproduct_bob.c
+++ b/src/scalarproduct/gnunet-service-scalarproduct_bob.c
@@ -1274,8 +1274,6 @@ GSS_handle_bob_client_message_multipart (void *cls,
   elements = (const struct GNUNET_SCALARPRODUCT_Element *) &msg[1];
   for (i = 0; i < contained_count; i++)
   {
-    if (0 == GNUNET_ntohll (elements[i].value))
-      continue;
     elem = GNUNET_new (struct GNUNET_SCALARPRODUCT_Element);
     memcpy (elem,
             &elements[i],
diff --git a/src/scalarproduct/perf_scalarproduct.sh b/src/scalarproduct/perf_scalarproduct.sh
index 5424134df..aac184d91 100755
--- a/src/scalarproduct/perf_scalarproduct.sh
+++ b/src/scalarproduct/perf_scalarproduct.sh
@@ -1,16 +1,16 @@
 #!/bin/bash
 # Computes a simple scalar product, with configurable vector size.
 #
-# Some results:
-# SIZE   TIME-H(s)  TIME-O(s)
-#  25     10
-#  50     17
-# 100     32          39
-# 200                 77
-#
-#
+# Some results (wall-clock for Alice+Bob, single-core, i7):
+# SIZE   2048-H(s)  2048-O(s)    1024-O(s)
+#  25     10          14            3
+#  50     17          21            5
+# 100     32          39            7
+# 200                 77           13
+# 400                149           23
+# 800                304           32
 # Configure benchmark size:
-SIZE=400
+SIZE=25
 #
 # Construct input vectors:
 INPUTALICE="-k CCC -e '"
@@ -36,7 +36,7 @@ CFGBOB="-c $PREFIX/1/config"
 # because the rest of the script is already in stdin,
 # thus redirecting stdin does not suffice)
 #GNUNET_FORCE_LOG=';;;;ERROR'
-GNUNET_FORCE_LOG='scalarproduct*;;;;DEBUG/cadet-api*;;;;DEBUG'
+#GNUNET_FORCE_LOG='scalarproduct*;;;;DEBUG/cadet-api*;;;;DEBUG'
 GNUNET_TESTING_PREFIX=$PREFIX ../testbed/gnunet-testbed-profiler -n -c test_scalarproduct.conf -p 2 &
 PID=$!
 # sleep 1 is too short on most systems, 2 works on most, 5 seems to be safe
diff --git a/src/scalarproduct/test_scalarproduct.conf b/src/scalarproduct/test_scalarproduct.conf
index 1df495bba..d283b6440 100644
--- a/src/scalarproduct/test_scalarproduct.conf
+++ b/src/scalarproduct/test_scalarproduct.conf
@@ -14,3 +14,7 @@ WORKBITS=0
 
 [scalarproduct-alice]
 #PREFIX = valgrind --leak-check=yes
+
+[ats]
+WAN_QUOTA_IN = unlimited
+WAN_QUOTA_OUT = unlimited