[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] r18754 - gnunet/src/nse
From: |
gnunet |
Subject: |
[GNUnet-SVN] r18754 - gnunet/src/nse |
Date: |
Wed, 21 Dec 2011 19:03:30 +0100 |
Author: bartpolot
Date: 2011-12-21 19:03:30 +0100 (Wed, 21 Dec 2011)
New Revision: 18754
Modified:
gnunet/src/nse/gnunet-nse-profiler.c
gnunet/src/nse/gnunet-service-nse.c
Log:
Added statistic reading to NSE, fixed some minor bugs
Modified: gnunet/src/nse/gnunet-nse-profiler.c
===================================================================
--- gnunet/src/nse/gnunet-nse-profiler.c 2011-12-21 18:01:20 UTC (rev
18753)
+++ gnunet/src/nse/gnunet-nse-profiler.c 2011-12-21 18:03:30 UTC (rev
18754)
@@ -58,10 +58,21 @@
* How many messages have peers received during the test.
*/
unsigned long long total_nse_received_messages;
+
/**
* How many messages have peers send during the test (should be == received).
*/
- unsigned long long total_nse_sent_messages;
+ unsigned long long total_nse_transmitted_messages;
+
+ /**
+ * How many messages have travelled an edge in both directions.
+ */
+ unsigned long long total_nse_cross;
+
+ /**
+ * How many extra messages per edge (corrections) have been received.
+ */
+ unsigned long long total_nse_extra;
};
@@ -410,16 +421,40 @@
GNUNET_DISK_file_write (data_file, buf, buf_len);
}
GNUNET_free_non_null (buf);
+
buf = NULL;
buf_len =
- GNUNET_asprintf (&buf, "TOTAL_NSE_SENT_MESSAGES_%d: %u\n",
+ GNUNET_asprintf (&buf, "TOTAL_NSE_TRANSMITTED_MESSAGES_%d: %u\n",
stats_context->shutdown,
- stats_context->total_nse_received_messages);
+ stats_context->total_nse_transmitted_messages);
if (buf_len > 0)
{
GNUNET_DISK_file_write (data_file, buf, buf_len);
}
GNUNET_free_non_null (buf);
+
+ buf = NULL;
+ buf_len =
+ GNUNET_asprintf (&buf, "TOTAL_NSE_CROSS_%d: %u \n",
+ stats_context->shutdown,
+ stats_context->total_nse_cross);
+ if (buf_len > 0)
+ {
+ GNUNET_DISK_file_write (data_file, buf, buf_len);
+ }
+ GNUNET_free_non_null (buf);
+
+ buf = NULL;
+ buf_len =
+ GNUNET_asprintf (&buf, "TOTAL_NSE_EXTRA_%d: %u \n",
+ stats_context->shutdown,
+ stats_context->total_nse_extra);
+ if (buf_len > 0)
+ {
+ GNUNET_DISK_file_write (data_file, buf, buf_len);
+ }
+ GNUNET_free_non_null (buf);
+
}
if (GNUNET_YES == stats_context->shutdown)
@@ -476,9 +511,9 @@
}
#endif
}
- if (0 == strcmp (name, "# flood messages sent"))
+ if (0 == strcmp (name, "# flood messages transmitted"))
{
- stats_context->total_nse_sent_messages += value;
+ stats_context->total_nse_transmitted_messages += value;
#if VERBOSE
if (data_file != NULL)
{
@@ -487,7 +522,8 @@
buf = NULL;
buf_len =
- GNUNET_asprintf (&buf, "%s %u SENT\n", GNUNET_i2s(peer), value);
+ GNUNET_asprintf (&buf, "%s %u TRANSMITTED\n",
+ GNUNET_i2s(peer), value);
if (buf_len > 0)
{
GNUNET_DISK_file_write (data_file, buf, buf_len);
@@ -496,6 +532,14 @@
}
#endif
}
+ if (0 == strcmp (name, "# cross messages"))
+ {
+ stats_context->total_nse_cross += value;
+ }
+ if (0 == strcmp (name, "# extra messages"))
+ {
+ stats_context->total_nse_extra += value;
+ }
}
return GNUNET_OK;
}
Modified: gnunet/src/nse/gnunet-service-nse.c
===================================================================
--- gnunet/src/nse/gnunet-service-nse.c 2011-12-21 18:01:20 UTC (rev 18753)
+++ gnunet/src/nse/gnunet-service-nse.c 2011-12-21 18:03:30 UTC (rev 18754)
@@ -125,6 +125,26 @@
* been taken care of.
*/
int previous_round;
+
+#if ENABLE_HISTOGRAM
+
+ /**
+ * Amount of messages received from this peer on this round.
+ */
+ unsigned int received_messages;
+
+ /**
+ * Amount of messages transmitted to this peer on this round.
+ */
+ unsigned int transmitted_messages;
+
+ /**
+ * Which size did we tell the peer the network is?
+ */
+ unsigned int last_transmitted_size;
+
+#endif
+
};
@@ -593,6 +613,11 @@
GNUNET_STATISTICS_update (stats, "# flood messages started", 1, GNUNET_NO);
GNUNET_STATISTICS_update (stats, "# flood messages transmitted", 1,
GNUNET_NO);
+#if ENABLE_HISTOGRAM
+ peer_entry->transmitted_messages++;
+ peer_entry->last_transmitted_size =
+ ntohl(size_estimate_messages[idx].matching_bits);
+#endif
memcpy (buf, &size_estimate_messages[idx],
sizeof (struct GNUNET_NSE_FloodMessage));
return sizeof (struct GNUNET_NSE_FloodMessage);
@@ -699,6 +724,14 @@
GNUNET_SCHEDULER_cancel (peer_entry->transmit_task);
peer_entry->previous_round = GNUNET_NO;
}
+#if ENABLE_HISTOGRAM
+ if (peer_entry->received_messages > 1)
+ GNUNET_STATISTICS_update(stats, "# extra messages",
+ peer_entry->received_messages - 1, GNUNET_NO);
+ peer_entry->transmitted_messages = 0;
+ peer_entry->last_transmitted_size = 0;
+ peer_entry->received_messages = 0;
+#endif
delay =
get_transmit_delay ((peer_entry->previous_round == GNUNET_NO) ? -1 : 0);
peer_entry->transmit_task =
@@ -1012,6 +1045,12 @@
GNUNET_break (0);
return GNUNET_OK;
}
+#if ENABLE_HISTOGRAM
+ peer_entry->received_messages++;
+ if (peer_entry->transmitted_messages > 0 &&
+ peer_entry->last_transmitted_size >= matching_bits)
+ GNUNET_STATISTICS_update(stats, "# cross messages", 1, GNUNET_NO);
+#endif
ts = GNUNET_TIME_absolute_ntoh (incoming_flood->timestamp);
@@ -1048,48 +1087,21 @@
update_network_size_estimate ();
return GNUNET_OK;
}
- if (matching_bits >= ntohl (size_estimate_messages[idx].matching_bits))
- {
- /* cancel transmission from us to this peer for this round */
- if (idx == estimate_index)
- {
- if (peer_entry->previous_round == GNUNET_YES)
- {
- /* cancel any activity for current round */
- if (peer_entry->transmit_task != GNUNET_SCHEDULER_NO_TASK)
- {
- GNUNET_SCHEDULER_cancel (peer_entry->transmit_task);
- peer_entry->transmit_task = GNUNET_SCHEDULER_NO_TASK;
- }
- if (peer_entry->th != NULL)
- {
- GNUNET_CORE_notify_transmit_ready_cancel (peer_entry->th);
- peer_entry->th = NULL;
- }
- }
- }
- else
- {
- /* cancel previous round only */
- peer_entry->previous_round = GNUNET_YES;
- }
- }
if (matching_bits == ntohl (size_estimate_messages[idx].matching_bits))
{
- /* cancel transmission in the other direction, as this peer clearly has
- up-to-date information already */
+ /* Cancel transmission in the other direction, as this peer clearly has
+ up-to-date information already. Even if we didn't talk to this peer in
+ the previous round, we should no longer send it stale information as it
+ told us about the current round! */
+ peer_entry->previous_round = GNUNET_YES;
if (idx != estimate_index)
{
/* do not transmit information for the previous round to this peer
anymore (but allow current round) */
- peer_entry->previous_round = GNUNET_YES;
return GNUNET_OK;
}
- /* even if we didn't talk to this peer in the previous round, we should
- no longer send it stale information as it told us about the current
- round! */
- peer_entry->previous_round = GNUNET_YES;
- /* got up-to-date information for current round, cancel transmission
altogether */
+ /* got up-to-date information for current round, cancel transmission to
+ * this peer altogether */
if (GNUNET_SCHEDULER_NO_TASK != peer_entry->transmit_task)
{
GNUNET_SCHEDULER_cancel (peer_entry->transmit_task);
@@ -1102,7 +1114,7 @@
}
return GNUNET_OK;
}
- if (matching_bits <= ntohl (size_estimate_messages[idx].matching_bits))
+ if (matching_bits < ntohl (size_estimate_messages[idx].matching_bits))
{
if ((idx < estimate_index) && (peer_entry->previous_round == GNUNET_YES))
peer_entry->previous_round = GNUNET_NO;
@@ -1125,6 +1137,28 @@
GNUNET_break_op (0);
return GNUNET_OK;
}
+ GNUNET_assert (matching_bits >
+ ntohl (size_estimate_messages[idx].matching_bits));
+ /* cancel transmission from us to this peer for this round */
+ if (idx == estimate_index)
+ {
+ /* cancel any activity for current round */
+ if (peer_entry->transmit_task != GNUNET_SCHEDULER_NO_TASK)
+ {
+ GNUNET_SCHEDULER_cancel (peer_entry->transmit_task);
+ peer_entry->transmit_task = GNUNET_SCHEDULER_NO_TASK;
+ }
+ if (peer_entry->th != NULL)
+ {
+ GNUNET_CORE_notify_transmit_ready_cancel (peer_entry->th);
+ peer_entry->th = NULL;
+ }
+ }
+ else
+ {
+ /* cancel previous round only */
+ peer_entry->previous_round = GNUNET_YES;
+ }
size_estimate_messages[idx] = *incoming_flood;
size_estimate_messages[idx].hop_count =
htonl (ntohl (incoming_flood->hop_count) + 1);
@@ -1304,8 +1338,7 @@
if (GNUNET_YES == check_proof_of_work (&my_public_key, my_proof))
{
prev_time.abs_value =
- current_timestamp.abs_value - (estimate_index -
- 1) * gnunet_nse_interval.rel_value;
+ current_timestamp.abs_value - gnunet_nse_interval.rel_value;
setup_flood_message (estimate_index, prev_time);
estimate_count++;
}
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [GNUnet-SVN] r18754 - gnunet/src/nse,
gnunet <=