#include "gnunet_transport_service.h"
#include "gnunet_statistics_service.h"
-#define VERBOSE GNUNET_EXTRA_LOGGING
-#define DEBUG_TRANSMISSION GNUNET_EXTRA_LOGGING
+#define VERBOSE GNUNET_NO
#define SYMMETRIC 0
#define ASYMMETRIC_SEND_LIMITED 1
/**
* How long until we give up on transmitting the message?
*/
-#define TIMEOUT GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, 180)
+#define TIMEOUT GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, 300)
/**
* What delay do we request from the core service for transmission?
*/
-#define FAST_TIMEOUT GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, 5)
+#define FAST_TIMEOUT GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, 150)
#define MTYPE 12345
#define MESSAGESIZE 1024
-#define MEASUREMENT_LENGTH GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, 5)
+#define MEASUREMENT_LENGTH GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, 30)
static unsigned long long total_bytes_sent;
static unsigned long long total_bytes_recv;
#if VERBOSE
-#define OKPP do { ok++; fprintf (stderr, "Now at stage %u at %s:%u\n", ok, __FILE__, __LINE__); } while (0)
+#define OKPP do { ok++; GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Now at stage %u at %s:%u\n", ok, __FILE__, __LINE__); } while (0)
#else
#define OKPP do { ok++; } while (0)
#endif
static void
try_connect (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
{
- connect_task = GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_UNIT_SECONDS,
- &try_connect, NULL);
+ connect_task =
+ GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_UNIT_SECONDS, &try_connect,
+ NULL);
GNUNET_TRANSPORT_try_connect (p1.th, &p2.id);
GNUNET_TRANSPORT_try_connect (p2.th, &p1.id);
}
static void
measurement_stop (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
{
- unsigned long long int delta;
- unsigned long long int throughput_out;
- unsigned long long int throughput_in;
- unsigned long long int max_quota_in;
- unsigned long long int max_quota_out;
- unsigned long long int quota_delta;
+ unsigned long long delta;
+ unsigned long long throughput_out;
+ unsigned long long throughput_in;
+ unsigned long long max_quota_in;
+ unsigned long long max_quota_out;
+ unsigned long long quota_delta;
+ enum GNUNET_ErrorType kind = GNUNET_ERROR_TYPE_DEBUG;
measure_task = GNUNET_SCHEDULER_NO_TASK;
- fprintf (stdout, "\n");
+ FPRINTF (stdout, "%s", "\n");
running = GNUNET_NO;
delta = GNUNET_TIME_absolute_get_duration (start_time).rel_value;
- throughput_out = total_bytes_sent * 1000 / 1024 / delta;
- throughput_in = total_bytes_recv * 1000 / 1024 / delta;
-
- if (current_quota_p1_in < current_quota_p2_in)
- max_quota_in = current_quota_p1_in;
- else
- max_quota_in = current_quota_p2_in;
- if (current_quota_p1_out < current_quota_p2_out)
- max_quota_out = current_quota_p1_out;
- else
- max_quota_out = current_quota_p2_out;
+ throughput_out = total_bytes_sent * 1000 / delta; /* convert to bytes/s */
+ throughput_in = total_bytes_recv * 1000 / delta; /* convert to bytes/s */
+ max_quota_in = GNUNET_MIN (current_quota_p1_in, current_quota_p2_in);
+ max_quota_out = GNUNET_MIN (current_quota_p1_out, current_quota_p2_out);
if (max_quota_out < max_quota_in)
- quota_delta = max_quota_in / 10;
+ quota_delta = max_quota_in / 5;
else
- quota_delta = max_quota_out / 10;
+ quota_delta = max_quota_out / 5;
- if ((throughput_out > (max_quota_out + quota_delta) / 1024) ||
- (throughput_in > (max_quota_in + quota_delta) / 1024))
+ if ((throughput_out > (max_quota_out + quota_delta)) ||
+ (throughput_in > (max_quota_in + quota_delta)))
ok = 1;
else
ok = 0;
-
GNUNET_STATISTICS_get (p1.stats, "core", "# discarded CORE_SEND requests",
GNUNET_TIME_UNIT_FOREVER_REL, NULL, &print_stat, &p1);
"# discarded lower priority CORE_SEND request bytes",
GNUNET_TIME_UNIT_FOREVER_REL, NULL, &print_stat, &p2);
- enum GNUNET_ErrorType kind = GNUNET_ERROR_TYPE_DEBUG;
-
- if (ok == 1)
- {
+ if (ok != 0)
kind = GNUNET_ERROR_TYPE_ERROR;
- }
switch (test)
{
case SYMMETRIC:
GNUNET_log (kind, "Core quota compliance test with symmetric quotas: %s\n",
- (ok == 0) ? "PASSED" : "FAILED");
+ (ok != 0) ? "PASSED" : "FAILED");
break;
case ASYMMETRIC_SEND_LIMITED:
GNUNET_log (kind,
"Core quota compliance test with limited sender quota: %s\n",
- (ok == 0) ? "PASSED" : "FAILED");
+ (ok != 0) ? "PASSED" : "FAILED");
break;
case ASYMMETRIC_RECV_LIMITED:
GNUNET_log (kind,
"Core quota compliance test with limited receiver quota: %s\n",
- (ok == 0) ? "PASSED" : "FAILED");
+ (ok != 0) ? "PASSED" : "FAILED");
break;
};
- GNUNET_log (kind, "Peer 1 send rate: %llu kB/s (%llu Bytes in %u sec.)\n",
- throughput_out, total_bytes_sent, delta / 1000);
- GNUNET_log (kind, "Peer 1 send quota: %llu kB/s\n",
- current_quota_p1_out / 1024);
- GNUNET_log (kind, "Peer 2 receive rate: %llu kB/s (%llu Bytes in %u sec.)\n",
- throughput_in, total_bytes_recv, delta / 1000);
- GNUNET_log (kind, "Peer 2 receive quota: %llu kB/s\n",
- current_quota_p2_in / 1024);
+ GNUNET_log (kind, "Peer 1 send rate: %llu b/s (%llu bytes in %llu ms)\n",
+ throughput_out, total_bytes_sent, delta);
+ GNUNET_log (kind, "Peer 1 send quota: %llu b/s\n", current_quota_p1_out);
+ GNUNET_log (kind, "Peer 2 receive rate: %llu b/s (%llu bytes in %llu ms)\n",
+ throughput_in, total_bytes_recv, delta);
+ GNUNET_log (kind, "Peer 2 receive quota: %llu b/s\n", current_quota_p2_in);
/*
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,"Max. inbound quota allowed: %llu kB/s\n",max_quota_in /1024);
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,"Max. outbound quota allowed: %llu kB/s\n",max_quota_out/1024);
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,"Max. inbound quota allowed: %llu b/s\n",max_quota_in );
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,"Max. outbound quota allowed: %llu b/s\n",max_quota_out);
*/
GNUNET_SCHEDULER_cancel (err_task);
err_task = GNUNET_SCHEDULER_add_now (&terminate_task, NULL);
{
if ((p1.ch != NULL) && (p1.connect_status == 1))
GNUNET_break (NULL !=
- (p1.nth = GNUNET_CORE_notify_transmit_ready (p1.ch, GNUNET_NO, 0,
- FAST_TIMEOUT, &p2.id,
- MESSAGESIZE,
- &transmit_ready, &p1)));
+ (p1.nth =
+ GNUNET_CORE_notify_transmit_ready (p1.ch, GNUNET_NO, 0,
+ FAST_TIMEOUT, &p2.id,
+ MESSAGESIZE,
+ &transmit_ready, &p1)));
return 0;
}
GNUNET_assert (tr_n < TOTAL_MSGS);
cbuf = buf;
do
{
-#if DEBUG_TRANSMISSION
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
"Sending message %u of size %u at offset %u\n", tr_n,
MESSAGESIZE, ret);
-#endif
hdr.header.size = htons (MESSAGESIZE);
hdr.header.type = htons (MTYPE);
hdr.num = htonl (tr_n);
static void
connect_notify (void *cls, const struct GNUNET_PeerIdentity *peer,
- const struct GNUNET_ATS_Information *atsi)
+ const struct GNUNET_ATS_Information *atsi,
+ unsigned int atsi_count)
{
struct PeerContext *pc = cls;
if (0 == memcmp (&pc->id, peer, sizeof (struct GNUNET_PeerIdentity)))
- return; /* loopback */
+ return; /* loopback */
GNUNET_assert (pc->connect_status == 0);
pc->connect_status = 1;
if (pc == &p1)
{
-#if DEBUG_TRANSMISSION
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
"Encrypted connection established to peer `%4s'\n",
GNUNET_i2s (peer));
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
"Asking core (1) for transmission to peer `%4s'\n",
GNUNET_i2s (&p2.id));
-#endif
if (err_task != GNUNET_SCHEDULER_NO_TASK)
GNUNET_SCHEDULER_cancel (err_task);
err_task =
NULL);
GNUNET_break (NULL !=
- (p1.nth = GNUNET_CORE_notify_transmit_ready (p1.ch, GNUNET_NO, 0,
- TIMEOUT, &p2.id,
- MESSAGESIZE,
- &transmit_ready, &p1)));
+ (p1.nth =
+ GNUNET_CORE_notify_transmit_ready (p1.ch, GNUNET_NO, 0,
+ TIMEOUT, &p2.id,
+ MESSAGESIZE,
+ &transmit_ready, &p1)));
}
}
struct PeerContext *pc = cls;
if (0 == memcmp (&pc->id, peer, sizeof (struct GNUNET_PeerIdentity)))
- return; /* loopback */
+ return; /* loopback */
pc->connect_status = 0;
+ if (GNUNET_SCHEDULER_NO_TASK != measure_task)
+ {
+ GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+ "Measurement aborted due to disconnect!\n");
+ GNUNET_SCHEDULER_cancel (measure_task);
+ measure_task = GNUNET_SCHEDULER_NO_TASK;
+ }
if (pc->nth != NULL)
{
GNUNET_CORE_notify_transmit_ready_cancel (pc->nth);
pc->nth = NULL;
}
-#if DEBUG_TRANSMISSION
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Encrypted connection to `%4s' cut\n",
GNUNET_i2s (peer));
-#endif
}
static int
inbound_notify (void *cls, const struct GNUNET_PeerIdentity *other,
const struct GNUNET_MessageHeader *message,
- const struct GNUNET_ATS_Information *atsi)
+ const struct GNUNET_ATS_Information *atsi,
+ unsigned int atsi_count)
{
-#if DEBUG_TRANSMISSION
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
"Core provides inbound data from `%4s' %llu.\n",
GNUNET_i2s (other), ntohs (message->size));
-#endif
total_bytes_recv += ntohs (message->size);
return GNUNET_OK;
}
static int
outbound_notify (void *cls, const struct GNUNET_PeerIdentity *other,
const struct GNUNET_MessageHeader *message,
- const struct GNUNET_ATS_Information *atsi)
+ const struct GNUNET_ATS_Information *atsi,
+ unsigned int atsi_count)
{
-#if DEBUG_TRANSMISSION
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
"Core notifies about outbound data for `%4s'.\n",
GNUNET_i2s (other));
-#endif
return GNUNET_OK;
}
static int
process_mtype (void *cls, const struct GNUNET_PeerIdentity *peer,
const struct GNUNET_MessageHeader *message,
- const struct GNUNET_ATS_Information *atsi)
+ const struct GNUNET_ATS_Information *atsi,
+ unsigned int atsi_count)
{
static int n;
const struct TestMessage *hdr;
err_task = GNUNET_SCHEDULER_add_now (&terminate_task_error, NULL);
return GNUNET_SYSERR;
}
-#if DEBUG_TRANSMISSION
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Got message %u of size %u\n",
ntohl (hdr->num), ntohs (message->size));
-#endif
n++;
if (0 == (n % 10))
- fprintf (stderr, ".");
+ FPRINTF (stderr, "%s", ".");
if (running == GNUNET_YES)
GNUNET_assert (ok == 2);
OKPP;
/* connect p2 */
- p2.ch = GNUNET_CORE_connect (p2.cfg, 1, &p2, &init_notify, &connect_notify,
- &disconnect_notify, &inbound_notify, GNUNET_YES,
- &outbound_notify, GNUNET_YES, handlers);
+ p2.ch =
+ GNUNET_CORE_connect (p2.cfg, 1, &p2, &init_notify, &connect_notify,
+ &disconnect_notify, &inbound_notify, GNUNET_YES,
+ &outbound_notify, GNUNET_YES, handlers);
}
else
{
GNUNET_assert (ok == 3);
OKPP;
GNUNET_assert (cls == &p2);
-#if DEBUG_TRANSMISSION
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
"Asking core (1) to connect to peer `%4s'\n",
GNUNET_i2s (&p2.id));
-#endif
- connect_task = GNUNET_SCHEDULER_add_now (&try_connect,
- NULL);
+ connect_task = GNUNET_SCHEDULER_add_now (&try_connect, NULL);
}
}
{
struct PeerContext *p = cls;
-
-#if DEBUG_TRANSMISSION
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
"Received (my) `%s' from transport service\n", "HELLO");
-#endif
GNUNET_assert (message != NULL);
p->hello = GNUNET_malloc (ntohs (message->size));
memcpy (p->hello, message, ntohs (message->size));
p->cfg = GNUNET_CONFIGURATION_create ();
#if START_ARM
p->arm_proc =
- GNUNET_OS_start_process (NULL, NULL, "gnunet-service-arm",
+ GNUNET_OS_start_process (GNUNET_YES, NULL, NULL, "gnunet-service-arm",
"gnunet-service-arm",
#if VERBOSE
"-L", "DEBUG",
GNUNET_assert (test != -1);
GNUNET_assert (GNUNET_SYSERR !=
- GNUNET_CONFIGURATION_get_value_number (p1.cfg, "CORE",
- "TOTAL_QUOTA_IN",
- ¤t_quota_p1_in));
+ GNUNET_CONFIGURATION_get_value_size (p1.cfg, "ATS",
+ "WAN_QUOTA_IN",
+ ¤t_quota_p1_in));
GNUNET_assert (GNUNET_SYSERR !=
- GNUNET_CONFIGURATION_get_value_number (p2.cfg, "CORE",
- "TOTAL_QUOTA_IN",
- ¤t_quota_p2_in));
+ GNUNET_CONFIGURATION_get_value_size (p2.cfg, "ATS",
+ "WAN_QUOTA_IN",
+ ¤t_quota_p2_in));
GNUNET_assert (GNUNET_SYSERR !=
- GNUNET_CONFIGURATION_get_value_number (p1.cfg, "CORE",
- "TOTAL_QUOTA_OUT",
- ¤t_quota_p1_out));
+ GNUNET_CONFIGURATION_get_value_size (p1.cfg, "ATS",
+ "WAN_QUOTA_OUT",
+ ¤t_quota_p1_out));
GNUNET_assert (GNUNET_SYSERR !=
- GNUNET_CONFIGURATION_get_value_number (p2.cfg, "CORE",
- "TOTAL_QUOTA_OUT",
- ¤t_quota_p2_out));
-
- p1.ch = GNUNET_CORE_connect (p1.cfg, 1, &p1, &init_notify, &connect_notify,
- &disconnect_notify, &inbound_notify, GNUNET_YES,
- &outbound_notify, GNUNET_YES, handlers);
+ GNUNET_CONFIGURATION_get_value_size (p2.cfg, "ATS",
+ "WAN_QUOTA_OUT",
+ ¤t_quota_p2_out));
+
+ p1.ch =
+ GNUNET_CORE_connect (p1.cfg, 1, &p1, &init_notify, &connect_notify,
+ &disconnect_notify, &inbound_notify, GNUNET_YES,
+ &outbound_notify, GNUNET_YES, handlers);
}
projects / oweals / gnunet.git / blobdiff