#include "platform.h"
#include "mesh_test_lib.h"
#include "gnunet_mesh_service.h"
+#include "gnunet_statistics_service.h"
#include <gauger.h>
*/
#define SETUP 0
#define FORWARD 1
+#define KEEPALIVE 2
#define SPEED 3
#define SPEED_ACK 4
-#define SPEED_NOBUF 6
#define SPEED_REL 8
#define P2P_SIGNAL 10
*/
static int ok;
- /**
- * Each peer is supposed to generate the following callbacks:
- * 1 incoming tunnel (@dest)
- * 1 connected peer (@orig)
- * 1 received data packet (@dest)
- * 1 received data packet (@orig)
- * 1 received tunnel destroy (@dest)
- * _________________________________
- * 5 x ok expected per peer
- */
+/**
+ * Number of events expected to conclude the test successfully.
+ */
int ok_goal;
-
/**
* Size of each test packet
*/
static struct GNUNET_MESH_Handle *h2;
/**
- * Tunnel handle for the root peer
+ * Channel handle for the root peer
*/
-static struct GNUNET_MESH_Tunnel *t;
+static struct GNUNET_MESH_Channel *ch;
/**
- * Tunnel handle for the first leaf peer
+ * Channel handle for the dest peer
*/
-static struct GNUNET_MESH_Tunnel *incoming_t;
+static struct GNUNET_MESH_Channel *incoming_ch;
/**
- * Time we started the data transmission (after tunnel has been established
+ * Time we started the data transmission (after channel has been established
* and initilized).
*/
static struct GNUNET_TIME_Absolute start_time;
+static struct GNUNET_TESTBED_Peer **testbed_peers;
+static struct GNUNET_TESTBED_Operation *stats_op;
+static unsigned int ka_sent;
+static unsigned int ka_received;
+
/**
* Show the results of the test (banwidth acheived) and log them to GAUGER
end_time = GNUNET_TIME_absolute_get();
total_time = GNUNET_TIME_absolute_get_difference(start_time, end_time);
FPRINTF (stderr, "\nResults of test \"%s\"\n", test_name);
- FPRINTF (stderr, "Test time %llu ms\n",
- (unsigned long long) total_time.rel_value);
+ FPRINTF (stderr, "Test time %s\n",
+ GNUNET_STRINGS_relative_time_to_string (total_time,
+ GNUNET_YES));
FPRINTF (stderr, "Test bandwidth: %f kb/s\n",
- 4 * TOTAL_PACKETS * 1.0 / total_time.rel_value); // 4bytes * ms
+ 4 * TOTAL_PACKETS * 1.0 / (total_time.rel_value_us / 1000)); // 4bytes * ms
FPRINTF (stderr, "Test throughput: %f packets/s\n\n",
- TOTAL_PACKETS * 1000.0 / total_time.rel_value); // packets * ms
+ TOTAL_PACKETS * 1000.0 / (total_time.rel_value_us / 1000)); // packets * ms
GAUGER ("MESH", test_name,
- TOTAL_PACKETS * 1000.0 / total_time.rel_value,
+ TOTAL_PACKETS * 1000.0 / (total_time.rel_value_us / 1000),
"packets/s");
}
/**
* Shut down peergroup, clean up.
- *
+ *
* @param cls Closure (unused).
* @param tc Task Context.
*/
/**
* Disconnect from mesh services af all peers, call shutdown.
- *
+ *
* @param cls Closure (unused).
* @param tc Task Context.
*/
{
GNUNET_TESTBED_operation_done (t_op[i]);
}
- if (NULL != t)
+ if (NULL != ch)
{
- GNUNET_MESH_tunnel_destroy (t);
- t = NULL;
+ GNUNET_MESH_channel_destroy (ch);
+ ch = NULL;
}
- if (NULL != incoming_t)
+ if (NULL != incoming_ch)
{
- GNUNET_MESH_tunnel_destroy (incoming_t);
- incoming_t = NULL;
+ GNUNET_MESH_channel_destroy (incoming_ch);
+ incoming_ch = NULL;
}
GNUNET_MESH_TEST_cleanup (test_ctx);
if (GNUNET_SCHEDULER_NO_TASK != shutdown_handle)
/**
* Abort test: schedule disconnect and shutdown immediately
- *
+ *
* @param line Line in the code the abort is requested from (__LINE__).
*/
static void
/**
* Transmit ready callback.
- *
+ *
* @param cls Closure (message type).
* @param size Size of the tranmist buffer.
* @param buf Pointer to the beginning of the buffer.
- *
+ *
* @return Number of bytes written to buf.
*/
static size_t
/**
* Task to schedule a new data transmission.
- *
+ *
* @param cls Closure (peer #).
* @param tc Task Context.
*/
data_task (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
{
struct GNUNET_MESH_TransmitHandle *th;
- struct GNUNET_MESH_Tunnel *tunnel;
+ struct GNUNET_MESH_Channel *channel;
if ((GNUNET_SCHEDULER_REASON_SHUTDOWN & tc->reason) != 0)
return;
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Data task\n");
if (GNUNET_YES == test_backwards)
{
- tunnel = incoming_t;
+ channel = incoming_ch;
}
else
{
- tunnel = t;
+ channel = ch;
}
- th = GNUNET_MESH_notify_transmit_ready (tunnel, GNUNET_NO,
+ th = GNUNET_MESH_notify_transmit_ready (channel, GNUNET_NO,
GNUNET_TIME_UNIT_FOREVER_REL,
size_payload, &tmt_rdy, (void *) 1L);
if (NULL == th)
uint32_t *data;
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- " tmt_rdy called\n");
+ "tmt_rdy called, filling buffer\n");
if (size < size_payload || NULL == buf)
{
- GNUNET_break (0);
- GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+ GNUNET_break (ok >= ok_goal - 2);
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
"size %u, buf %p, data_sent %u, data_received %u\n",
- size,
- buf,
- data_sent,
- data_received);
+ size, buf, data_sent, data_received);
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "ok %u, ok goal %u\n", ok, ok_goal);
+
return 0;
}
msg->size = htons (size);
msg->type = htons ((long) cls);
data = (uint32_t *) &msg[1];
*data = htonl (data_sent);
- if (SPEED == test && GNUNET_YES == initialized)
+ if (GNUNET_NO == initialized)
+ {
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "sending initializer\n");
+ }
+ else if (SPEED == test)
{
data_sent++;
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
{
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
" Scheduling packet %d\n", data_sent + 1);
- GNUNET_SCHEDULER_add_now(&data_task, NULL);
+ GNUNET_SCHEDULER_add_now (&data_task, NULL);
}
}
+
return size_payload;
}
* Function is called whenever a message is received.
*
* @param cls closure (set from GNUNET_MESH_connect)
- * @param tunnel connection to the other end
- * @param tunnel_ctx place to store local state associated with the tunnel
+ * @param channel connection to the other end
+ * @param channel_ctx place to store local state associated with the channel
* @param message the actual message
* @return GNUNET_OK to keep the connection open,
* GNUNET_SYSERR to close it (signal serious error)
*/
int
-data_callback (void *cls, struct GNUNET_MESH_Tunnel *tunnel, void **tunnel_ctx,
+data_callback (void *cls, struct GNUNET_MESH_Channel *channel,
+ void **channel_ctx,
const struct GNUNET_MessageHeader *message)
{
long client = (long) cls;
ok++;
- GNUNET_MESH_receive_done (tunnel);
+ GNUNET_MESH_receive_done (channel);
if ((ok % 20) == 0)
{
if (client == expected_target_client) // Normally 4
{
data_received++;
- GNUNET_log (GNUNET_ERROR_TYPE_INFO,
- " received data %u\n", data_received);
+ GNUNET_log (GNUNET_ERROR_TYPE_INFO, " received data %u\n", data_received);
if (SPEED != test || (ok_goal - 2) == ok)
{
- GNUNET_MESH_notify_transmit_ready (tunnel, GNUNET_NO,
+ GNUNET_MESH_notify_transmit_ready (channel, GNUNET_NO,
GNUNET_TIME_UNIT_FOREVER_REL,
size_payload, &tmt_rdy, (void *) 1L);
return GNUNET_OK;
if (test == SPEED_ACK || test == SPEED)
{
data_ack++;
- GNUNET_log (GNUNET_ERROR_TYPE_INFO,
- " received ack %u\n", data_ack);
- GNUNET_MESH_notify_transmit_ready (tunnel, GNUNET_NO,
+ GNUNET_log (GNUNET_ERROR_TYPE_INFO, " received ack %u\n", data_ack);
+ GNUNET_MESH_notify_transmit_ready (channel, GNUNET_NO,
GNUNET_TIME_UNIT_FOREVER_REL,
size_payload, &tmt_rdy, (void *) 1L);
if (data_ack < TOTAL_PACKETS && SPEED != test)
}
if (test == P2P_SIGNAL)
{
- GNUNET_MESH_tunnel_destroy (incoming_t);
- incoming_t = NULL;
+ GNUNET_MESH_channel_destroy (incoming_ch);
+ incoming_ch = NULL;
}
else
{
- GNUNET_MESH_tunnel_destroy (t);
- t = NULL;
+ GNUNET_MESH_channel_destroy (ch);
+ ch = NULL;
}
}
}
+/**
+ * Stats callback. Finish the stats testbed operation and when all stats have
+ * been iterated, shutdown the test.
+ *
+ * @param cls closure
+ * @param op the operation that has been finished
+ * @param emsg error message in case the operation has failed; will be NULL if
+ * operation has executed successfully.
+ */
+static void
+stats_cont (void *cls, struct GNUNET_TESTBED_Operation *op, const char *emsg)
+{
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "stats_cont for peer %u\n", cls);
+ GNUNET_TESTBED_operation_done (stats_op);
+
+ if (GNUNET_SCHEDULER_NO_TASK != disconnect_task)
+ GNUNET_SCHEDULER_cancel (disconnect_task);
+ disconnect_task = GNUNET_SCHEDULER_add_now (&disconnect_mesh_peers,
+ (void *) __LINE__);
+
+}
+
+
+/**
+ * Process statistic values.
+ *
+ * @param cls closure
+ * @param peer the peer the statistic belong to
+ * @param subsystem name of subsystem that created the statistic
+ * @param name the name of the datum
+ * @param value the current value
+ * @param is_persistent GNUNET_YES if the value is persistent, GNUNET_NO if not
+ * @return GNUNET_OK to continue, GNUNET_SYSERR to abort iteration
+ */
+static int
+stats_iterator (void *cls, const struct GNUNET_TESTBED_Peer *peer,
+ const char *subsystem, const char *name,
+ uint64_t value, int is_persistent)
+{
+ static const char *s_sent = "# keepalives sent";
+ static const char *s_recv = "# keepalives received";
+ uint32_t i;
+
+ i = GNUNET_TESTBED_get_index (peer);
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, " %u - %s [%s]: %llu\n",
+ i, subsystem, name, value);
+ if (0 == strncmp (s_sent, name, strlen (s_sent)) && 0 == i)
+ ka_sent = value;
+
+ if (0 == strncmp(s_recv, name, strlen (s_recv)) && 4 == i)
+ {
+ ka_received = value;
+ GNUNET_log (GNUNET_ERROR_TYPE_INFO, " sent: %u, received: %u\n",
+ ka_sent, ka_received);
+ if (ka_sent < 2 || ka_sent > ka_received + 1)
+ ok--;
+ }
+
+ return GNUNET_OK;
+}
+
+
+/**
+ * Task check that keepalives were sent and received.
+ *
+ * @param cls Closure (NULL).
+ * @param tc Task Context.
+ */
+static void
+check_keepalives (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
+{
+ if ((GNUNET_SCHEDULER_REASON_SHUTDOWN & tc->reason) != 0)
+ return;
+
+ disconnect_task = GNUNET_SCHEDULER_NO_TASK;
+ GNUNET_log (GNUNET_ERROR_TYPE_INFO, "check keepalives\n");
+ GNUNET_MESH_channel_destroy (ch);
+ stats_op = GNUNET_TESTBED_get_statistics (5, testbed_peers,
+ "mesh", NULL,
+ stats_iterator, stats_cont, NULL);
+}
+
+
/**
* Handlers, for diverse services
*/
/**
- * Method called whenever another peer has added us to a tunnel
+ * Method called whenever another peer has added us to a channel
* the other peer initiated.
*
* @param cls Closure.
- * @param tunnel New handle to the tunnel.
- * @param initiator Peer that started the tunnel.
- * @param port Port this tunnels is connected to.
- * @return Initial tunnel context for the tunnel
+ * @param channel New handle to the channel.
+ * @param initiator Peer that started the channel.
+ * @param port Port this channel is connected to.
+ * @param options channel option flags
+ * @return Initial channel context for the channel
* (can be NULL -- that's not an error).
*/
static void *
-incoming_tunnel (void *cls, struct GNUNET_MESH_Tunnel *tunnel,
+incoming_channel (void *cls, struct GNUNET_MESH_Channel *channel,
const struct GNUNET_PeerIdentity *initiator,
- uint32_t port)
+ uint32_t port, enum GNUNET_MESH_ChannelOption options)
{
GNUNET_log (GNUNET_ERROR_TYPE_INFO,
- "Incoming tunnel from %s to peer %d\n",
+ "Incoming channel from %s to peer %d\n",
GNUNET_i2s (initiator), (long) cls);
ok++;
GNUNET_log (GNUNET_ERROR_TYPE_INFO, " ok: %d\n", ok);
if ((long) cls == 4L)
- incoming_t = tunnel;
+ incoming_ch = channel;
else
{
GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
- "Incoming tunnel for unknown client %lu\n", (long) cls);
+ "Incoming channel for unknown client %lu\n", (long) cls);
GNUNET_break(0);
}
if (GNUNET_SCHEDULER_NO_TASK != disconnect_task)
{
GNUNET_SCHEDULER_cancel (disconnect_task);
- disconnect_task = GNUNET_SCHEDULER_add_delayed (SHORT_TIME,
- &disconnect_mesh_peers,
- (void *) __LINE__);
+ if (KEEPALIVE == test)
+ {
+ struct GNUNET_TIME_Relative delay;
+ delay = GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS , 5);
+ disconnect_task =
+ GNUNET_SCHEDULER_add_delayed (delay, &check_keepalives, NULL);
+ }
+ else
+ disconnect_task = GNUNET_SCHEDULER_add_delayed (SHORT_TIME,
+ &disconnect_mesh_peers,
+ (void *) __LINE__);
}
return NULL;
}
/**
- * Function called whenever an inbound tunnel is destroyed. Should clean up
+ * Function called whenever an inbound channel is destroyed. Should clean up
* any associated state.
*
* @param cls closure (set from GNUNET_MESH_connect)
- * @param tunnel connection to the other end (henceforth invalid)
- * @param tunnel_ctx place where local state associated
- * with the tunnel is stored
+ * @param channel connection to the other end (henceforth invalid)
+ * @param channel_ctx place where local state associated
+ * with the channel is stored
*/
static void
-tunnel_cleaner (void *cls, const struct GNUNET_MESH_Tunnel *tunnel,
- void *tunnel_ctx)
+channel_cleaner (void *cls, const struct GNUNET_MESH_Channel *channel,
+ void *channel_ctx)
{
long i = (long) cls;
GNUNET_log (GNUNET_ERROR_TYPE_INFO,
- "Incoming tunnel disconnected at peer %d\n",
+ "Incoming channel disconnected at peer %d\n",
i);
if (4L == i)
{
ok++;
- incoming_t = NULL;
+ GNUNET_break (channel == incoming_ch);
+ incoming_ch = NULL;
}
- else if (0L == i && P2P_SIGNAL == test)
+ else if (0L == i)
{
- ok ++;
- t = NULL;
+ if (P2P_SIGNAL == test)
+ {
+ ok ++;
+ }
+ GNUNET_break (channel == ch);
+ ch = NULL;
}
else
GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
/**
* START THE TESTCASE ITSELF, AS WE ARE CONNECTED TO THE MESH SERVICES.
- *
+ *
* Testcase continues when the root receives confirmation of connected peers,
* on callback funtion ch.
- *
+ *
* @param cls Closure (unsued).
* @param tc Task Context.
*/
static void
do_test (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
{
- int nobuf;
- int rel;
+ enum GNUNET_MESH_ChannelOption flags;
+
+ if ((GNUNET_SCHEDULER_REASON_SHUTDOWN & tc->reason) != 0)
+ return;
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "test_task\n");
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "add peer 2\n");
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- "schedule timeout in TIMEOUT\n");
if (GNUNET_SCHEDULER_NO_TASK != disconnect_task)
{
GNUNET_SCHEDULER_cancel (disconnect_task);
}
- if (SPEED_NOBUF == test)
- {
- test = SPEED;
- nobuf = GNUNET_YES;
- }
- else
- nobuf = GNUNET_NO;
+ flags = GNUNET_MESH_OPTION_DEFAULT;
if (SPEED_REL == test)
{
test = SPEED;
- rel = GNUNET_YES;
+ flags |= GNUNET_MESH_OPTION_RELIABLE;
}
- else
- rel = GNUNET_NO;
- t = GNUNET_MESH_tunnel_create (h1, NULL, p_id[1], 1, nobuf, rel);
+ ch = GNUNET_MESH_channel_create (h1, NULL, p_id[1], 1, flags);
disconnect_task = GNUNET_SCHEDULER_add_delayed (SHORT_TIME,
&disconnect_mesh_peers,
(void *) __LINE__);
+ if (KEEPALIVE == test)
+ return; /* Don't send any data. */
+
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
"Sending data initializer...\n");
data_ack = 0;
data_received = 0;
data_sent = 0;
- GNUNET_MESH_notify_transmit_ready (t, GNUNET_NO,
- GNUNET_TIME_UNIT_FOREVER_REL,
+ GNUNET_MESH_notify_transmit_ready (ch, GNUNET_NO,
+ GNUNET_TIME_UNIT_FOREVER_REL,
size_payload, &tmt_rdy, (void *) 1L);
}
ok = 0;
test_ctx = ctx;
peers_running = num_peers;
+ testbed_peers = peers;
h1 = meshes[0];
h2 = meshes[num_peers - 1];
disconnect_task = GNUNET_SCHEDULER_add_delayed (SHORT_TIME,
main (int argc, char *argv[])
{
initialized = GNUNET_NO;
- uint32_t ports[2];
+ static uint32_t ports[2];
const char *config_file;
GNUNET_log_setup ("test", "DEBUG", NULL);
}
else if (strstr (argv[0], "_small_speed_ack") != NULL)
{
- /* Each peer is supposed to generate the following callbacks:
- * 1 incoming tunnel (@dest)
- * TOTAL_PACKETS received data packet (@dest)
- * TOTAL_PACKETS received data packet (@orig)
- * 1 received tunnel destroy (@dest)
- * _________________________________
- * 5 x ok expected per peer
- */
+ /* Test is supposed to generate the following callbacks:
+ * 1 incoming channel (@dest)
+ * TOTAL_PACKETS received data packet (@dest)
+ * TOTAL_PACKETS received data packet (@orig)
+ * 1 received channel destroy (@dest)
+ */
+ ok_goal = TOTAL_PACKETS * 2 + 2;
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "SPEED_ACK\n");
test = SPEED_ACK;
test_name = "speed ack";
- ok_goal = TOTAL_PACKETS * 2 + 2;
}
else if (strstr (argv[0], "_small_speed") != NULL)
{
- /* Each peer is supposed to generate the following callbacks:
- * 1 incoming tunnel (@dest)
- * 1 initial packet (@dest)
- * TOTAL_PACKETS received data packet (@dest)
- * 1 received data packet (@orig)
- * 1 received tunnel destroy (@dest)
- * _________________________________
- */
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "SPEED\n");
+ /* Test is supposed to generate the following callbacks:
+ * 1 incoming channel (@dest)
+ * 1 initial packet (@dest)
+ * TOTAL_PACKETS received data packet (@dest)
+ * 1 received data packet (@orig)
+ * 1 received channel destroy (@dest)
+ */
ok_goal = TOTAL_PACKETS + 4;
- if (strstr (argv[0], "_nobuf") != NULL)
- {
- test = SPEED_NOBUF;
- test_name = "speed nobuf";
- }
- else if (strstr (argv[0], "_reliable") != NULL)
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "SPEED\n");
+ if (strstr (argv[0], "_reliable") != NULL)
{
test = SPEED_REL;
test_name = "speed reliable";
test_name = "speed";
}
}
+ else if (strstr (argv[0], "_keepalive") != NULL)
+ {
+ test = KEEPALIVE;
+ /* Test is supposed to generate the following callbacks:
+ * 1 incoming channel (@dest)
+ * [wait]
+ * 1 received channel destroy (@dest)
+ */
+ ok_goal = 2;
+ }
else
{
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "UNKNOWN\n");
if (strstr (argv[0], "backwards") != NULL)
{
- char *aux;
-
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "BACKWARDS (LEAF TO ROOT)\n");
test_backwards = GNUNET_YES;
- aux = GNUNET_malloc (32);
- sprintf (aux, "backwards %s", test_name);
- test_name = aux;
+ GNUNET_asprintf (&test_name, "backwards %s", test_name);
}
p_ids = 0;
5,
&tmain,
NULL, /* tmain cls */
- &incoming_tunnel,
- &tunnel_cleaner,
+ &incoming_channel,
+ &channel_cleaner,
handlers,
ports);
projects / oweals / gnunet.git / blobdiff