diff options
author | Christian Grothoff <christian@grothoff.org> | 2011-10-11 09:43:04 +0000 |
---|---|---|
committer | Christian Grothoff <christian@grothoff.org> | 2011-10-11 09:43:04 +0000 |
commit | d9d94d0e53d26af75ec8241383d166544ebd79f3 (patch) | |
tree | 9080b73624389403a198257fe0547bb4634e64d2 /src/util/test_time.c | |
parent | 2d792ee2e9cc0c993b8907e2c8edb0c2b8465343 (diff) | |
download | gnunet-d9d94d0e53d26af75ec8241383d166544ebd79f3.tar.gz gnunet-d9d94d0e53d26af75ec8241383d166544ebd79f3.zip |
converting to GNUNET_LOG_from*
Diffstat (limited to 'src/util/test_time.c')
-rw-r--r-- | src/util/test_time.c | 52 |
1 files changed, 27 insertions, 25 deletions
diff --git a/src/util/test_time.c b/src/util/test_time.c index c5232ff2a..80109615a 100644 --- a/src/util/test_time.c +++ b/src/util/test_time.c | |||
@@ -63,7 +63,7 @@ check () | |||
63 | /*check zero */ | 63 | /*check zero */ |
64 | rel.rel_value = (UINT64_MAX) - 1024; | 64 | rel.rel_value = (UINT64_MAX) - 1024; |
65 | GNUNET_assert (GNUNET_TIME_relative_get_zero ().rel_value == | 65 | GNUNET_assert (GNUNET_TIME_relative_get_zero ().rel_value == |
66 | GNUNET_TIME_relative_multiply (rel, 0).rel_value); | 66 | GNUNET_TIME_relative_multiply (rel, 0).rel_value); |
67 | 67 | ||
68 | /* test infinity-check for relative to absolute */ | 68 | /* test infinity-check for relative to absolute */ |
69 | GNUNET_log_skip (1, GNUNET_NO); | 69 | GNUNET_log_skip (1, GNUNET_NO); |
@@ -74,11 +74,11 @@ check () | |||
74 | /*check relative to absolute */ | 74 | /*check relative to absolute */ |
75 | rel.rel_value = 0; | 75 | rel.rel_value = 0; |
76 | GNUNET_assert (GNUNET_TIME_absolute_get ().abs_value == | 76 | GNUNET_assert (GNUNET_TIME_absolute_get ().abs_value == |
77 | GNUNET_TIME_relative_to_absolute (rel).abs_value); | 77 | GNUNET_TIME_relative_to_absolute (rel).abs_value); |
78 | /*check forever */ | 78 | /*check forever */ |
79 | rel.rel_value = UINT64_MAX; | 79 | rel.rel_value = UINT64_MAX; |
80 | GNUNET_assert (GNUNET_TIME_absolute_get_forever ().abs_value == | 80 | GNUNET_assert (GNUNET_TIME_absolute_get_forever ().abs_value == |
81 | GNUNET_TIME_relative_to_absolute (rel).abs_value); | 81 | GNUNET_TIME_relative_to_absolute (rel).abs_value); |
82 | /* check overflow for r2a */ | 82 | /* check overflow for r2a */ |
83 | rel.rel_value = (UINT64_MAX) - 1024; | 83 | rel.rel_value = (UINT64_MAX) - 1024; |
84 | GNUNET_log_skip (1, GNUNET_NO); | 84 | GNUNET_log_skip (1, GNUNET_NO); |
@@ -103,13 +103,13 @@ check () | |||
103 | 103 | ||
104 | /* check relation check in get_duration */ | 104 | /* check relation check in get_duration */ |
105 | future.abs_value = now.abs_value + 1000000; | 105 | future.abs_value = now.abs_value + 1000000; |
106 | GNUNET_assert (GNUNET_TIME_absolute_get_difference (now, future).rel_value == | 106 | GNUNET_assert (GNUNET_TIME_absolute_get_difference (now, future).rel_value |
107 | 1000000); | 107 | == 1000000); |
108 | GNUNET_assert (GNUNET_TIME_absolute_get_difference (future, now).rel_value == | 108 | GNUNET_assert (GNUNET_TIME_absolute_get_difference (future, now).rel_value |
109 | 0); | 109 | == 0); |
110 | 110 | ||
111 | GNUNET_assert (GNUNET_TIME_absolute_get_difference (zero, forever).rel_value | 111 | GNUNET_assert (GNUNET_TIME_absolute_get_difference (zero, forever).rel_value |
112 | == forever.abs_value); | 112 | == forever.abs_value); |
113 | 113 | ||
114 | past.abs_value = now.abs_value - 1000000; | 114 | past.abs_value = now.abs_value - 1000000; |
115 | rel = GNUNET_TIME_absolute_get_duration (future); | 115 | rel = GNUNET_TIME_absolute_get_duration (future); |
@@ -127,7 +127,7 @@ check () | |||
127 | GNUNET_assert (rel.rel_value <= 1000000); | 127 | GNUNET_assert (rel.rel_value <= 1000000); |
128 | forever = GNUNET_TIME_absolute_get_forever (); | 128 | forever = GNUNET_TIME_absolute_get_forever (); |
129 | GNUNET_assert (GNUNET_TIME_relative_get_forever ().rel_value == | 129 | GNUNET_assert (GNUNET_TIME_relative_get_forever ().rel_value == |
130 | GNUNET_TIME_absolute_get_remaining (forever).rel_value); | 130 | GNUNET_TIME_absolute_get_remaining (forever).rel_value); |
131 | 131 | ||
132 | /* check endianess */ | 132 | /* check endianess */ |
133 | reln = GNUNET_TIME_relative_hton (rel); | 133 | reln = GNUNET_TIME_relative_hton (rel); |
@@ -152,23 +152,24 @@ check () | |||
152 | GNUNET_assert (future.abs_value == now.abs_value); | 152 | GNUNET_assert (future.abs_value == now.abs_value); |
153 | 153 | ||
154 | GNUNET_assert (forever.abs_value == | 154 | GNUNET_assert (forever.abs_value == |
155 | GNUNET_TIME_absolute_subtract (forever, | 155 | GNUNET_TIME_absolute_subtract (forever, |
156 | GNUNET_TIME_UNIT_MINUTES).abs_value); | 156 | GNUNET_TIME_UNIT_MINUTES).abs_value); |
157 | /*check absolute subtract */ | 157 | /*check absolute subtract */ |
158 | now.abs_value = 50000; | 158 | now.abs_value = 50000; |
159 | rel.rel_value = 100000; | 159 | rel.rel_value = 100000; |
160 | GNUNET_assert (GNUNET_TIME_UNIT_ZERO_ABS.abs_value == | 160 | GNUNET_assert (GNUNET_TIME_UNIT_ZERO_ABS.abs_value == |
161 | (GNUNET_TIME_absolute_subtract (now, rel)).abs_value); | 161 | (GNUNET_TIME_absolute_subtract (now, rel)).abs_value); |
162 | rel.rel_value = 10000; | 162 | rel.rel_value = 10000; |
163 | GNUNET_assert (40000 == (GNUNET_TIME_absolute_subtract (now, rel)).abs_value); | 163 | GNUNET_assert (40000 == |
164 | (GNUNET_TIME_absolute_subtract (now, rel)).abs_value); | ||
164 | 165 | ||
165 | /*check relative divide */ | 166 | /*check relative divide */ |
166 | GNUNET_assert (GNUNET_TIME_UNIT_FOREVER_REL.rel_value == | 167 | GNUNET_assert (GNUNET_TIME_UNIT_FOREVER_REL.rel_value == |
167 | (GNUNET_TIME_relative_divide (rel, 0)).rel_value); | 168 | (GNUNET_TIME_relative_divide (rel, 0)).rel_value); |
168 | 169 | ||
169 | rel = GNUNET_TIME_UNIT_FOREVER_REL; | 170 | rel = GNUNET_TIME_UNIT_FOREVER_REL; |
170 | GNUNET_assert (GNUNET_TIME_UNIT_FOREVER_REL.rel_value == | 171 | GNUNET_assert (GNUNET_TIME_UNIT_FOREVER_REL.rel_value == |
171 | (GNUNET_TIME_relative_divide (rel, 2)).rel_value); | 172 | (GNUNET_TIME_relative_divide (rel, 2)).rel_value); |
172 | 173 | ||
173 | rel = GNUNET_TIME_relative_divide (relUnit, 2); | 174 | rel = GNUNET_TIME_relative_divide (relUnit, 2); |
174 | GNUNET_assert (rel.rel_value == relUnit.rel_value / 2); | 175 | GNUNET_assert (rel.rel_value == relUnit.rel_value / 2); |
@@ -182,50 +183,51 @@ check () | |||
182 | forever = GNUNET_TIME_absolute_get_forever (); | 183 | forever = GNUNET_TIME_absolute_get_forever (); |
183 | forever.abs_value = forever.abs_value - 1024; | 184 | forever.abs_value = forever.abs_value - 1024; |
184 | GNUNET_assert (GNUNET_TIME_absolute_get_zero ().abs_value == | 185 | GNUNET_assert (GNUNET_TIME_absolute_get_zero ().abs_value == |
185 | GNUNET_TIME_calculate_eta (forever, 50000, 100000).rel_value); | 186 | GNUNET_TIME_calculate_eta (forever, 50000, |
187 | 100000).rel_value); | ||
186 | /* check zero */ | 188 | /* check zero */ |
187 | GNUNET_log_skip (1, GNUNET_NO); | 189 | GNUNET_log_skip (1, GNUNET_NO); |
188 | GNUNET_assert (GNUNET_TIME_UNIT_ZERO.rel_value == | 190 | GNUNET_assert (GNUNET_TIME_UNIT_ZERO.rel_value == |
189 | (GNUNET_TIME_calculate_eta (last, 60000, 50000)).rel_value); | 191 | (GNUNET_TIME_calculate_eta (last, 60000, 50000)).rel_value); |
190 | GNUNET_log_skip (0, GNUNET_YES); | 192 | GNUNET_log_skip (0, GNUNET_YES); |
191 | /*check forever */ | 193 | /*check forever */ |
192 | GNUNET_assert (GNUNET_TIME_UNIT_FOREVER_REL.rel_value == | 194 | GNUNET_assert (GNUNET_TIME_UNIT_FOREVER_REL.rel_value == |
193 | (GNUNET_TIME_calculate_eta (last, 0, 50000)).rel_value); | 195 | (GNUNET_TIME_calculate_eta (last, 0, 50000)).rel_value); |
194 | 196 | ||
195 | /*check relative subtract */ | 197 | /*check relative subtract */ |
196 | now = GNUNET_TIME_absolute_get (); | 198 | now = GNUNET_TIME_absolute_get (); |
197 | rel.rel_value = now.abs_value; | 199 | rel.rel_value = now.abs_value; |
198 | relForever.rel_value = rel.rel_value + 1024; | 200 | relForever.rel_value = rel.rel_value + 1024; |
199 | GNUNET_assert (1024 == | 201 | GNUNET_assert (1024 == |
200 | GNUNET_TIME_relative_subtract (relForever, rel).rel_value); | 202 | GNUNET_TIME_relative_subtract (relForever, rel).rel_value); |
201 | /*check zero */ | 203 | /*check zero */ |
202 | GNUNET_assert (GNUNET_TIME_relative_get_zero ().rel_value == | 204 | GNUNET_assert (GNUNET_TIME_relative_get_zero ().rel_value == |
203 | GNUNET_TIME_relative_subtract (rel, relForever).rel_value); | 205 | GNUNET_TIME_relative_subtract (rel, relForever).rel_value); |
204 | /*check forever */ | 206 | /*check forever */ |
205 | rel.rel_value = UINT64_MAX; | 207 | rel.rel_value = UINT64_MAX; |
206 | GNUNET_assert (GNUNET_TIME_relative_get_forever ().rel_value == | 208 | GNUNET_assert (GNUNET_TIME_relative_get_forever ().rel_value == |
207 | GNUNET_TIME_relative_subtract (rel, relForever).rel_value); | 209 | GNUNET_TIME_relative_subtract (rel, relForever).rel_value); |
208 | 210 | ||
209 | /*check GNUNET_TIME_relative_min */ | 211 | /*check GNUNET_TIME_relative_min */ |
210 | now = GNUNET_TIME_absolute_get (); | 212 | now = GNUNET_TIME_absolute_get (); |
211 | rel.rel_value = now.abs_value; | 213 | rel.rel_value = now.abs_value; |
212 | relForever.rel_value = rel.rel_value - 1024; | 214 | relForever.rel_value = rel.rel_value - 1024; |
213 | GNUNET_assert (relForever.rel_value == | 215 | GNUNET_assert (relForever.rel_value == |
214 | GNUNET_TIME_relative_min (rel, relForever).rel_value); | 216 | GNUNET_TIME_relative_min (rel, relForever).rel_value); |
215 | 217 | ||
216 | /*check GNUNET_TIME_relative_max */ | 218 | /*check GNUNET_TIME_relative_max */ |
217 | GNUNET_assert (rel.rel_value == | 219 | GNUNET_assert (rel.rel_value == |
218 | GNUNET_TIME_relative_max (rel, relForever).rel_value); | 220 | GNUNET_TIME_relative_max (rel, relForever).rel_value); |
219 | 221 | ||
220 | /*check GNUNET_TIME_absolute_min */ | 222 | /*check GNUNET_TIME_absolute_min */ |
221 | now = GNUNET_TIME_absolute_get (); | 223 | now = GNUNET_TIME_absolute_get (); |
222 | last.abs_value = now.abs_value - 1024; | 224 | last.abs_value = now.abs_value - 1024; |
223 | GNUNET_assert (last.abs_value == | 225 | GNUNET_assert (last.abs_value == |
224 | GNUNET_TIME_absolute_min (now, last).abs_value); | 226 | GNUNET_TIME_absolute_min (now, last).abs_value); |
225 | 227 | ||
226 | /*check GNUNET_TIME_absolute_max */ | 228 | /*check GNUNET_TIME_absolute_max */ |
227 | GNUNET_assert (now.abs_value == | 229 | GNUNET_assert (now.abs_value == |
228 | GNUNET_TIME_absolute_max (now, last).abs_value); | 230 | GNUNET_TIME_absolute_max (now, last).abs_value); |
229 | 231 | ||
230 | return 0; | 232 | return 0; |
231 | } | 233 | } |