diff options
author | Christian Grothoff <christian@grothoff.org> | 2015-10-29 14:27:37 +0000 |
---|---|---|
committer | Christian Grothoff <christian@grothoff.org> | 2015-10-29 14:27:37 +0000 |
commit | 9baa7c3f6e6b7f1a29e3004147b9c70dddd33c74 (patch) | |
tree | ca1237b138edb085fa91ca34cf8069b86fe6a64c /src | |
parent | 8459c76076092899a74aa7e4451ed24faf91684b (diff) | |
download | gnunet-9baa7c3f6e6b7f1a29e3004147b9c70dddd33c74.tar.gz gnunet-9baa7c3f6e6b7f1a29e3004147b9c70dddd33c74.zip |
replacing deprecated transport_try_connect call with ATS call
Diffstat (limited to 'src')
-rw-r--r-- | src/core/test_core_api.c | 41 | ||||
-rw-r--r-- | src/core/test_core_api_reliability.c | 29 | ||||
-rw-r--r-- | src/core/test_core_quota_compliance.c | 33 |
3 files changed, 14 insertions, 89 deletions
diff --git a/src/core/test_core_api.c b/src/core/test_core_api.c index b1c6c8212..9404aa0e6 100644 --- a/src/core/test_core_api.c +++ b/src/core/test_core_api.c | |||
@@ -50,8 +50,6 @@ static struct PeerContext p2; | |||
50 | 50 | ||
51 | static struct GNUNET_SCHEDULER_Task *err_task; | 51 | static struct GNUNET_SCHEDULER_Task *err_task; |
52 | 52 | ||
53 | static struct GNUNET_SCHEDULER_Task *con_task; | ||
54 | |||
55 | static int ok; | 53 | static int ok; |
56 | 54 | ||
57 | #define OKPP do { ok++; GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Now at stage %u at %s:%u\n", ok, __FILE__, __LINE__); } while (0) | 55 | #define OKPP do { ok++; GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Now at stage %u at %s:%u\n", ok, __FILE__, __LINE__); } while (0) |
@@ -107,11 +105,6 @@ terminate_task (void *cls, | |||
107 | GNUNET_assert (ok == 6); | 105 | GNUNET_assert (ok == 6); |
108 | terminate_peer (&p1); | 106 | terminate_peer (&p1); |
109 | terminate_peer (&p2); | 107 | terminate_peer (&p2); |
110 | if (NULL != con_task) | ||
111 | { | ||
112 | GNUNET_SCHEDULER_cancel (con_task); | ||
113 | con_task = NULL; | ||
114 | } | ||
115 | ok = 0; | 108 | ok = 0; |
116 | } | 109 | } |
117 | 110 | ||
@@ -126,11 +119,6 @@ terminate_task_error (void *cls, | |||
126 | GNUNET_break (0); | 119 | GNUNET_break (0); |
127 | terminate_peer (&p1); | 120 | terminate_peer (&p1); |
128 | terminate_peer (&p2); | 121 | terminate_peer (&p2); |
129 | if (NULL != con_task) | ||
130 | { | ||
131 | GNUNET_SCHEDULER_cancel (con_task); | ||
132 | con_task = NULL; | ||
133 | } | ||
134 | ok = 42; | 122 | ok = 42; |
135 | } | 123 | } |
136 | 124 | ||
@@ -164,11 +152,6 @@ connect_notify (void *cls, | |||
164 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, | 152 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, |
165 | "Encrypted connection established to peer `%4s'\n", | 153 | "Encrypted connection established to peer `%4s'\n", |
166 | GNUNET_i2s (peer)); | 154 | GNUNET_i2s (peer)); |
167 | if (NULL != con_task) | ||
168 | { | ||
169 | GNUNET_SCHEDULER_cancel (con_task); | ||
170 | con_task = NULL; | ||
171 | } | ||
172 | pc->connect_status = 1; | 155 | pc->connect_status = 1; |
173 | if (pc == &p1) | 156 | if (pc == &p1) |
174 | { | 157 | { |
@@ -249,26 +232,6 @@ static struct GNUNET_CORE_MessageHandler handlers[] = { | |||
249 | 232 | ||
250 | 233 | ||
251 | static void | 234 | static void |
252 | connect_task (void *cls, | ||
253 | const struct GNUNET_SCHEDULER_TaskContext *tc) | ||
254 | { | ||
255 | if (0 != (tc->reason & GNUNET_SCHEDULER_REASON_SHUTDOWN)) | ||
256 | { | ||
257 | con_task = NULL; | ||
258 | return; | ||
259 | } | ||
260 | con_task = | ||
261 | GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_UNIT_SECONDS, | ||
262 | &connect_task, | ||
263 | NULL); | ||
264 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, | ||
265 | "Asking transport (1) to connect to peer `%4s'\n", | ||
266 | GNUNET_i2s (&p2.id)); | ||
267 | GNUNET_TRANSPORT_try_connect (p1.th, &p2.id, NULL, NULL); /*FIXME TRY_CONNECT change */ | ||
268 | } | ||
269 | |||
270 | |||
271 | static void | ||
272 | init_notify (void *cls, | 235 | init_notify (void *cls, |
273 | const struct GNUNET_PeerIdentity *my_identity) | 236 | const struct GNUNET_PeerIdentity *my_identity) |
274 | { | 237 | { |
@@ -293,7 +256,9 @@ init_notify (void *cls, | |||
293 | GNUNET_assert (ok == 3); | 256 | GNUNET_assert (ok == 3); |
294 | OKPP; | 257 | OKPP; |
295 | GNUNET_assert (cls == &p2); | 258 | GNUNET_assert (cls == &p2); |
296 | con_task = GNUNET_SCHEDULER_add_now (&connect_task, NULL); | 259 | p1.ats_sh = GNUNET_ATS_connectivity_suggest (p1.ats, |
260 | &p2.id, | ||
261 | 1); | ||
297 | } | 262 | } |
298 | } | 263 | } |
299 | 264 | ||
diff --git a/src/core/test_core_api_reliability.c b/src/core/test_core_api_reliability.c index dfea0cdcc..ffbdd3a28 100644 --- a/src/core/test_core_api_reliability.c +++ b/src/core/test_core_api_reliability.c | |||
@@ -1,6 +1,6 @@ | |||
1 | /* | 1 | /* |
2 | This file is part of GNUnet. | 2 | This file is part of GNUnet. |
3 | Copyright (C) 2009, 2010 Christian Grothoff (and other contributing authors) | 3 | Copyright (C) 2009, 2010, 2015 Christian Grothoff (and other contributing authors) |
4 | 4 | ||
5 | GNUnet is free software; you can redistribute it and/or modify | 5 | GNUnet is free software; you can redistribute it and/or modify |
6 | it under the terms of the GNU General Public License as published | 6 | it under the terms of the GNU General Public License as published |
@@ -55,8 +55,6 @@ static struct GNUNET_TIME_Absolute start_time; | |||
55 | 55 | ||
56 | static struct GNUNET_SCHEDULER_Task *err_task; | 56 | static struct GNUNET_SCHEDULER_Task *err_task; |
57 | 57 | ||
58 | static struct GNUNET_SCHEDULER_Task *connect_task; | ||
59 | |||
60 | 58 | ||
61 | struct PeerContext | 59 | struct PeerContext |
62 | { | 60 | { |
@@ -137,11 +135,6 @@ terminate_task (void *cls, | |||
137 | 135 | ||
138 | terminate_peer (&p1); | 136 | terminate_peer (&p1); |
139 | terminate_peer (&p2); | 137 | terminate_peer (&p2); |
140 | if (NULL != connect_task) | ||
141 | { | ||
142 | GNUNET_SCHEDULER_cancel (connect_task); | ||
143 | connect_task = NULL; | ||
144 | } | ||
145 | delta = GNUNET_TIME_absolute_get_duration (start_time).rel_value_us; | 138 | delta = GNUNET_TIME_absolute_get_duration (start_time).rel_value_us; |
146 | FPRINTF (stderr, | 139 | FPRINTF (stderr, |
147 | "\nThroughput was %llu kb/s\n", | 140 | "\nThroughput was %llu kb/s\n", |
@@ -159,26 +152,10 @@ terminate_task_error (void *cls, | |||
159 | GNUNET_break (0); | 152 | GNUNET_break (0); |
160 | terminate_peer (&p1); | 153 | terminate_peer (&p1); |
161 | terminate_peer (&p2); | 154 | terminate_peer (&p2); |
162 | if (NULL != connect_task) | ||
163 | { | ||
164 | GNUNET_SCHEDULER_cancel (connect_task); | ||
165 | connect_task = NULL; | ||
166 | } | ||
167 | ok = 42; | 155 | ok = 42; |
168 | } | 156 | } |
169 | 157 | ||
170 | 158 | ||
171 | static void | ||
172 | try_connect (void *cls, | ||
173 | const struct GNUNET_SCHEDULER_TaskContext *tc) | ||
174 | { | ||
175 | connect_task = | ||
176 | GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_UNIT_SECONDS, &try_connect, | ||
177 | NULL); | ||
178 | GNUNET_TRANSPORT_try_connect (p1.th, &p2.id, NULL, NULL); /*FIXME TRY_CONNECT change */ | ||
179 | } | ||
180 | |||
181 | |||
182 | static size_t | 159 | static size_t |
183 | transmit_ready (void *cls, size_t size, void *buf) | 160 | transmit_ready (void *cls, size_t size, void *buf) |
184 | { | 161 | { |
@@ -396,7 +373,9 @@ init_notify (void *cls, | |||
396 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, | 373 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, |
397 | "Asking transport (1) to connect to peer `%s'\n", | 374 | "Asking transport (1) to connect to peer `%s'\n", |
398 | GNUNET_i2s (&p2.id)); | 375 | GNUNET_i2s (&p2.id)); |
399 | connect_task = GNUNET_SCHEDULER_add_now (&try_connect, NULL); | 376 | p1.ats_sh = GNUNET_ATS_connectivity_suggest (p1.ats, |
377 | &p2.id, | ||
378 | 1); | ||
400 | } | 379 | } |
401 | } | 380 | } |
402 | 381 | ||
diff --git a/src/core/test_core_quota_compliance.c b/src/core/test_core_quota_compliance.c index ce62dbe3b..32edb50c7 100644 --- a/src/core/test_core_quota_compliance.c +++ b/src/core/test_core_quota_compliance.c | |||
@@ -64,8 +64,6 @@ static struct GNUNET_SCHEDULER_Task *err_task; | |||
64 | 64 | ||
65 | static struct GNUNET_SCHEDULER_Task *measure_task; | 65 | static struct GNUNET_SCHEDULER_Task *measure_task; |
66 | 66 | ||
67 | static struct GNUNET_SCHEDULER_Task *connect_task; | ||
68 | |||
69 | 67 | ||
70 | struct PeerContext | 68 | struct PeerContext |
71 | { | 69 | { |
@@ -160,11 +158,6 @@ terminate_task (void *cls, | |||
160 | err_task = NULL; | 158 | err_task = NULL; |
161 | terminate_peer (&p1); | 159 | terminate_peer (&p1); |
162 | terminate_peer (&p2); | 160 | terminate_peer (&p2); |
163 | if (NULL != connect_task) | ||
164 | { | ||
165 | GNUNET_SCHEDULER_cancel (connect_task); | ||
166 | connect_task = NULL; | ||
167 | } | ||
168 | } | 161 | } |
169 | 162 | ||
170 | 163 | ||
@@ -185,27 +178,10 @@ terminate_task_error (void *cls, | |||
185 | GNUNET_SCHEDULER_cancel (measure_task); | 178 | GNUNET_SCHEDULER_cancel (measure_task); |
186 | measure_task = NULL; | 179 | measure_task = NULL; |
187 | } | 180 | } |
188 | if (NULL != connect_task) | ||
189 | { | ||
190 | GNUNET_SCHEDULER_cancel (connect_task); | ||
191 | connect_task = NULL; | ||
192 | } | ||
193 | ok = 42; | 181 | ok = 42; |
194 | } | 182 | } |
195 | 183 | ||
196 | 184 | ||
197 | static void | ||
198 | try_connect (void *cls, | ||
199 | const struct GNUNET_SCHEDULER_TaskContext *tc) | ||
200 | { | ||
201 | connect_task = | ||
202 | GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_UNIT_SECONDS, &try_connect, | ||
203 | NULL); | ||
204 | GNUNET_TRANSPORT_try_connect (p1.th, &p2.id, NULL, NULL); /*FIXME TRY_CONNECT change */ | ||
205 | GNUNET_TRANSPORT_try_connect (p2.th, &p1.id, NULL, NULL); /*FIXME TRY_CONNECT change */ | ||
206 | } | ||
207 | |||
208 | |||
209 | /** | 185 | /** |
210 | * Callback function to process statistic values. | 186 | * Callback function to process statistic values. |
211 | * | 187 | * |
@@ -553,9 +529,14 @@ init_notify (void *cls, | |||
553 | OKPP; | 529 | OKPP; |
554 | GNUNET_assert (cls == &p2); | 530 | GNUNET_assert (cls == &p2); |
555 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, | 531 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, |
556 | "Asking core (1) to connect to peer `%4s'\n", | 532 | "Asking core (1) to connect to peer `%s' and vice-versa\n", |
557 | GNUNET_i2s (&p2.id)); | 533 | GNUNET_i2s (&p2.id)); |
558 | connect_task = GNUNET_SCHEDULER_add_now (&try_connect, NULL); | 534 | p1.ats_sh = GNUNET_ATS_connectivity_suggest (p1.ats, |
535 | &p2.id, | ||
536 | 1); | ||
537 | p2.ats_sh = GNUNET_ATS_connectivity_suggest (p2.ats, | ||
538 | &p1.id, | ||
539 | 1); | ||
559 | } | 540 | } |
560 | } | 541 | } |
561 | 542 | ||