/**
* Shutdown task
*/
-static GNUNET_SCHEDULER_TaskIdentifier shutdown_task;
+static struct GNUNET_SCHEDULER_Task * shutdown_task;
/**
* Progress task
*/
-static GNUNET_SCHEDULER_TaskIdentifier progress_task;
+static struct GNUNET_SCHEDULER_Task * progress_task;
/**
* Test result
*/
static struct BenchmarkPeer *sps;
+static struct LoggingHandle *l;
+
static void
evaluate ()
{
{
if (GNUNET_YES == logging)
- GNUNET_ATS_TEST_logging_stop();
+ GNUNET_ATS_TEST_logging_clean_up(l);
- shutdown_task = GNUNET_SCHEDULER_NO_TASK;
- if (GNUNET_SCHEDULER_NO_TASK != progress_task)
+ shutdown_task = NULL;
+ if (NULL != progress_task)
{
fprintf (stderr, "0\n");
GNUNET_SCHEDULER_cancel (progress_task);
}
- progress_task = GNUNET_SCHEDULER_NO_TASK;
+ progress_task = NULL;
evaluate ();
GNUNET_log(GNUNET_ERROR_TYPE_INFO, _("Benchmarking done\n"));
print_progress ()
{
static int calls;
- progress_task = GNUNET_SCHEDULER_NO_TASK;
+ progress_task = NULL;
fprintf (stderr, "%llu..",
(long long unsigned) perf_duration.rel_value_us / (1000 * 1000) - calls);
{
struct BenchmarkPeer *me = cls;
- me->ats_task = GNUNET_SCHEDULER_NO_TASK;
+ me->ats_task = NULL;
GNUNET_log(GNUNET_ERROR_TYPE_DEBUG, " Master [%u] set preference for slave [%u] to %f\n",
me->no, me->pref_partner->no, me->pref_value);
GNUNET_log(GNUNET_ERROR_TYPE_INFO, _("Benchmarking start\n"));
- if (GNUNET_SCHEDULER_NO_TASK != shutdown_task)
+ if (NULL != shutdown_task)
GNUNET_SCHEDULER_cancel(shutdown_task);
shutdown_task = GNUNET_SCHEDULER_add_delayed(perf_duration, &do_shutdown,
NULL );
for (c_s = 0; c_s < num_slaves; c_s++)
{
GNUNET_ATS_TEST_generate_traffic_start (&mps[c_m], &mps[c_m].partners[c_s],
- UINT32_MAX, GNUNET_TIME_UNIT_FOREVER_REL);
+ GNUNET_ATS_TEST_TG_LINEAR, UINT32_MAX, UINT32_MAX,
+ GNUNET_TIME_UNIT_MINUTES, GNUNET_TIME_UNIT_FOREVER_REL);
}
if (pref_val != GNUNET_ATS_PREFERENCE_END)
mps[c_m].ats_task = GNUNET_SCHEDULER_add_now(&ats_pref_task, &mps[c_m]);
}
if (GNUNET_YES == logging)
- GNUNET_ATS_TEST_logging_start(log_frequency, testname, mps, num_masters);
+ l = GNUNET_ATS_TEST_logging_start (log_frequency, testname, mps,
+ num_masters, num_slaves, GNUNET_NO);
}
static void
static void
-ats_performance_info_cb (void *cls, const struct GNUNET_HELLO_Address *address,
+log_request_cb (void *cls, const struct GNUNET_HELLO_Address *address,
int address_active, struct GNUNET_BANDWIDTH_Value32NBO bandwidth_out,
struct GNUNET_BANDWIDTH_Value32NBO bandwidth_in,
const struct GNUNET_ATS_Information *ats, uint32_t ats_count)
struct BenchmarkPeer *me = cls;
struct BenchmarkPartner *p;
int c_a;
- int log;
char *peer_id;
p = find_partner (me, &address->peer);
}
peer_id = GNUNET_strdup (GNUNET_i2s (&me->id));
- log = GNUNET_NO;
if ((p->bandwidth_in != ntohl (bandwidth_in.value__)) ||
(p->bandwidth_out != ntohl (bandwidth_out.value__)))
- log = GNUNET_YES;
p->bandwidth_in = ntohl (bandwidth_in.value__);
p->bandwidth_out = ntohl (bandwidth_out.value__);
ntohl(ats[c_a].value));
}
GNUNET_free(peer_id);
-
+ if (NULL != l)
+ GNUNET_ATS_TEST_logging_now (l);
}
&do_benchmark,
NULL,
&test_recv_cb,
- &ats_performance_info_cb);
+ &log_request_cb);
return result;
}