[gnunet] 54/164: Simulation

[gnunet]

This is an automated email from the git hooks/post-receive script.

grothoff pushed a commit to branch master
in repository gnunet.

commit 6216cf5dbd3029a6ad082b85b1c68c4c9a0cecd1
Author: Elias Summermatter <elias.summermatter@seccom.ch>
AuthorDate: Thu Apr 22 11:00:50 2021 +0200

    Simulation
---
 src/setu/gnunet-service-setu.c | 16 +++++++++++++---
 src/setu/perf_setu_api.c       |  2 +-
 2 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/src/setu/gnunet-service-setu.c b/src/setu/gnunet-service-setu.c
index e929b6a66..1d206e598 100644
--- a/src/setu/gnunet-service-setu.c
+++ b/src/setu/gnunet-service-setu.c
@@ -1892,11 +1892,16 @@ decode_and_send (struct Operation *op)
                                   "# of IBF retries",
                                   1,
                                   GNUNET_NO);
+          LOG (GNUNET_ERROR_TYPE_ERROR,
+               "%d BEFORE RUN %d REMOTE: %d LOCAL:%d\n",op->peer_site, 
op->active_passive_switches, op->salt_receive, op->salt_send);
+
         perf_rtt.active_passive_switches += 1;
         op->active_passive_switches += 1;
 
-        op->salt_send = op->salt_receive++; // (op->peer_site * 32) + 
op->active_passive_switches;
+        op->salt_send = op->salt_receive++;
 
+          LOG (GNUNET_ERROR_TYPE_ERROR,
+               "%d AFTER RUN %d REMOTE: %d LOCAL:%d\n",op->peer_site, 
op->active_passive_switches, op->salt_receive, op->salt_send );
 
         if (GNUNET_OK !=
             send_ibf (op, next_size))
@@ -3719,7 +3724,11 @@ handle_client_evaluate (void *cls,
     op->se = strata_estimator_dup (op->set->se);
     /* we started the operation, thus we have to send the operation request */
     op->phase = PHASE_EXPECT_SE;
-    op->salt_receive = op->salt_send = 42; //(op->peer_site * 32); // 
FIXME?????
+
+    op->salt_receive = (op->peer_site + 1 ) % 2;
+    op->salt_send = op->peer_site; // FIXME?????
+
+
     LOG (GNUNET_ERROR_TYPE_DEBUG,
          "Initiating union operation evaluation\n");
     GNUNET_STATISTICS_update (_GSS_statistics,
@@ -3894,7 +3903,8 @@ handle_client_accept (void *cls,
     op->se = strata_estimator_dup (op->set->se);
     op->demanded_hashes = GNUNET_CONTAINER_multihashmap_create (32,
                                                                 GNUNET_NO);
-    op->salt_receive = op->salt_send = 42; // (op->peer_site * 32); // 
FIXME?????
+    op->salt_receive = (op->peer_site + 1 ) % 2;
+    op->salt_send = op->peer_site; // FIXME?????
     initialize_key_to_element (op);
     op->initial_size = GNUNET_CONTAINER_multihashmap32_size (
       op->key_to_element);
diff --git a/src/setu/perf_setu_api.c b/src/setu/perf_setu_api.c
index 2b7aa1e69..5f5e047a8 100644
--- a/src/setu/perf_setu_api.c
+++ b/src/setu/perf_setu_api.c
@@ -449,7 +449,7 @@ static void execute_perf() {
 
     for (int out_out_ctr = 3; out_out_ctr <= 3; out_out_ctr++) {
 
-        for (int out_ctr = 15; out_ctr <= 50; out_ctr++) {
+        for (int out_ctr = 20; out_ctr <= 20; out_ctr++) {
             float base = 0.1;
             float x = out_ctr * base;
             char factor[10];

-- 
To stop receiving notification emails like this one, please contact
gnunet@gnunet.org.