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

[gnunet]

Author: grothoff
Date: 2014-12-11 23:17:13 +0100 (Thu, 11 Dec 2014)
New Revision: 34536

Modified:
   gnunet/src/scalarproduct/gnunet-service-scalarproduct_alice.c
   gnunet/src/scalarproduct/gnunet-service-scalarproduct_bob.c
   gnunet/src/scalarproduct/perf_scalarproduct.sh
Log:
-commit with dbg logic

Modified: gnunet/src/scalarproduct/gnunet-service-scalarproduct_alice.c
===================================================================
--- gnunet/src/scalarproduct/gnunet-service-scalarproduct_alice.c       
2014-12-11 21:55:36 UTC (rev 34535)
+++ gnunet/src/scalarproduct/gnunet-service-scalarproduct_alice.c       
2014-12-11 22:17:13 UTC (rev 34536)
@@ -902,8 +902,9 @@
     if (todo_count > ELEMENT_CAPACITY)
       todo_count = ELEMENT_CAPACITY;
     GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-                "Sending %u crypto values to Bob\n",
-                (unsigned int) todo_count);
+                "Sending %u/%u crypto values to Bob\n",
+                (unsigned int) todo_count,
+                (unsigned int) s->used_element_count);
 
     e = GNUNET_MQ_msg_extra (msg,
                              todo_count * sizeof (struct 
GNUNET_CRYPTO_PaillierCiphertext),

Modified: gnunet/src/scalarproduct/gnunet-service-scalarproduct_bob.c
===================================================================
--- gnunet/src/scalarproduct/gnunet-service-scalarproduct_bob.c 2014-12-11 
21:55:36 UTC (rev 34535)
+++ gnunet/src/scalarproduct/gnunet-service-scalarproduct_bob.c 2014-12-11 
22:17:13 UTC (rev 34536)
@@ -593,6 +593,8 @@
     GNUNET_MQ_send (s->cadet->cadet_mq,
                     e);
   }
+  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+              "All values queued for Alice, Bob is done\n");
 }
 
 

Modified: gnunet/src/scalarproduct/perf_scalarproduct.sh
===================================================================
--- gnunet/src/scalarproduct/perf_scalarproduct.sh      2014-12-11 21:55:36 UTC 
(rev 34535)
+++ gnunet/src/scalarproduct/perf_scalarproduct.sh      2014-12-11 22:17:13 UTC 
(rev 34536)
@@ -35,7 +35,8 @@
 # interactive mode would terminate the test immediately
 # because the rest of the script is already in stdin,
 # thus redirecting stdin does not suffice)
-GNUNET_FORCE_LOG=';;;;ERROR'
+#GNUNET_FORCE_LOG=';;;;ERROR'
+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