diff options
author | Christian Grothoff <christian@grothoff.org> | 2012-05-31 18:51:04 +0000 |
---|---|---|
committer | Christian Grothoff <christian@grothoff.org> | 2012-05-31 18:51:04 +0000 |
commit | cc983a47bc9a0d6a32f37b494b65bbb79c16c0c6 (patch) | |
tree | e50e41f3d2fc33e9ecfbaa639fd7ec98491d8949 /src/util/speedup.c | |
parent | 7de9f07b0fc3729679ad2678ce1a04aed88e0f7f (diff) | |
download | gnunet-cc983a47bc9a0d6a32f37b494b65bbb79c16c0c6.tar.gz gnunet-cc983a47bc9a0d6a32f37b494b65bbb79c16c0c6.zip |
-fixing speedup test
Diffstat (limited to 'src/util/speedup.c')
-rw-r--r-- | src/util/speedup.c | 28 |
1 files changed, 13 insertions, 15 deletions
diff --git a/src/util/speedup.c b/src/util/speedup.c index 6a17f3132..0a005c035 100644 --- a/src/util/speedup.c +++ b/src/util/speedup.c | |||
@@ -29,25 +29,26 @@ | |||
29 | 29 | ||
30 | #define LOG(kind,...) GNUNET_log_from (kind, "util", __VA_ARGS__) | 30 | #define LOG(kind,...) GNUNET_log_from (kind, "util", __VA_ARGS__) |
31 | 31 | ||
32 | static long long current_offset; | 32 | |
33 | static struct GNUNET_TIME_Relative interval; | 33 | static struct GNUNET_TIME_Relative interval; |
34 | |||
34 | static struct GNUNET_TIME_Relative delta; | 35 | static struct GNUNET_TIME_Relative delta; |
35 | 36 | ||
36 | static GNUNET_SCHEDULER_TaskIdentifier speedup_task; | 37 | static GNUNET_SCHEDULER_TaskIdentifier speedup_task; |
37 | 38 | ||
39 | |||
38 | static void | 40 | static void |
39 | do_speedup (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) | 41 | do_speedup (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) |
40 | { | 42 | { |
43 | static long long current_offset; | ||
44 | |||
41 | speedup_task = GNUNET_SCHEDULER_NO_TASK; | 45 | speedup_task = GNUNET_SCHEDULER_NO_TASK; |
42 | |||
43 | if (0 != (GNUNET_SCHEDULER_REASON_SHUTDOWN & tc->reason)) | 46 | if (0 != (GNUNET_SCHEDULER_REASON_SHUTDOWN & tc->reason)) |
44 | return; | 47 | return; |
45 | |||
46 | current_offset += delta.rel_value; | 48 | current_offset += delta.rel_value; |
47 | GNUNET_TIME_set_offset (current_offset); | 49 | GNUNET_TIME_set_offset (current_offset); |
48 | 50 | LOG (GNUNET_ERROR_TYPE_DEBUG, | |
49 | LOG (GNUNET_ERROR_TYPE_DEBUG, "Speed up execution time by %llu ms\n", delta.rel_value); | 51 | "Speeding up execution time by %llu ms\n", delta.rel_value); |
50 | |||
51 | speedup_task = GNUNET_SCHEDULER_add_delayed (interval, &do_speedup, NULL); | 52 | speedup_task = GNUNET_SCHEDULER_add_delayed (interval, &do_speedup, NULL); |
52 | } | 53 | } |
53 | 54 | ||
@@ -60,21 +61,20 @@ GNUNET_SPEEDUP_start_ (const struct GNUNET_CONFIGURATION_Handle *cfg) | |||
60 | if (GNUNET_OK != GNUNET_CONFIGURATION_get_value_time (cfg, "testing", "SPEEDUP_DELTA", &delta)) | 61 | if (GNUNET_OK != GNUNET_CONFIGURATION_get_value_time (cfg, "testing", "SPEEDUP_DELTA", &delta)) |
61 | return GNUNET_SYSERR; | 62 | return GNUNET_SYSERR; |
62 | 63 | ||
63 | if ((interval.rel_value == 0) || (delta.rel_value == 0)) | 64 | if ((0 == interval.rel_value) || (0 == delta.rel_value)) |
64 | { | 65 | { |
65 | LOG (GNUNET_ERROR_TYPE_DEBUG, | 66 | LOG (GNUNET_ERROR_TYPE_DEBUG, |
66 | "Speed up disabled\n"); | 67 | "Speed up disabled\n"); |
67 | return GNUNET_OK; | 68 | return GNUNET_OK; |
68 | } | 69 | } |
69 | |||
70 | LOG (GNUNET_ERROR_TYPE_DEBUG, | 70 | LOG (GNUNET_ERROR_TYPE_DEBUG, |
71 | "Speed up execution time %llu ms every %llu ms\n", | 71 | "Speed up execution time %llu ms every %llu ms\n", |
72 | delta.rel_value, interval.rel_value); | 72 | delta.rel_value, interval.rel_value); |
73 | |||
74 | speedup_task = GNUNET_SCHEDULER_add_now_with_lifeness (GNUNET_NO, &do_speedup, NULL); | 73 | speedup_task = GNUNET_SCHEDULER_add_now_with_lifeness (GNUNET_NO, &do_speedup, NULL); |
75 | return GNUNET_OK; | 74 | return GNUNET_OK; |
76 | } | 75 | } |
77 | 76 | ||
77 | |||
78 | void | 78 | void |
79 | GNUNET_SPEEDUP_stop_ ( ) | 79 | GNUNET_SPEEDUP_stop_ ( ) |
80 | { | 80 | { |
@@ -82,11 +82,9 @@ GNUNET_SPEEDUP_stop_ ( ) | |||
82 | { | 82 | { |
83 | GNUNET_SCHEDULER_cancel (speedup_task); | 83 | GNUNET_SCHEDULER_cancel (speedup_task); |
84 | speedup_task = GNUNET_SCHEDULER_NO_TASK; | 84 | speedup_task = GNUNET_SCHEDULER_NO_TASK; |
85 | |||
86 | } | 85 | } |
87 | |||
88 | LOG (GNUNET_ERROR_TYPE_DEBUG, | 86 | LOG (GNUNET_ERROR_TYPE_DEBUG, |
89 | "Stopped execution speed up\n"); | 87 | "Stopped execution speed up\n"); |
90 | } | 88 | } |
91 | 89 | ||
92 | 90 | ||