[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] r18580 - gnunet/src/nse
From: |
gnunet |
Subject: |
[GNUnet-SVN] r18580 - gnunet/src/nse |
Date: |
Tue, 13 Dec 2011 18:01:09 +0100 |
Author: bartpolot
Date: 2011-12-13 18:01:09 +0100 (Tue, 13 Dec 2011)
New Revision: 18580
Modified:
gnunet/src/nse/gnunet-nse-profiler.c
gnunet/src/nse/gnunet-service-nse.c
Log:
- Wrong file commited, fixed.
Modified: gnunet/src/nse/gnunet-nse-profiler.c
===================================================================
--- gnunet/src/nse/gnunet-nse-profiler.c 2011-12-13 16:57:45 UTC (rev
18579)
+++ gnunet/src/nse/gnunet-nse-profiler.c 2011-12-13 17:01:09 UTC (rev
18580)
@@ -50,6 +50,11 @@
struct StatsContext
{
/**
+ * Whether or not shoutdown after finishing.
+ */
+ int shutdown;
+
+ /**
* How many messages have peers received during the test.
*/
unsigned long long total_nse_received_messages;
@@ -397,7 +402,8 @@
/* Stats lookup successful, write out data */
buf = NULL;
buf_len =
- GNUNET_asprintf (&buf, "TOTAL_NSE_RECEIVED_MESSAGES: %u\n",
+ GNUNET_asprintf (&buf, "TOTAL_NSE_RECEIVED_MESSAGES_%d: %u \n",
+ stats_context->shutdown,
stats_context->total_nse_received_messages);
if (buf_len > 0)
{
@@ -406,8 +412,9 @@
GNUNET_free_non_null (buf);
buf = NULL;
buf_len =
- GNUNET_asprintf (&buf, "TOTAL_NSE_SENT_MESSAGES: %u\n",
- stats_context->total_nse_sent_messages);
+ GNUNET_asprintf (&buf, "TOTAL_NSE_SENT_MESSAGES_%d: %u\n",
+ stats_context->shutdown,
+ stats_context->total_nse_received_messages);
if (buf_len > 0)
{
GNUNET_DISK_file_write (data_file, buf, buf_len);
@@ -415,8 +422,16 @@
GNUNET_free_non_null (buf);
}
- GNUNET_assert (GNUNET_SCHEDULER_NO_TASK == shutdown_handle);
- shutdown_handle = GNUNET_SCHEDULER_add_now (&shutdown_task, NULL);
+ if (GNUNET_YES == stats_context->shutdown)
+ {
+ GNUNET_assert (GNUNET_SCHEDULER_NO_TASK == shutdown_handle);
+ shutdown_handle = GNUNET_SCHEDULER_add_now (&shutdown_task, NULL);
+ }
+ else
+ {
+ GNUNET_assert (churn_task == GNUNET_SCHEDULER_NO_TASK);
+ churn_task = GNUNET_SCHEDULER_add_now (&churn_peers, NULL);
+ }
GNUNET_free (stats_context);
}
@@ -517,12 +532,23 @@
&peers_next_round))
{
current_round++;
- GNUNET_assert (churn_task == GNUNET_SCHEDULER_NO_TASK);
- churn_task = GNUNET_SCHEDULER_add_now (&churn_peers, NULL);
+ if (current_round == 1)
+ {
+ stats_context = GNUNET_malloc (sizeof (struct StatsContext));
+ stats_context->shutdown = GNUNET_NO;
+ GNUNET_TESTING_get_statistics (pg, &stats_finished_callback,
+ &statistics_iterator, stats_context);
+ }
+ else
+ {
+ GNUNET_assert (churn_task == GNUNET_SCHEDULER_NO_TASK);
+ churn_task = GNUNET_SCHEDULER_add_now (&churn_peers, NULL);
+ }
}
else /* No more rounds, let's shut it down! */
{
stats_context = GNUNET_malloc (sizeof (struct StatsContext));
+ stats_context->shutdown = GNUNET_YES;
GNUNET_SCHEDULER_cancel (shutdown_handle);
shutdown_handle = GNUNET_SCHEDULER_NO_TASK;
GNUNET_TESTING_get_statistics (pg, &stats_finished_callback,
Modified: gnunet/src/nse/gnunet-service-nse.c
===================================================================
--- gnunet/src/nse/gnunet-service-nse.c 2011-12-13 16:57:45 UTC (rev 18579)
+++ gnunet/src/nse/gnunet-service-nse.c 2011-12-13 17:01:09 UTC (rev 18580)
@@ -59,7 +59,7 @@
* production). The associated code should also probably be removed
* once we're done with experiments.
*/
-#define ENABLE_HISTOGRAM GNUNET_YES
+#define ENABLE_HISTOGRAM GNUNET_NO
/**
* Over how many values do we calculate the weighted average?
@@ -301,7 +301,7 @@
double val;
double nsize;
-#define WEST 0
+#define WEST 1
/* Weighted incremental algorithm for stddev according to West (1979) */
#if WEST
double sumweight;
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [GNUnet-SVN] r18580 - gnunet/src/nse,
gnunet <=