[GNUnet-SVN] r32781 - gnunet/src/mesh

[gnunet]

Author: bartpolot
Date: 2014-03-22 23:53:48 +0100 (Sat, 22 Mar 2014)
New Revision: 32781

Modified:
   gnunet/src/mesh/gnunet-mesh-profiler.c
   gnunet/src/mesh/profiler.conf
   gnunet/src/mesh/run_profiler.sh
Log:
- optimizations for runtime

Modified: gnunet/src/mesh/gnunet-mesh-profiler.c
===================================================================
--- gnunet/src/mesh/gnunet-mesh-profiler.c      2014-03-22 22:46:04 UTC (rev 
32780)
+++ gnunet/src/mesh/gnunet-mesh-profiler.c      2014-03-22 22:53:48 UTC (rev 
32781)
@@ -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 @@
     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 @@
                                            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 */
 }
 

Modified: gnunet/src/mesh/profiler.conf
===================================================================
--- gnunet/src/mesh/profiler.conf       2014-03-22 22:46:04 UTC (rev 32780)
+++ gnunet/src/mesh/profiler.conf       2014-03-22 22:53:48 UTC (rev 32781)
@@ -11,8 +11,9 @@
 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%

Modified: gnunet/src/mesh/run_profiler.sh
===================================================================
--- gnunet/src/mesh/run_profiler.sh     2014-03-22 22:46:04 UTC (rev 32780)
+++ gnunet/src/mesh/run_profiler.sh     2014-03-22 22:53:48 UTC (rev 32781)
@@ -17,7 +17,7 @@
 
 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