[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] [gnunet] branch master updated: allow for message drops by
From: |
gnunet |
Subject: |
[GNUnet-SVN] [gnunet] branch master updated: allow for message drops by CADET in unreliable mode |
Date: |
Fri, 27 Jan 2017 17:36:03 +0100 |
This is an automated email from the git hooks/post-receive script.
grothoff pushed a commit to branch master
in repository gnunet.
The following commit(s) were added to refs/heads/master by this push:
new ff7f24a5b allow for message drops by CADET in unreliable mode
ff7f24a5b is described below
commit ff7f24a5b8e3eb85e36bfc25faaa45aea8655dc5
Author: Christian Grothoff <address@hidden>
AuthorDate: Fri Jan 27 17:36:01 2017 +0100
allow for message drops by CADET in unreliable mode
---
src/cadet/test_cadet.c | 15 ++++++++++++---
1 file changed, 12 insertions(+), 3 deletions(-)
diff --git a/src/cadet/test_cadet.c b/src/cadet/test_cadet.c
index efc4f96b3..b8587d449 100644
--- a/src/cadet/test_cadet.c
+++ b/src/cadet/test_cadet.c
@@ -218,6 +218,11 @@ static unsigned int ka_sent;
*/
static unsigned int ka_received;
+/**
+ * How many messages were dropped by CADET because of full buffers?
+ */
+static unsigned int msg_dropped;
+
/**
* Get the client number considered as the "target" or "receiver", depending on
@@ -390,6 +395,7 @@ stats_iterator (void *cls,
{
static const char *s_sent = "# keepalives sent";
static const char *s_recv = "# keepalives received";
+ static const char *drops = "# messages dropped due to full buffer";
uint32_t i;
i = GNUNET_TESTBED_get_index (peer);
@@ -401,9 +407,10 @@ stats_iterator (void *cls,
(unsigned long long) value);
if (0 == strncmp (s_sent, name, strlen (s_sent)) && 0 == i)
ka_sent = value;
-
if (0 == strncmp(s_recv, name, strlen (s_recv)) && peers_requested - 1 == i)
ka_received = value;
+ if (0 == strncmp(drops, name, strlen (drops)))
+ msg_dropped += value;
return GNUNET_OK;
}
@@ -435,7 +442,7 @@ gather_stats_and_exit (void *cls)
}
stats_op = GNUNET_TESTBED_get_statistics (peers_running, testbed_peers,
"cadet", NULL,
- stats_iterator, stats_cont, cls);
+ &stats_iterator, stats_cont, cls);
}
@@ -1134,8 +1141,10 @@ main (int argc, char *argv[])
&channel_cleaner,
handlers,
ports);
+ if (NULL != strstr (argv[0], "_reliable"))
+ msg_dropped = 0; /* dropped should be retransmitted */
- if (ok_goal > ok)
+ if (ok_goal > ok - msg_dropped)
{
GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
"FAILED! (%d/%d)\n", ok, ok_goal);
--
To stop receiving notification emails like this one, please contact
address@hidden
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [GNUnet-SVN] [gnunet] branch master updated: allow for message drops by CADET in unreliable mode,
gnunet <=