/*
This file is part of GNUnet.
- (C) 2009, 2010 Christian Grothoff (and other contributing authors)
+ Copyright (C) 2009, 2010 GNUnet e.V.
GNUnet is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published
You should have received a copy of the GNU General Public License
along with GNUnet; see the file COPYING. If not, write to the
- Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- Boston, MA 02111-1307, USA.
+ Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ Boston, MA 02110-1301, USA.
*/
/**
* @file transport/test_transport_api_manipulation_send_tcp.c
* Peer 1 has inbound and outbound delay of 100ms
* Peer 2 has no inbound and outbound delay
*
- * We send a request from P1 to P2 and expect delay of >= TEST_DELAY ms
- * Then we send response from P2 to P1 and expect delay of >= TEST_DELAY ms
+ * We send a request from P1 to P2 and expect delay of >= TEST_DELAY us
+ * Then we send response from P2 to P1 and expect delay of >= TEST_DELAY us
*/
#include "platform.h"
#include "gnunet_transport_service.h"
#define TEST_RESPONSE_MESSAGE_TYPE 12346
-#define TEST_DELAY 100
+/**
+ * Test delay, in microseconds.
+ */
+#define TEST_DELAY 100 * 1000LL
static char *test_source;
static int s_sending;
-static GNUNET_SCHEDULER_TaskIdentifier die_task;
+static struct GNUNET_SCHEDULER_Task * die_task;
-static GNUNET_SCHEDULER_TaskIdentifier send_task;
+static struct GNUNET_SCHEDULER_Task * send_task;
static struct PeerContext *p1;
static struct PeerContext *p2;
-static GNUNET_TRANSPORT_TESTING_ConnectRequest cc;
+static struct GNUNET_TRANSPORT_TESTING_ConnectRequest * cc;
static struct GNUNET_TRANSPORT_TransmitHandle *th;
{
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Stopping peers\n");
- if (send_task != GNUNET_SCHEDULER_NO_TASK)
+ if (send_task != NULL)
GNUNET_SCHEDULER_cancel (send_task);
- if (die_task != GNUNET_SCHEDULER_NO_TASK)
+ if (die_task != NULL)
GNUNET_SCHEDULER_cancel (die_task);
if (th != NULL)
GNUNET_TRANSPORT_TESTING_stop_peer (tth, p2);
}
+
static void
-end_badly (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
+end_badly (void *cls)
{
- die_task = GNUNET_SCHEDULER_NO_TASK;
+ die_task = NULL;
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Fail! Stopping peers\n");
- if (send_task != GNUNET_SCHEDULER_NO_TASK)
+ if (send_task != NULL)
GNUNET_SCHEDULER_cancel (send_task);
if (cc != NULL)
{
GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
"Timeout occurred while waiting for transmit_ready\n");
- if (GNUNET_SCHEDULER_NO_TASK != die_task)
+ if (NULL != die_task)
GNUNET_SCHEDULER_cancel (die_task);
die_task = GNUNET_SCHEDULER_add_now (&end_badly, NULL);
ok = 42;
}
GNUNET_assert (size >= TEST_MESSAGE_SIZE);
- if (buf != NULL)
+ memset (buf, '\0', TEST_MESSAGE_SIZE);
+ hdr = buf;
+ hdr->size = htons (TEST_MESSAGE_SIZE);
+ hdr->type = htons (TEST_REQUEST_MESSAGE_TYPE);
+
{
- memset (buf, '\0', TEST_MESSAGE_SIZE);
- hdr = buf;
- hdr->size = htons (TEST_MESSAGE_SIZE);
- hdr->type = htons (TEST_REQUEST_MESSAGE_TYPE);
+ char *ps = GNUNET_strdup (GNUNET_i2s (&p1->id));
+
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "Sending request message from peer %u (`%4s') with type %u and size %u bytes to peer %u (`%4s')\n",
+ p1->no, ps,
+ ntohs (hdr->type),
+ ntohs (hdr->size),
+ p->no,
+ GNUNET_i2s (&p->id));
+ GNUNET_free (ps);
}
- char *ps = GNUNET_strdup (GNUNET_i2s (&p1->id));
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- "Sending request message from peer %u (`%4s') with type %u and size %u bytes to peer %u (`%4s')\n",
- p1->no, ps, ntohs (hdr->type), ntohs (hdr->size), p->no,
- GNUNET_i2s (&p->id));
- GNUNET_free (ps);
return TEST_MESSAGE_SIZE;
}
static void
-sendtask_request_task (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
+sendtask_request_task (void *cls)
{
- send_task = GNUNET_SCHEDULER_NO_TASK;
-
- if ((tc->reason & GNUNET_SCHEDULER_REASON_SHUTDOWN) != 0)
- return;
+ send_task = NULL;
char *receiver_s = GNUNET_strdup (GNUNET_i2s (&p2->id));
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
s_sending = GNUNET_YES;
start_request = GNUNET_TIME_absolute_get();
- th = GNUNET_TRANSPORT_notify_transmit_ready (p1->th, &p2->id, TEST_MESSAGE_SIZE, 0,
+ th = GNUNET_TRANSPORT_notify_transmit_ready (p1->th, &p2->id, TEST_MESSAGE_SIZE,
TIMEOUT_TRANSMIT, ¬ify_request_ready,
p2);
}
{
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
"Timeout occurred while waiting for transmit_ready\n");
- if (GNUNET_SCHEDULER_NO_TASK != die_task)
+ if (NULL != die_task)
GNUNET_SCHEDULER_cancel (die_task);
die_task = GNUNET_SCHEDULER_add_now (&end_badly, NULL);
ok = 42;
}
GNUNET_assert (size >= TEST_MESSAGE_SIZE);
- if (buf != NULL)
+ memset (buf, '\0', TEST_MESSAGE_SIZE);
+ hdr = buf;
+ hdr->size = htons (TEST_MESSAGE_SIZE);
+ hdr->type = htons (TEST_RESPONSE_MESSAGE_TYPE);
+
{
- memset (buf, '\0', TEST_MESSAGE_SIZE);
- hdr = buf;
- hdr->size = htons (TEST_MESSAGE_SIZE);
- hdr->type = htons (TEST_RESPONSE_MESSAGE_TYPE);
+ char *ps = GNUNET_strdup (GNUNET_i2s (&p1->id));
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "Sending response message from peer %u (`%4s') with type %u and size %u bytes to peer %u (`%4s')\n",
+ p1->no,
+ ps,
+ ntohs (hdr->type),
+ ntohs (hdr->size),
+ p->no,
+ GNUNET_i2s (&p->id));
+ GNUNET_free (ps);
}
- char *ps = GNUNET_strdup (GNUNET_i2s (&p1->id));
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- "Sending response message from peer %u (`%4s') with type %u and size %u bytes to peer %u (`%4s')\n",
- p1->no, ps, ntohs (hdr->type), ntohs (hdr->size), p->no,
- GNUNET_i2s (&p->id));
- GNUNET_free (ps);
-
return TEST_MESSAGE_SIZE;
}
+
static void
-sendtask_response_task (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
+sendtask_response_task (void *cls)
{
- send_task = GNUNET_SCHEDULER_NO_TASK;
-
- if ((tc->reason & GNUNET_SCHEDULER_REASON_SHUTDOWN) != 0)
- return;
- char *receiver_s = GNUNET_strdup (GNUNET_i2s (&p1->id));
+ send_task = NULL;
+ {
+ char *receiver_s = GNUNET_strdup (GNUNET_i2s (&p1->id));
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- "Sending message from peer %u (`%4s') -> peer %u (`%s') !\n",
- p2->no, GNUNET_i2s (&p2->id), p1->no, receiver_s);
- GNUNET_free (receiver_s);
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "Sending message from peer %u (`%4s') -> peer %u (`%s') !\n",
+ p2->no,
+ GNUNET_i2s (&p2->id),
+ p1->no,
+ receiver_s);
+ GNUNET_free (receiver_s);
+ }
s_sending = GNUNET_YES;
- start_response = GNUNET_TIME_absolute_get();
- th = GNUNET_TRANSPORT_notify_transmit_ready (p2->th, &p1->id, TEST_MESSAGE_SIZE, 0,
- TIMEOUT_TRANSMIT, ¬ify_response_ready,
+ start_response = GNUNET_TIME_absolute_get();
+ th = GNUNET_TRANSPORT_notify_transmit_ready (p2->th,
+ &p1->id,
+ TEST_MESSAGE_SIZE,
+ TIMEOUT_TRANSMIT,
+ ¬ify_response_ready,
p1);
}
case TEST_REQUEST_MESSAGE_TYPE:
duration = GNUNET_TIME_absolute_get_difference(start_request,
GNUNET_TIME_absolute_get());
- if (duration.rel_value >= TEST_DELAY)
+ if (duration.rel_value_us >= TEST_DELAY)
GNUNET_log (GNUNET_ERROR_TYPE_INFO,
- "Request message was delayed for %llu ms\n",
- duration.rel_value);
+ "Request message was delayed for %s\n",
+ GNUNET_STRINGS_relative_time_to_string (duration,
+ GNUNET_YES));
else
- {
- GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
- "Request message was delayed for %llu ms, should be %u ms\n",
- duration.rel_value, TEST_DELAY);
- ok = 1;
+ {
+ GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+ "Request message was delayed for unexpected duration %s\n",
+ GNUNET_STRINGS_relative_time_to_string (duration,
+ GNUNET_YES));
+ ok = 1;
}
/* Send response */
case TEST_RESPONSE_MESSAGE_TYPE:
duration = GNUNET_TIME_absolute_get_difference(start_response,
GNUNET_TIME_absolute_get());
- if (duration.rel_value >= TEST_DELAY)
- GNUNET_log (GNUNET_ERROR_TYPE_INFO,
- "Response message was delayed for %llu ms\n", duration);
+ if (duration.rel_value_us >= TEST_DELAY)
+ GNUNET_log (GNUNET_ERROR_TYPE_INFO,
+ "Response message was delayed for %s\n",
+ GNUNET_STRINGS_relative_time_to_string (duration,
+ GNUNET_YES));
else
- {
- GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
- "Response message was delayed for %llu ms, should be %u ms\n",
- duration.rel_value, TEST_DELAY);
- ok = 1;
+ {
+ GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+ "Response message was delayed for unexpected duration %s\n",
+ GNUNET_STRINGS_relative_time_to_string (duration,
+ GNUNET_YES));
+ ok = 1;
}
/* Done */
ok = 0;
if ((p1 == NULL) || (p2 == NULL))
{
GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Fail! Could not start peers!\n");
- if (die_task != GNUNET_SCHEDULER_NO_TASK)
+ if (die_task != NULL)
GNUNET_SCHEDULER_cancel (die_task);
die_task = GNUNET_SCHEDULER_add_now (&end_badly, NULL);
return;
GNUNET_GETOPT_OPTION_END
};
- send_task = GNUNET_SCHEDULER_NO_TASK;
+ send_task = NULL;
ok = 1;
GNUNET_PROGRAM_run ((sizeof (argv) / sizeof (char *)) - 1, argv, test_name,