[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] r32163 - gnunet/src/ats-tests
From: |
gnunet |
Subject: |
[GNUnet-SVN] r32163 - gnunet/src/ats-tests |
Date: |
Mon, 3 Feb 2014 15:08:48 +0100 |
Author: wachs
Date: 2014-02-03 15:08:48 +0100 (Mon, 03 Feb 2014)
New Revision: 32163
Modified:
gnunet/src/ats-tests/ats-testing-experiment.c
gnunet/src/ats-tests/ats-testing-traffic.c
gnunet/src/ats-tests/ats-testing.h
gnunet/src/ats-tests/gnunet-ats-sim.c
Log:
removing set_rate, using start_send instead
Modified: gnunet/src/ats-tests/ats-testing-experiment.c
===================================================================
--- gnunet/src/ats-tests/ats-testing-experiment.c 2014-02-03 13:53:43 UTC
(rev 32162)
+++ gnunet/src/ats-tests/ats-testing-experiment.c 2014-02-03 14:08:48 UTC
(rev 32163)
@@ -35,8 +35,6 @@
return "START_SEND";
case STOP_SEND:
return "STOP_SEND";
- case SET_RATE:
- return "SET_RATE";
case SET_PREFERENCE:
return "SET_PREFERENCE";
default:
@@ -119,10 +117,6 @@
{
o->type = STOP_SEND;
}
- else if (0 == strcmp (op, "set_rate"))
- {
- o->type = SET_RATE;
- }
else if (0 == strcmp (op, "set_preference"))
{
o->type = SET_PREFERENCE;
@@ -253,7 +247,6 @@
o->period = cur->duration;
}
GNUNET_free (op_name);
-
}
/* Safety checks */
@@ -357,35 +350,6 @@
static void
enforce_start_send (struct GNUNET_ATS_TEST_Operation *op)
{
- GNUNET_break (0);
-}
-
-static void
-enforce_stop_send (struct GNUNET_ATS_TEST_Operation *op)
-{
- struct BenchmarkPartner *p;
- p = GNUNET_ATS_TEST_get_partner (op->src_id, op->dest_id);
- if (NULL == p)
- {
- GNUNET_break (0);
- return;
- }
-
- fprintf (stderr, "Found master %llu slave %llu\n",op->src_id, op->dest_id);
-
- if (NULL != p->tg)
- {
- fprintf (stderr, "Stopping traffic between master %llu slave
%llu\n",op->src_id, op->dest_id);
- GNUNET_ATS_TEST_generate_traffic_stop(p->tg);
- p->tg = NULL;
- }
-
-
-}
-
-static void
-enforce_set_rate (struct GNUNET_ATS_TEST_Operation *op)
-{
struct BenchmarkPeer *peer;
struct BenchmarkPartner *partner;
@@ -418,6 +382,28 @@
}
static void
+enforce_stop_send (struct GNUNET_ATS_TEST_Operation *op)
+{
+ struct BenchmarkPartner *p;
+ p = GNUNET_ATS_TEST_get_partner (op->src_id, op->dest_id);
+ if (NULL == p)
+ {
+ GNUNET_break (0);
+ return;
+ }
+
+ fprintf (stderr, "Found master %llu slave %llu\n",op->src_id, op->dest_id);
+
+ if (NULL != p->tg)
+ {
+ fprintf (stderr, "Stopping traffic between master %llu slave
%llu\n",op->src_id, op->dest_id);
+ GNUNET_ATS_TEST_generate_traffic_stop(p->tg);
+ p->tg = NULL;
+ }
+}
+
+
+static void
enforce_set_preference (struct GNUNET_ATS_TEST_Operation *op)
{
GNUNET_break (0);
@@ -438,9 +424,6 @@
case STOP_SEND:
enforce_stop_send (cur);
break;
- case SET_RATE:
- enforce_set_rate (cur);
- break;
case SET_PREFERENCE:
enforce_set_preference (cur);
break;
Modified: gnunet/src/ats-tests/ats-testing-traffic.c
===================================================================
--- gnunet/src/ats-tests/ats-testing-traffic.c 2014-02-03 13:53:43 UTC (rev
32162)
+++ gnunet/src/ats-tests/ats-testing-traffic.c 2014-02-03 14:08:48 UTC (rev
32163)
@@ -48,7 +48,6 @@
if (UINT32_MAX == tg->base_rate)
return GNUNET_TIME_UNIT_ZERO;
cur_rate = tg->base_rate;
- return delay;
break;
case GNUNET_ATS_TEST_TG_LINEAR:
time_delta = GNUNET_TIME_absolute_get_duration(tg->time_start);
@@ -56,7 +55,7 @@
time_delta.rel_value_us = time_delta.rel_value_us %
tg->duration_period.rel_value_us;
delta_rate = ((double) time_delta.rel_value_us /
tg->duration_period.rel_value_us) *
(tg->max_rate - tg->base_rate);
- if ((tg->max_rate - tg->base_rate) > tg->base_rate)
+ if ((tg->max_rate < tg->base_rate) && ((tg->max_rate - tg->base_rate) >
tg->base_rate))
{
/* This will cause an underflow */
GNUNET_break (0);
@@ -88,9 +87,8 @@
if (cur_rate < 0)
{
- cur_rate = 0;
+ cur_rate = 1;
}
-
/* Calculate the delay for the next message based on the current delay */
delay.rel_value_us = GNUNET_TIME_UNIT_SECONDS.rel_value_us *
TEST_MESSAGE_SIZE / cur_rate;
@@ -157,9 +155,9 @@
return TEST_MESSAGE_SIZE;
}
delay = get_delay (p->tg);
- /*
- fprintf (stderr, "Delay for next transmission %llu ms\n",
- (long long unsigned int) delay.rel_value_us / 1000);*/
+
+ GNUNET_log(GNUNET_ERROR_TYPE_DEBUG, "Delay for next transmission %llu ms\n",
+ (long long unsigned int) delay.rel_value_us / 1000);
p->tg->next_ping_transmission =
GNUNET_TIME_absolute_add(GNUNET_TIME_absolute_get(),
delay);
@@ -225,7 +223,7 @@
void
GNUNET_ATS_TEST_traffic_handle_ping (struct BenchmarkPartner *p)
{
- GNUNET_log(GNUNET_ERROR_TYPE_DEBUG,
+ GNUNET_log(GNUNET_ERROR_TYPE_ERROR,
"Slave [%u]: Received PING from [%u], sending PONG\n", p->me->no,
p->dest->no);
@@ -259,7 +257,7 @@
GNUNET_ATS_TEST_traffic_handle_pong (struct BenchmarkPartner *p)
{
struct GNUNET_TIME_Relative left;
- GNUNET_log(GNUNET_ERROR_TYPE_DEBUG,
+ GNUNET_log(GNUNET_ERROR_TYPE_ERROR,
"Master [%u]: Received PONG from [%u], next message\n", p->me->no,
p->dest->no);
@@ -271,6 +269,9 @@
GNUNET_TIME_absolute_get()).rel_value_us;
/* Schedule next send event */
+ if (NULL == p->tg)
+ return;
+
left = GNUNET_TIME_absolute_get_remaining(p->tg->next_ping_transmission);
if (UINT32_MAX == p->tg->base_rate)
{
@@ -282,6 +283,11 @@
}
else
{
+ /* Enforce minimum transmission rate 1 msg / sec */
+ if (GNUNET_TIME_UNIT_SECONDS.rel_value_us == (left =
GNUNET_TIME_relative_min (left, GNUNET_TIME_UNIT_SECONDS)).rel_value_us)
+ GNUNET_log(GNUNET_ERROR_TYPE_ERROR,
+ "Enforcing minimum send rate between master [%u] and slave [%u]\n",
+ p->me->no, p->dest->no);
p->tg->send_task = GNUNET_SCHEDULER_add_delayed (left,
&comm_schedule_send, p);
}
@@ -329,11 +335,38 @@
tg->time_start = GNUNET_TIME_absolute_get();
tg->next_ping_transmission = GNUNET_TIME_UNIT_FOREVER_ABS;
- GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
- "Setting up traffic generator master[%u] `%s' and slave [%u] `%s' max %u
Bips\n",
- dest->me->no, GNUNET_i2s (&dest->me->id),
- dest->dest->no, GNUNET_i2s (&dest->dest->id),
- base_rate);
+ switch (type) {
+ case GNUNET_ATS_TEST_TG_CONSTANT:
+ GNUNET_log (GNUNET_ERROR_TYPE_INFO,
+ "Setting up constant traffic generator master[%u] `%s' and slave
[%u] `%s' max %u Bips\n",
+ dest->me->no, GNUNET_i2s (&dest->me->id),
+ dest->dest->no, GNUNET_i2s (&dest->dest->id),
+ base_rate);
+ break;
+ case GNUNET_ATS_TEST_TG_LINEAR:
+ GNUNET_log (GNUNET_ERROR_TYPE_INFO,
+ "Setting up linear traffic generator master[%u] `%s' and slave [%u]
`%s' min %u Bips max %u Bips\n",
+ dest->me->no, GNUNET_i2s (&dest->me->id),
+ dest->dest->no, GNUNET_i2s (&dest->dest->id),
+ base_rate, max_rate);
+ break;
+ case GNUNET_ATS_TEST_TG_SINUS:
+ GNUNET_log (GNUNET_ERROR_TYPE_INFO,
+ "Setting up sinus traffic generator master[%u] `%s' and slave [%u]
`%s' baserate %u Bips, amplitude %u Bps\n",
+ dest->me->no, GNUNET_i2s (&dest->me->id),
+ dest->dest->no, GNUNET_i2s (&dest->dest->id),
+ base_rate, max_rate);
+ break;
+ case GNUNET_ATS_TEST_TG_RANDOM:
+ GNUNET_log (GNUNET_ERROR_TYPE_INFO,
+ "Setting up random traffic generator master[%u] `%s' and slave [%u]
`%s' min %u Bips max %u Bps\n",
+ dest->me->no, GNUNET_i2s (&dest->me->id),
+ dest->dest->no, GNUNET_i2s (&dest->dest->id),
+ base_rate, max_rate);
+ break;
+ default:
+ break;
+ }
if ( ((GNUNET_YES == top->test_core) && (NULL != dest->cth)) ||
((GNUNET_NO == top->test_core) && (NULL != dest->tth)) )
Modified: gnunet/src/ats-tests/ats-testing.h
===================================================================
--- gnunet/src/ats-tests/ats-testing.h 2014-02-03 13:53:43 UTC (rev 32162)
+++ gnunet/src/ats-tests/ats-testing.h 2014-02-03 14:08:48 UTC (rev 32163)
@@ -439,7 +439,6 @@
{
START_SEND,
STOP_SEND,
- SET_RATE,
SET_PREFERENCE
};
Modified: gnunet/src/ats-tests/gnunet-ats-sim.c
===================================================================
--- gnunet/src/ats-tests/gnunet-ats-sim.c 2014-02-03 13:53:43 UTC (rev
32162)
+++ gnunet/src/ats-tests/gnunet-ats-sim.c 2014-02-03 14:08:48 UTC (rev
32163)
@@ -66,9 +66,9 @@
struct BenchmarkPeer *mp;
struct BenchmarkPartner *p;
- unsigned int kb_sent_sec;
+ unsigned int b_sent_sec;
double kb_sent_percent;
- unsigned int kb_recv_sec;
+ unsigned int b_recv_sec;
double kb_recv_percent;
unsigned int rtt;
@@ -88,16 +88,16 @@
{
p = &mp->partners[c_s];
- kb_sent_sec = 0;
- kb_recv_sec = 0;
+ b_sent_sec = 0;
+ b_recv_sec = 0;
kb_sent_percent = 0.0;
kb_recv_percent = 0.0;
rtt = 0;
if (duration > 0)
{
- kb_sent_sec = (p->bytes_sent / 1024) / duration;
- kb_recv_sec = (p->bytes_received / 1024) / duration;
+ b_sent_sec = p->bytes_sent / duration;
+ b_recv_sec = p->bytes_received / duration;
}
if (mp->total_bytes_sent > 0)
@@ -107,11 +107,11 @@
if (1000 * p->messages_sent > 0)
rtt = p->total_app_rtt / (1000 * p->messages_sent);
fprintf (stderr,
- "%c Master [%u] -> Slave [%u]: sent %u KiB/s (%.2f %%), received %u
KiB/s (%.2f %%)\n",
+ "%c Master [%u] -> Slave [%u]: sent %u Bips (%.2f %%), received %u
Bips (%.2f %%)\n",
(mp->pref_partner == p->dest) ? '*' : ' ',
mp->no, p->dest->no,
- kb_sent_sec, kb_sent_percent,
- kb_recv_sec, kb_recv_percent);
+ b_sent_sec, kb_sent_percent,
+ b_recv_sec, kb_recv_percent);
fprintf (stderr,
"%c Master [%u] -> Slave [%u]: Average application layer RTT: %u
ms\n",
(mp->pref_partner == p->dest) ? '*' : ' ',
@@ -213,7 +213,7 @@
masters_p = masters;
slaves_p = slaves;
- l = GNUNET_ATS_TEST_logging_start (GNUNET_TIME_UNIT_SECONDS,
+ l = GNUNET_ATS_TEST_logging_start
(GNUNET_TIME_relative_multiply(GNUNET_TIME_UNIT_MILLISECONDS, 100),
e->name,
masters_p,
e->num_masters);
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [GNUnet-SVN] r32163 - gnunet/src/ats-tests,
gnunet <=