[GNUnet-SVN] r34679 - gnunet/src/scalarproduct

[gnunet]

Author: grothoff
Date: 2014-12-17 18:48:17 +0100 (Wed, 17 Dec 2014)
New Revision: 34679

Modified:
   gnunet/src/scalarproduct/gnunet-service-scalarproduct_alice.c
   gnunet/src/scalarproduct/gnunet-service-scalarproduct_bob.c
   gnunet/src/scalarproduct/perf_scalarproduct.sh
   gnunet/src/scalarproduct/test_scalarproduct.conf
Log:
-more benchmarking results

Modified: gnunet/src/scalarproduct/gnunet-service-scalarproduct_alice.c
===================================================================
--- gnunet/src/scalarproduct/gnunet-service-scalarproduct_alice.c       
2014-12-17 13:36:55 UTC (rev 34678)
+++ gnunet/src/scalarproduct/gnunet-service-scalarproduct_alice.c       
2014-12-17 17:48:17 UTC (rev 34679)
@@ -1170,8 +1170,6 @@
   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],

Modified: gnunet/src/scalarproduct/gnunet-service-scalarproduct_bob.c
===================================================================
--- gnunet/src/scalarproduct/gnunet-service-scalarproduct_bob.c 2014-12-17 
13:36:55 UTC (rev 34678)
+++ gnunet/src/scalarproduct/gnunet-service-scalarproduct_bob.c 2014-12-17 
17:48:17 UTC (rev 34679)
@@ -1274,8 +1274,6 @@
   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],

Modified: gnunet/src/scalarproduct/perf_scalarproduct.sh
===================================================================
--- gnunet/src/scalarproduct/perf_scalarproduct.sh      2014-12-17 13:36:55 UTC 
(rev 34678)
+++ gnunet/src/scalarproduct/perf_scalarproduct.sh      2014-12-17 17:48:17 UTC 
(rev 34679)
@@ -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 @@
 # 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

Modified: gnunet/src/scalarproduct/test_scalarproduct.conf
===================================================================
--- gnunet/src/scalarproduct/test_scalarproduct.conf    2014-12-17 13:36:55 UTC 
(rev 34678)
+++ gnunet/src/scalarproduct/test_scalarproduct.conf    2014-12-17 17:48:17 UTC 
(rev 34679)
@@ -14,3 +14,7 @@
 
 [scalarproduct-alice]
 #PREFIX = valgrind --leak-check=yes
+
+[ats]
+WAN_QUOTA_IN = unlimited
+WAN_QUOTA_OUT = unlimited