*/
/**
* @file cadet/test_cadet.c
- *
+ * @author Bart Polot
+ * @author Christian Grothoff
* @brief Test for the cadet service: retransmission of traffic.
*/
#include <stdio.h>
*/
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
{
static const char *s_sent = "# keepalives sent";
static const char *s_recv = "# keepalives received";
+ static const char *rdrops = "# messages dropped due to full buffer";
+ static const char *cdrops = "# messages dropped due to slow client";
uint32_t i;
i = GNUNET_TESTBED_get_index (peer);
(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(rdrops, name, strlen (rdrops)))
+ msg_dropped += value;
+ if (0 == strncmp(cdrops, name, strlen (cdrops)))
+ msg_dropped += value;
return GNUNET_OK;
}
}
stats_op = GNUNET_TESTBED_get_statistics (peers_running, testbed_peers,
"cadet", NULL,
- stats_iterator, stats_cont, cls);
+ &stats_iterator, stats_cont, cls);
}
else
{
GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
- "Incoming channel for unknown client %lu\n", (long) cls);
- GNUNET_break(0);
+ "Incoming channel for unexpected peer #%lu\n",
+ (long) cls);
+ GNUNET_break (0);
}
if (NULL != disconnect_task)
{
&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);