aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNathan S. Evans <evans@in.tum.de>2011-07-26 09:31:18 +0000
committerNathan S. Evans <evans@in.tum.de>2011-07-26 09:31:18 +0000
commitf417e32084ea739718d57e58cb7e39ae7795581f (patch)
treedc2984cdb906d673d9ddfe139af1ac7604b5804e
parentb0a506f075c724ba72f8b881c779f7b1a02e0183 (diff)
downloadgnunet-f417e32084ea739718d57e58cb7e39ae7795581f.tar.gz
gnunet-f417e32084ea739718d57e58cb7e39ae7795581f.zip
changes
-rw-r--r--src/nse/nse-profiler.c20
1 files changed, 9 insertions, 11 deletions
diff --git a/src/nse/nse-profiler.c b/src/nse/nse-profiler.c
index 538cd1f50..8d90ca260 100644
--- a/src/nse/nse-profiler.c
+++ b/src/nse/nse-profiler.c
@@ -247,7 +247,9 @@ connect_nse_service (void *cls,
247 { 247 {
248 if ((connection_limit > 0) && (i % (num_peers / connection_limit) != 0)) 248 if ((connection_limit > 0) && (i % (num_peers / connection_limit) != 0))
249 continue; 249 continue;
250 GNUNET_log (GNUNET_ERROR_TYPE_WARNING, "TEST_NSE_MULTIPEER: connecting to nse service of peer %d\n", i); 250#if VERBOSE
251 GNUNET_log (GNUNET_ERROR_TYPE_WARNING, "nse-profiler: connecting to nse service of peer %d\n", i);
252#endif
251 current_peer = GNUNET_malloc(sizeof(struct NSEPeer)); 253 current_peer = GNUNET_malloc(sizeof(struct NSEPeer));
252 current_peer->daemon = GNUNET_TESTING_daemon_get(pg, i); 254 current_peer->daemon = GNUNET_TESTING_daemon_get(pg, i);
253 if (GNUNET_YES == GNUNET_TESTING_daemon_running(GNUNET_TESTING_daemon_get(pg, i))) 255 if (GNUNET_YES == GNUNET_TESTING_daemon_running(GNUNET_TESTING_daemon_get(pg, i)))
@@ -321,16 +323,12 @@ statistics_iterator (void *cls,
321 int is_persistent) 323 int is_persistent)
322{ 324{
323 struct StatsContext *stats_context = cls; 325 struct StatsContext *stats_context = cls;
324 char *buf;
325 326
326 GNUNET_assert(0 < GNUNET_asprintf(&buf, 327 if ((0 == strstr(subsystem, "nse")) && (0 == strstr(name, "# flood messages received")))
327 "bytes of messages of type %d received",
328 GNUNET_MESSAGE_TYPE_NSE_P2P_FLOOD));
329 if ((0 == strstr(subsystem, "core")) && (0 == strstr(name, buf)))
330 { 328 {
331 stats_context->total_nse_bytes += value; 329 stats_context->total_nse_bytes += value;
332 } 330 }
333 GNUNET_free(buf); 331
334 return GNUNET_OK; 332 return GNUNET_OK;
335} 333}
336 334
@@ -434,7 +432,7 @@ churn_callback (void *cls, const char *emsg)
434 432
435 if (emsg == NULL) /* Everything is okay! */ 433 if (emsg == NULL) /* Everything is okay! */
436 { 434 {
437 peers_running = GNUNET_TESTING_daemons_running(pg); 435 peers_running = peers_next_round;
438 GNUNET_log (GNUNET_ERROR_TYPE_WARNING, 436 GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
439 "Round %lu, churn finished successfully.\n", 437 "Round %lu, churn finished successfully.\n",
440 current_round); 438 current_round);
@@ -467,7 +465,7 @@ static void
467churn_peers (void *cls, 465churn_peers (void *cls,
468 const struct GNUNET_SCHEDULER_TaskContext *tc) 466 const struct GNUNET_SCHEDULER_TaskContext *tc)
469{ 467{
470 peers_running = GNUNET_TESTING_daemons_running(pg); 468 /* peers_running = GNUNET_TESTING_daemons_running(pg); */
471 churn_task = GNUNET_SCHEDULER_NO_TASK; 469 churn_task = GNUNET_SCHEDULER_NO_TASK;
472 if (peers_next_round == peers_running) 470 if (peers_next_round == peers_running)
473 { 471 {
@@ -476,7 +474,7 @@ churn_peers (void *cls,
476 GNUNET_assert(disconnect_task == GNUNET_SCHEDULER_NO_TASK); 474 GNUNET_assert(disconnect_task == GNUNET_SCHEDULER_NO_TASK);
477 disconnect_task = GNUNET_SCHEDULER_add_delayed(wait_time, 475 disconnect_task = GNUNET_SCHEDULER_add_delayed(wait_time,
478 &disconnect_nse_peers, NULL); 476 &disconnect_nse_peers, NULL);
479 GNUNET_log(GNUNET_ERROR_TYPE_DEBUG, 477 GNUNET_log(GNUNET_ERROR_TYPE_WARNING,
480 "Round %lu, doing nothing!\n", 478 "Round %lu, doing nothing!\n",
481 current_round); 479 current_round);
482 } 480 }
@@ -485,7 +483,7 @@ churn_peers (void *cls,
485 if (peers_next_round > num_peers) 483 if (peers_next_round > num_peers)
486 { 484 {
487 GNUNET_log(GNUNET_ERROR_TYPE_ERROR, 485 GNUNET_log(GNUNET_ERROR_TYPE_ERROR,
488 "Asked to turn on more peers than have!!\n"); 486 "Asked to turn on more peers than we have!!\n");
489 GNUNET_SCHEDULER_cancel(shutdown_handle); 487 GNUNET_SCHEDULER_cancel(shutdown_handle);
490 GNUNET_SCHEDULER_add_now(&shutdown_task, NULL); 488 GNUNET_SCHEDULER_add_now(&shutdown_task, NULL);
491 } 489 }