/*
This file is part of GNUnet.
- (C) 2009, 2010, 2011 Christian Grothoff (and other contributing authors)
+ Copyright (C) 2009, 2010, 2011 Christian Grothoff (and other contributing authors)
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_quota_compliance.c
*/
#define TIMEOUT_TRANSMIT GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, 20)
-#define DURATION GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, 5)
+#define DURATION GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, 10)
static char *test_source;
static char *test_name;
-static GNUNET_SCHEDULER_TaskIdentifier die_task;
+static struct GNUNET_SCHEDULER_Task * die_task;
-static GNUNET_SCHEDULER_TaskIdentifier measure_task;
+static struct GNUNET_SCHEDULER_Task * measure_task;
struct PeerContext *p1;
#define MTYPE 12345
GNUNET_NETWORK_STRUCT_BEGIN
-
struct TestMessage
{
struct GNUNET_MessageHeader header;
static int msg_scheduled;
static int msg_sent;
-static int msg_recv_expected;
-static int msg_recv;
static int test_failed;
static int test_connected;
datarate, quota_out_p1, quota_in_p2);
}
- if (die_task != GNUNET_SCHEDULER_NO_TASK)
+ if (die_task != NULL)
GNUNET_SCHEDULER_cancel (die_task);
if (th != NULL)
static void
end_badly ()
{
- die_task = GNUNET_SCHEDULER_NO_TASK;
+ die_task = NULL;
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Fail! Stopping peers\n");
- if (measure_task != GNUNET_SCHEDULER_NO_TASK)
+ if (measure_task != NULL)
GNUNET_SCHEDULER_cancel (measure_task);
if (test_connected == GNUNET_YES)
notify_receive (void *cls, const struct GNUNET_PeerIdentity *peer,
const struct GNUNET_MessageHeader *message)
{
- static int n;
- unsigned int s;
- char cbuf[GNUNET_SERVER_MAX_MESSAGE_SIZE - 1];
const struct TestMessage *hdr;
hdr = (const struct TestMessage *) message;
- s = get_size (n);
if (MTYPE != ntohs (message->type))
return;
- msg_recv_expected = n;
- msg_recv = ntohl (hdr->num);
- if (ntohs (message->size) != (s))
- {
- GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
- "Expected message %u of size %u, got %u bytes of message %u\n",
- n, s, ntohs (message->size), ntohl (hdr->num));
- if (die_task != GNUNET_SCHEDULER_NO_TASK)
- GNUNET_SCHEDULER_cancel (die_task);
- test_failed = GNUNET_YES;
- die_task = GNUNET_SCHEDULER_add_now (&end_badly, NULL);
- return;
- }
- if (ntohl (hdr->num) != n)
- {
- GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
- "Expected message %u of size %u, got %u bytes of message %u\n",
- n, s, ntohs (message->size), ntohl (hdr->num));
- if (die_task != GNUNET_SCHEDULER_NO_TASK)
- GNUNET_SCHEDULER_cancel (die_task);
- test_failed = GNUNET_YES;
- die_task = GNUNET_SCHEDULER_add_now (&end_badly, NULL);
- return;
- }
- memset (cbuf, n, s - sizeof (struct TestMessage));
- if (0 != memcmp (cbuf, &hdr[1], s - sizeof (struct TestMessage)))
- {
- GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
- "Expected message %u with bits %u, but body did not match\n", n,
- (unsigned char) n);
- if (die_task != GNUNET_SCHEDULER_NO_TASK)
- GNUNET_SCHEDULER_cancel (die_task);
- test_failed = GNUNET_YES;
- die_task = GNUNET_SCHEDULER_add_now (&end_badly, NULL);
- return;
- }
-#if VERBOSE
- if (ntohl (hdr->num) % 5000 == 0)
- {
- struct PeerContext *p = cls;
- char *ps = GNUNET_strdup (GNUNET_i2s (&p->id));
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- "Peer %u (`%s') got message %u of size %u from peer (`%s')\n",
- p->no, ps, ntohl (hdr->num), ntohs (message->size),
- GNUNET_i2s (peer));
- GNUNET_free (ps);
- }
-#endif
- n++;
+ struct PeerContext *p = cls;
+ char *ps = GNUNET_strdup (GNUNET_i2s (&p->id));
+
+ GNUNET_log (GNUNET_ERROR_TYPE_INFO,
+ "Peer %u (`%s') got message %u of size %u from peer (`%s')\n",
+ p->no, ps, ntohl (hdr->num), ntohs (message->size),
+ GNUNET_i2s (peer));
+ GNUNET_free (ps);
}
GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
"Timeout occurred while waiting for transmit_ready for message %u of %u\n",
msg_scheduled, TOTAL_MSGS);
- 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);
test_failed = 1;
#if VERBOSE
if (n % 5000 == 0)
{
-
+#endif
char *receiver_s = GNUNET_strdup (GNUNET_i2s (&receiver->id));
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- "Sending message of size %u from peer %u (`%4s') -> peer %u (`%s') !\n",
- n, sender->no, GNUNET_i2s (&sender->id), receiver->no,
+ GNUNET_log (GNUNET_ERROR_TYPE_INFO,
+ "Sending message %u of size %u from peer %u (`%4s') -> peer %u (`%s') !\n",
+ n, s, sender->no, GNUNET_i2s (&sender->id), receiver->no,
receiver_s);
GNUNET_free (receiver_s);
+#if 0
}
#endif
n++;
{
static int counter;
- measure_task = GNUNET_SCHEDULER_NO_TASK;
+ measure_task = NULL;
counter++;
if ((DURATION.rel_value_us / 1000 / 1000LL) < counter)
generate_config (char *cfg_file, unsigned long long quota_in,
unsigned long long quota_out)
{
- char *networks[GNUNET_ATS_NetworkTypeCount] = GNUNET_ATS_NetworkTypeString;
char *in_name;
char *out_name;
char *fname = NULL;
for (c = 0; c < GNUNET_ATS_NetworkTypeCount; c++)
{
- GNUNET_asprintf (&in_name, "%s_QUOTA_IN", networks[c]);
- GNUNET_asprintf (&out_name, "%s_QUOTA_OUT", networks[c]);
- GNUNET_CONFIGURATION_set_value_number (cfg, "ats", in_name, quota_in);
- GNUNET_CONFIGURATION_set_value_number (cfg, "ats", out_name, quota_out);
- GNUNET_free (in_name);
- GNUNET_free (out_name);
+ GNUNET_asprintf (&in_name,
+ "%s_QUOTA_IN",
+ GNUNET_ATS_print_network_type (c));
+ GNUNET_asprintf (&out_name,
+ "%s_QUOTA_OUT",
+ GNUNET_ATS_print_network_type (c));
+ GNUNET_CONFIGURATION_set_value_number (cfg, "ats", in_name, quota_in);
+ GNUNET_CONFIGURATION_set_value_number (cfg, "ats", out_name, quota_out);
+ GNUNET_free (in_name);
+ GNUNET_free (out_name);
}
GNUNET_assert (GNUNET_OK == GNUNET_CONFIGURATION_write (cfg, fname));
GNUNET_CONFIGURATION_destroy (cfg);
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;
projects / oweals / gnunet.git / blobdiff