diff options
author | Matthias Wachs <wachs@net.in.tum.de> | 2014-02-03 12:50:52 +0000 |
---|---|---|
committer | Matthias Wachs <wachs@net.in.tum.de> | 2014-02-03 12:50:52 +0000 |
commit | ebe39f090885f05281952836caf207c576ba8625 (patch) | |
tree | ea2fb1cc09437013f2a66dd40c6a2bdf4feaeec3 /src | |
parent | 23c87f2aea815cbd6078ab75b5b8fe8cf8f6ee31 (diff) | |
download | gnunet-ebe39f090885f05281952836caf207c576ba8625.tar.gz gnunet-ebe39f090885f05281952836caf207c576ba8625.zip |
fixes
Diffstat (limited to 'src')
-rw-r--r-- | src/ats-tests/ats-testing-experiment.c | 5 | ||||
-rw-r--r-- | src/ats-tests/ats-testing.c | 3 | ||||
-rw-r--r-- | src/ats-tests/gnunet-ats-sim.c | 32 |
3 files changed, 24 insertions, 16 deletions
diff --git a/src/ats-tests/ats-testing-experiment.c b/src/ats-tests/ats-testing-experiment.c index 764d7fb84..3d19c739f 100644 --- a/src/ats-tests/ats-testing-experiment.c +++ b/src/ats-tests/ats-testing-experiment.c | |||
@@ -598,6 +598,11 @@ GNUNET_ATS_TEST_experimentation_stop (struct Experiment *e) | |||
598 | GNUNET_SCHEDULER_cancel (e->experiment_timeout_task); | 598 | GNUNET_SCHEDULER_cancel (e->experiment_timeout_task); |
599 | e->experiment_timeout_task = GNUNET_SCHEDULER_NO_TASK; | 599 | e->experiment_timeout_task = GNUNET_SCHEDULER_NO_TASK; |
600 | } | 600 | } |
601 | if (GNUNET_SCHEDULER_NO_TASK != e->episode_timeout_task) | ||
602 | { | ||
603 | GNUNET_SCHEDULER_cancel (e->episode_timeout_task); | ||
604 | e->episode_timeout_task = GNUNET_SCHEDULER_NO_TASK; | ||
605 | } | ||
601 | free_experiment (e); | 606 | free_experiment (e); |
602 | } | 607 | } |
603 | 608 | ||
diff --git a/src/ats-tests/ats-testing.c b/src/ats-tests/ats-testing.c index 4639b29e6..058aa4a7b 100644 --- a/src/ats-tests/ats-testing.c +++ b/src/ats-tests/ats-testing.c | |||
@@ -915,9 +915,6 @@ GNUNET_ATS_TEST_shutdown_topology (void) | |||
915 | if (NULL == top) | 915 | if (NULL == top) |
916 | return; | 916 | return; |
917 | 917 | ||
918 | GNUNET_free (top->mps); | ||
919 | GNUNET_free (top->sps); | ||
920 | |||
921 | GNUNET_SCHEDULER_shutdown(); | 918 | GNUNET_SCHEDULER_shutdown(); |
922 | } | 919 | } |
923 | 920 | ||
diff --git a/src/ats-tests/gnunet-ats-sim.c b/src/ats-tests/gnunet-ats-sim.c index 02bb65776..a06bbc172 100644 --- a/src/ats-tests/gnunet-ats-sim.c +++ b/src/ats-tests/gnunet-ats-sim.c | |||
@@ -141,6 +141,7 @@ do_shutdown () | |||
141 | GNUNET_ATS_TEST_shutdown_topology (); | 141 | GNUNET_ATS_TEST_shutdown_topology (); |
142 | } | 142 | } |
143 | 143 | ||
144 | |||
144 | static void | 145 | static void |
145 | transport_recv_cb (void *cls, | 146 | transport_recv_cb (void *cls, |
146 | const struct GNUNET_PeerIdentity * peer, | 147 | const struct GNUNET_PeerIdentity * peer, |
@@ -174,15 +175,23 @@ experiment_done_cb (struct Experiment *e, struct GNUNET_TIME_Relative duration,i | |||
174 | } | 175 | } |
175 | /* Stop logging */ | 176 | /* Stop logging */ |
176 | GNUNET_ATS_TEST_logging_stop (l); | 177 | GNUNET_ATS_TEST_logging_stop (l); |
178 | |||
179 | /* Stop traffic generation */ | ||
180 | GNUNET_ATS_TEST_generate_traffic_stop_all(); | ||
181 | |||
177 | evaluate (duration); | 182 | evaluate (duration); |
178 | if (opt_log) | 183 | if (opt_log) |
179 | GNUNET_ATS_TEST_logging_write_to_file(l, opt_exp_file, opt_plot); | 184 | GNUNET_ATS_TEST_logging_write_to_file(l, opt_exp_file, opt_plot); |
180 | 185 | ||
181 | /* Stop traffic generation */ | 186 | if (NULL != l) |
182 | GNUNET_ATS_TEST_generate_traffic_stop_all(); | 187 | { |
188 | GNUNET_ATS_TEST_logging_stop (l); | ||
189 | GNUNET_ATS_TEST_logging_clean_up (l); | ||
190 | l = NULL; | ||
191 | } | ||
192 | |||
183 | /* Clean up experiment */ | 193 | /* Clean up experiment */ |
184 | GNUNET_ATS_TEST_experimentation_stop (e); | 194 | GNUNET_ATS_TEST_experimentation_stop (e); |
185 | GNUNET_ATS_TEST_logging_clean_up (l); | ||
186 | e = NULL; | 195 | e = NULL; |
187 | 196 | ||
188 | /* Shutdown topology */ | 197 | /* Shutdown topology */ |
@@ -199,8 +208,6 @@ static void topology_setup_done (void *cls, | |||
199 | struct BenchmarkPeer *masters, | 208 | struct BenchmarkPeer *masters, |
200 | struct BenchmarkPeer *slaves) | 209 | struct BenchmarkPeer *slaves) |
201 | { | 210 | { |
202 | int c_m; | ||
203 | int c_s; | ||
204 | GNUNET_log (GNUNET_ERROR_TYPE_INFO, "Topology setup complete!\n"); | 211 | GNUNET_log (GNUNET_ERROR_TYPE_INFO, "Topology setup complete!\n"); |
205 | 212 | ||
206 | masters_p = masters; | 213 | masters_p = masters; |
@@ -212,20 +219,22 @@ static void topology_setup_done (void *cls, | |||
212 | e->num_masters); | 219 | e->num_masters); |
213 | GNUNET_ATS_TEST_experimentation_run (e, &episode_done_cb, &experiment_done_cb); | 220 | GNUNET_ATS_TEST_experimentation_run (e, &episode_done_cb, &experiment_done_cb); |
214 | 221 | ||
222 | #if 0 | ||
223 | int c_m; | ||
224 | int c_s; | ||
215 | for (c_m = 0; c_m < e->num_masters; c_m++) | 225 | for (c_m = 0; c_m < e->num_masters; c_m++) |
216 | { | 226 | { |
217 | for (c_s = 0; c_s < e->num_slaves; c_s++) | 227 | for (c_s = 0; c_s < e->num_slaves; c_s++) |
218 | { | 228 | { |
219 | /* Generate maximum traffic to all peers */ | 229 | /* Generate maximum traffic to all peers */ |
220 | /* Example: Generate traffic with constant 10,000 Bytes/s | 230 | /* Example: Generate traffic with constant 10,000 Bytes/s */ |
221 | GNUNET_ATS_TEST_generate_traffic_start (&masters[c_m], | 231 | GNUNET_ATS_TEST_generate_traffic_start (&masters[c_m], |
222 | &masters[c_m].partners[c_s], | 232 | &masters[c_m].partners[c_s], |
223 | GNUNET_ATS_TEST_TG_CONSTANT, | 233 | GNUNET_ATS_TEST_TG_CONSTANT, |
224 | 10000, | 234 | 10000, |
225 | GNUNET_TIME_UNIT_FOREVER_REL); | 235 | GNUNET_TIME_UNIT_FOREVER_REL); |
226 | */ | ||
227 | /* Example: Generate traffic with an increasing rate from 1000 to 2000 | 236 | /* Example: Generate traffic with an increasing rate from 1000 to 2000 |
228 | * Bytes/s with in a minute | 237 | * Bytes/s with in a minute */ |
229 | GNUNET_ATS_TEST_generate_traffic_start (&masters[c_m], | 238 | GNUNET_ATS_TEST_generate_traffic_start (&masters[c_m], |
230 | &masters[c_m].partners[c_s], | 239 | &masters[c_m].partners[c_s], |
231 | GNUNET_ATS_TEST_TG_LINEAR, | 240 | GNUNET_ATS_TEST_TG_LINEAR, |
@@ -233,9 +242,8 @@ static void topology_setup_done (void *cls, | |||
233 | 2000, | 242 | 2000, |
234 | GNUNET_TIME_UNIT_MINUTES, | 243 | GNUNET_TIME_UNIT_MINUTES, |
235 | GNUNET_TIME_UNIT_FOREVER_REL); | 244 | GNUNET_TIME_UNIT_FOREVER_REL); |
236 | */ | ||
237 | /* Example: Generate traffic with a random rate between 1000 to 2000 | 245 | /* Example: Generate traffic with a random rate between 1000 to 2000 |
238 | * Bytes/s | 246 | * Bytes/s */ |
239 | GNUNET_ATS_TEST_generate_traffic_start (&masters[c_m], | 247 | GNUNET_ATS_TEST_generate_traffic_start (&masters[c_m], |
240 | &masters[c_m].partners[c_s], | 248 | &masters[c_m].partners[c_s], |
241 | GNUNET_ATS_TEST_TG_RANDOM, | 249 | GNUNET_ATS_TEST_TG_RANDOM, |
@@ -243,10 +251,8 @@ static void topology_setup_done (void *cls, | |||
243 | 2000, | 251 | 2000, |
244 | GNUNET_TIME_UNIT_FOREVER_REL, | 252 | GNUNET_TIME_UNIT_FOREVER_REL, |
245 | GNUNET_TIME_UNIT_FOREVER_REL); | 253 | GNUNET_TIME_UNIT_FOREVER_REL); |
246 | */ | ||
247 | /* Example: Generate traffic with a sinus form, a base rate of | 254 | /* Example: Generate traffic with a sinus form, a base rate of |
248 | * 1000 Bytes/s, an amplitude of (max-base), and a period of 1 minute */ | 255 | * 1000 Bytes/s, an amplitude of (max-base), and a period of 1 minute */ |
249 | /* | ||
250 | GNUNET_ATS_TEST_generate_traffic_start (&masters[c_m], | 256 | GNUNET_ATS_TEST_generate_traffic_start (&masters[c_m], |
251 | &masters[c_m].partners[c_s], | 257 | &masters[c_m].partners[c_s], |
252 | GNUNET_ATS_TEST_TG_SINUS, | 258 | GNUNET_ATS_TEST_TG_SINUS, |
@@ -254,9 +260,9 @@ static void topology_setup_done (void *cls, | |||
254 | 2000, | 260 | 2000, |
255 | GNUNET_TIME_UNIT_MINUTES, | 261 | GNUNET_TIME_UNIT_MINUTES, |
256 | GNUNET_TIME_UNIT_FOREVER_REL); | 262 | GNUNET_TIME_UNIT_FOREVER_REL); |
257 | */ | ||
258 | } | 263 | } |
259 | } | 264 | } |
265 | #endif | ||
260 | 266 | ||
261 | timeout_task = GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_relative_add (GNUNET_TIME_UNIT_MINUTES, | 267 | timeout_task = GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_relative_add (GNUNET_TIME_UNIT_MINUTES, |
262 | e->max_duration), &do_shutdown, NULL); | 268 | e->max_duration), &do_shutdown, NULL); |