/*
This file is part of GNUnet.
- (C) 2009, 2010 Christian Grothoff (and other contributing authors)
+ Copyright (C) 2009, 2010 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
static int ok;
-static GNUNET_SCHEDULER_TaskIdentifier die_task;
+static struct GNUNET_SCHEDULER_Task * die_task;
-static GNUNET_SCHEDULER_TaskIdentifier timer_task;
+static struct GNUNET_SCHEDULER_Task * timer_task;
static struct GNUNET_TRANSPORT_TESTING_handle *tth;
{
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Stopping peers\n");
- if (timer_task != GNUNET_SCHEDULER_NO_TASK)
+ if (timer_task != NULL)
{
GNUNET_SCHEDULER_cancel (timer_task);
- timer_task = GNUNET_SCHEDULER_NO_TASK;
+ timer_task = NULL;
}
- if (die_task != GNUNET_SCHEDULER_NO_TASK)
+ if (die_task != NULL)
{
GNUNET_SCHEDULER_cancel (die_task);
- die_task = GNUNET_SCHEDULER_NO_TASK;
+ die_task = NULL;
}
if (th != NULL)
{
ok = disconnects;
GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
- "Fail! Had %u disconnects while waiting %llu seconds \n",
- disconnects, WAIT.rel_value);
+ "Fail! Had %u disconnects while waiting %s\n",
+ disconnects,
+ GNUNET_STRINGS_relative_time_to_string (WAIT,
+ GNUNET_YES));
}
GNUNET_TRANSPORT_TESTING_done (tth);
static void
end_badly (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
{
- die_task = GNUNET_SCHEDULER_NO_TASK;
+ die_task = NULL;
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Fail! Stopping peers\n");
- if (timer_task != GNUNET_SCHEDULER_NO_TASK)
+ if (timer_task != NULL)
{
GNUNET_SCHEDULER_cancel (timer_task);
- timer_task = GNUNET_SCHEDULER_NO_TASK;
+ timer_task = NULL;
}
if (cc != NULL)
GNUNET_TRANSPORT_TESTING_connect_peers_cancel (tth, cc);
{
static int percentage;
- timer_task = GNUNET_SCHEDULER_NO_TASK;
+ timer_task = NULL;
if ((tc->reason & GNUNET_SCHEDULER_REASON_SHUTDOWN) != 0)
return;
GNUNET_TIME_relative_add (time_running,
GNUNET_TIME_relative_divide (WAIT, 10));
- if (time_running.rel_value ==
- GNUNET_TIME_relative_max (time_running, WAIT).rel_value)
+ if (time_running.rel_value_us ==
+ GNUNET_TIME_relative_max (time_running, WAIT).rel_value_us)
{
FPRINTF (stderr, "%s", "100%%\n");
shutdown_flag = GNUNET_YES;
cc = NULL;
char *p1_c = GNUNET_strdup (GNUNET_i2s (&p1->id));
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Peers connected: %s <-> %s\n", p1_c,
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "Peers connected: %s <-> %s\n", p1_c,
GNUNET_i2s (&p2->id));
GNUNET_free (p1_c);
shutdown_flag = GNUNET_NO;
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Waiting for %llu seconds\n", (WAIT.rel_value) / 1000);
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "Waiting for %s\n",
+ GNUNET_STRINGS_relative_time_to_string (WAIT,
+ GNUNET_YES));
- if (die_task != GNUNET_SCHEDULER_NO_TASK)
+ if (die_task != NULL)
GNUNET_SCHEDULER_cancel (die_task);
die_task = GNUNET_SCHEDULER_add_delayed (WAIT, &end_badly, NULL);
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
};
- timer_task = GNUNET_SCHEDULER_NO_TASK;
+ timer_task = NULL;
ok = 1;
GNUNET_PROGRAM_run ((sizeof (argv) / sizeof (char *)) - 1, argv,