diff options
Diffstat (limited to 'src/ats-tests')
-rw-r--r-- | src/ats-tests/ats-testing.c | 18 | ||||
-rw-r--r-- | src/ats-tests/ats-testing.h | 15 |
2 files changed, 6 insertions, 27 deletions
diff --git a/src/ats-tests/ats-testing.c b/src/ats-tests/ats-testing.c index 3d2fc2c98..1bcef5806 100644 --- a/src/ats-tests/ats-testing.c +++ b/src/ats-tests/ats-testing.c | |||
@@ -1,6 +1,6 @@ | |||
1 | /* | 1 | /* |
2 | This file is part of GNUnet. | 2 | This file is part of GNUnet. |
3 | Copyright (C) 2010-2013, 2016 GNUnet e.V. | 3 | Copyright (C) 2010-2013, 2016, 2017 GNUnet e.V. |
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 |
@@ -88,10 +88,6 @@ do_shutdown (void *cls) | |||
88 | 88 | ||
89 | for (c_op = 0; c_op < p->num_partners; c_op++) | 89 | for (c_op = 0; c_op < p->num_partners; c_op++) |
90 | { | 90 | { |
91 | if (NULL != p->partners[c_op].cth) | ||
92 | { | ||
93 | p->partners[c_op].cth = NULL; | ||
94 | } | ||
95 | if ( (NULL != p->core_connect_ops) && | 91 | if ( (NULL != p->core_connect_ops) && |
96 | (NULL != p->core_connect_ops[c_op].connect_op) ) | 92 | (NULL != p->core_connect_ops[c_op].connect_op) ) |
97 | { | 93 | { |
@@ -127,14 +123,6 @@ do_shutdown (void *cls) | |||
127 | GNUNET_TESTBED_operation_done (p->peer_id_op); | 123 | GNUNET_TESTBED_operation_done (p->peer_id_op); |
128 | p->peer_id_op = NULL; | 124 | p->peer_id_op = NULL; |
129 | } | 125 | } |
130 | |||
131 | for (c_op = 0; c_op < p->num_partners; c_op++) | ||
132 | { | ||
133 | if (NULL != p->partners[c_op].cth) | ||
134 | { | ||
135 | p->partners[c_op].cth = NULL; | ||
136 | } | ||
137 | } | ||
138 | if (NULL != p->ats_perf_op) | 126 | if (NULL != p->ats_perf_op) |
139 | { | 127 | { |
140 | GNUNET_TESTBED_operation_done (p->ats_perf_op); | 128 | GNUNET_TESTBED_operation_done (p->ats_perf_op); |
@@ -312,10 +300,6 @@ comm_disconnect_cb (void *cls, | |||
312 | "%s disconnected from %s while benchmarking\n", | 300 | "%s disconnected from %s while benchmarking\n", |
313 | id, | 301 | id, |
314 | GNUNET_i2s (peer)); | 302 | GNUNET_i2s (peer)); |
315 | if (NULL != p->cth) | ||
316 | { | ||
317 | p->cth = NULL; | ||
318 | } | ||
319 | } | 303 | } |
320 | GNUNET_free(id); | 304 | GNUNET_free(id); |
321 | } | 305 | } |
diff --git a/src/ats-tests/ats-testing.h b/src/ats-tests/ats-testing.h index de189953e..32f0b02d8 100644 --- a/src/ats-tests/ats-testing.h +++ b/src/ats-tests/ats-testing.h | |||
@@ -285,11 +285,6 @@ struct BenchmarkPartner | |||
285 | struct BenchmarkPeer *dest; | 285 | struct BenchmarkPeer *dest; |
286 | 286 | ||
287 | /** | 287 | /** |
288 | * Core transmit handles | ||
289 | */ | ||
290 | struct GNUNET_CORE_TransmitHandle *cth; | ||
291 | |||
292 | /** | ||
293 | * Message queue handle. | 288 | * Message queue handle. |
294 | */ | 289 | */ |
295 | struct GNUNET_MQ_Handle *mq; | 290 | struct GNUNET_MQ_Handle *mq; |
@@ -335,27 +330,27 @@ struct BenchmarkPartner | |||
335 | unsigned int bytes_received; | 330 | unsigned int bytes_received; |
336 | 331 | ||
337 | /** | 332 | /** |
338 | * Current ATS properties | 333 | * Current ATS properties |
339 | */ | 334 | */ |
340 | struct GNUNET_ATS_Properties props; | 335 | struct GNUNET_ATS_Properties props; |
341 | 336 | ||
342 | /** | 337 | /** |
343 | * Bandwidth assigned inbound | 338 | * Bandwidth assigned inbound |
344 | */ | 339 | */ |
345 | uint32_t bandwidth_in; | 340 | uint32_t bandwidth_in; |
346 | 341 | ||
347 | /** | 342 | /** |
348 | * Bandwidth assigned outbound | 343 | * Bandwidth assigned outbound |
349 | */ | 344 | */ |
350 | uint32_t bandwidth_out; | 345 | uint32_t bandwidth_out; |
351 | 346 | ||
352 | /** | 347 | /** |
353 | * Current preference values for bandwidth | 348 | * Current preference values for bandwidth |
354 | */ | 349 | */ |
355 | double pref_bandwidth; | 350 | double pref_bandwidth; |
356 | 351 | ||
357 | /** | 352 | /** |
358 | * Current preference values for delay | 353 | * Current preference values for delay |
359 | */ | 354 | */ |
360 | double pref_delay; | 355 | double pref_delay; |
361 | 356 | ||