- optimizations for runtime

diff --git a/src/mesh/gnunet-mesh-profiler.c b/src/mesh/gnunet-mesh-profiler.c
index 15fcc3f2b12e90310500a6a1f4f5b352a5c807df..96ea9b67c4f78dba7d0dc94c6e652bb191ff9bbe 100644 (file)
--- a/src/mesh/gnunet-mesh-profiler.c
+++ b/src/mesh/gnunet-mesh-profiler.c
@@ -46,7 +46,7 @@
 /**
  * Time to wait for stuff that should be rather fast
  */
-#define SHORT_TIME GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, 60)
+#define SHORT_TIME GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, 300)
 
 /**
  * Total number of rounds.
@@ -982,7 +982,8 @@ peer_id_cb (void *cls,
     test_task = GNUNET_SCHEDULER_add_delayed (delay, &start_test, NULL);
     return; /* start_test from incoming_channel */
   }
-  test_task = GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_UNIT_SECONDS,
+  GNUNET_log (GNUNET_ERROR_TYPE_INFO, "Starting in a minute...\n");
+  test_task = GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_UNIT_MINUTES,
                                             &start_test, NULL);
 }
 
@@ -1024,7 +1025,7 @@ tmain (void *cls,
                                            GNUNET_TESTBED_PIT_IDENTITY,
                                            &peer_id_cb, (void *) i);
   }
-  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "requested peer ids\n");
+  GNUNET_log (GNUNET_ERROR_TYPE_INFO, "requested peer ids\n");
   /* Continues from pi_cb -> do_test */
 }
 

diff --git a/src/mesh/profiler.conf b/src/mesh/profiler.conf
index 0cdd2d9e772b7284c979d8a78153971c5a6adcc7..8817802d178b958a758d6b908a1c3c3a64081609 100644 (file)
--- a/src/mesh/profiler.conf
+++ b/src/mesh/profiler.conf
@@ -11,8 +11,9 @@ SETUP_TIMEOUT = 60 m
 MANIPULATE_DELAY_OUT = 10 ms
 
 [mesh]
-REFRESH_CONNECTION_TIME = 600 s
+REFRESH_CONNECTION_TIME = 1 h
 DISABLE_TRY_CONNECT = YES
+ID_ANNOUNCE_TIME = 240 s
 
 [dht]
 FORCE_NSE = %NSE%

diff --git a/src/mesh/run_profiler.sh b/src/mesh/run_profiler.sh
index 63407c134a4c9362ebf13f2ce89caede03a0052d..aba6ce4d4a98cf22b824006b85ccd312e135dea5 100755 (executable)
--- a/src/mesh/run_profiler.sh
+++ b/src/mesh/run_profiler.sh
@@ -17,7 +17,7 @@ fi
 
 LINKS=`echo "l($PEERS)/l(2) * $PEERS" | bc -l`
 LINKS=`printf "%.0f" $LINKS`
-NSE=`echo "l($PEERS)/l(10)" | bc -l`
+NSE=`echo "l($PEERS)/l(2)" | bc -l`
 echo "using $PEERS peers, $LINKS links";
     
 sed -e "s/%LINKS%/$LINKS/;s/%NSE%/$NSE/" profiler.conf > .profiler.conf