projects
/
oweals
/
gnunet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
-adding ecc dlog support
[oweals/gnunet.git]
/
src
/
util
/
speedup.c
diff --git
a/src/util/speedup.c
b/src/util/speedup.c
index 2482decea4c51bcfae4de51c4eec85c233f48910..e7a06a1022e9d01428d8ee9724ccf6ce4bb7afda 100644
(file)
--- a/
src/util/speedup.c
+++ b/
src/util/speedup.c
@@
-1,6
+1,6
@@
/*
This file is part of GNUnet.
/*
This file is part of GNUnet.
- (C) 2011-2013 Christian Grothoff (and other contributing authors)
+
Copyright
(C) 2011-2013 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
GNUnet is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published
@@
-14,8
+14,8
@@
You should have received a copy of the GNU General Public License
along with GNUnet; see the file COPYING. If not, write to the
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., 5
9 Temple Place - Suite 330
,
- Boston, MA 0211
1-1307
, USA.
+ Free Software Foundation, Inc., 5
1 Franklin Street, Fifth Floor
,
+ Boston, MA 0211
0-1301
, USA.
*/
/**
*/
/**
@@
-25,6
+25,7
@@
*/
#include "platform.h"
#include "gnunet_util_lib.h"
*/
#include "platform.h"
#include "gnunet_util_lib.h"
+#include "speedup.h"
#define LOG(kind,...) GNUNET_log_from (kind, "util", __VA_ARGS__)
#define LOG(kind,...) GNUNET_log_from (kind, "util", __VA_ARGS__)
@@
-33,21
+34,22
@@
static struct GNUNET_TIME_Relative interval;
static struct GNUNET_TIME_Relative delta;
static struct GNUNET_TIME_Relative delta;
-static
GNUNET_SCHEDULER_TaskIdentifier
speedup_task;
+static
struct GNUNET_SCHEDULER_Task *
speedup_task;
static void
static void
-do_speedup (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
+do_speedup (void *cls,
+ const struct GNUNET_SCHEDULER_TaskContext *tc)
{
static long long current_offset;
{
static long long current_offset;
-
- speedup_task =
GNUNET_SCHEDULER_NO_TASK
;
+
+ speedup_task =
NULL
;
if (0 != (GNUNET_SCHEDULER_REASON_SHUTDOWN & tc->reason))
return;
current_offset += delta.rel_value_us;
GNUNET_TIME_set_offset (current_offset);
if (0 != (GNUNET_SCHEDULER_REASON_SHUTDOWN & tc->reason))
return;
current_offset += delta.rel_value_us;
GNUNET_TIME_set_offset (current_offset);
- LOG (GNUNET_ERROR_TYPE_DEBUG,
- "Speeding up execution time by %s\n",
+ LOG (GNUNET_ERROR_TYPE_DEBUG,
+ "Speeding up execution time by %s\n",
GNUNET_STRINGS_relative_time_to_string (delta, GNUNET_NO));
speedup_task = GNUNET_SCHEDULER_add_delayed (interval, &do_speedup, NULL);
}
GNUNET_STRINGS_relative_time_to_string (delta, GNUNET_NO));
speedup_task = GNUNET_SCHEDULER_add_delayed (interval, &do_speedup, NULL);
}
@@
-57,14
+59,18
@@
do_speedup (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
* Start task that may speed up our system clock artificially
*
* @param cfg configuration to use
* Start task that may speed up our system clock artificially
*
* @param cfg configuration to use
- * @return
GNUNET_OK on success,
GNUNET_SYSERR if the speedup was not configured
+ * @return
#GNUNET_OK on success, #
GNUNET_SYSERR if the speedup was not configured
*/
int
GNUNET_SPEEDUP_start_ (const struct GNUNET_CONFIGURATION_Handle *cfg)
{
*/
int
GNUNET_SPEEDUP_start_ (const struct GNUNET_CONFIGURATION_Handle *cfg)
{
- if (GNUNET_OK != GNUNET_CONFIGURATION_get_value_time (cfg, "testing", "SPEEDUP_INTERVAL", &interval))
+ if (GNUNET_OK !=
+ GNUNET_CONFIGURATION_get_value_time (cfg, "testing",
+ "SPEEDUP_INTERVAL", &interval))
return GNUNET_SYSERR;
return GNUNET_SYSERR;
- if (GNUNET_OK != GNUNET_CONFIGURATION_get_value_time (cfg, "testing", "SPEEDUP_DELTA", &delta))
+ if (GNUNET_OK !=
+ GNUNET_CONFIGURATION_get_value_time (cfg, "testing",
+ "SPEEDUP_DELTA", &delta))
return GNUNET_SYSERR;
if ((0 == interval.rel_value_us) || (0 == delta.rel_value_us))
return GNUNET_SYSERR;
if ((0 == interval.rel_value_us) || (0 == delta.rel_value_us))
@@
-79,7
+85,8
@@
GNUNET_SPEEDUP_start_ (const struct GNUNET_CONFIGURATION_Handle *cfg)
LOG (GNUNET_ERROR_TYPE_DEBUG,
"Speed up executed every %s\n",
GNUNET_STRINGS_relative_time_to_string (interval, GNUNET_NO));
LOG (GNUNET_ERROR_TYPE_DEBUG,
"Speed up executed every %s\n",
GNUNET_STRINGS_relative_time_to_string (interval, GNUNET_NO));
- speedup_task = GNUNET_SCHEDULER_add_now_with_lifeness (GNUNET_NO, &do_speedup, NULL);
+ speedup_task = GNUNET_SCHEDULER_add_now_with_lifeness (GNUNET_NO,
+ &do_speedup, NULL);
return GNUNET_OK;
}
return GNUNET_OK;
}
@@
-88,14
+95,14
@@
GNUNET_SPEEDUP_start_ (const struct GNUNET_CONFIGURATION_Handle *cfg)
* Stop tasks that modify clock behavior.
*/
void
* Stop tasks that modify clock behavior.
*/
void
-GNUNET_SPEEDUP_stop_ (
)
+GNUNET_SPEEDUP_stop_ ()
{
{
- if (
GNUNET_SCHEDULER_NO_TASK
!= speedup_task)
+ if (
NULL
!= speedup_task)
{
GNUNET_SCHEDULER_cancel (speedup_task);
{
GNUNET_SCHEDULER_cancel (speedup_task);
- speedup_task =
GNUNET_SCHEDULER_NO_TASK
;
+ speedup_task =
NULL
;
}
}
- if ( (0 != interval.rel_value_us) &&
+ if ( (0 != interval.rel_value_us) &&
(0 != delta.rel_value_us) )
LOG (GNUNET_ERROR_TYPE_DEBUG,
"Stopped execution speed up\n");
(0 != delta.rel_value_us) )
LOG (GNUNET_ERROR_TYPE_DEBUG,
"Stopped execution speed up\n");