[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] r32160 - gnunet/src/ats-tests
From: |
gnunet |
Subject: |
[GNUnet-SVN] r32160 - gnunet/src/ats-tests |
Date: |
Mon, 3 Feb 2014 13:50:53 +0100 |
Author: wachs
Date: 2014-02-03 13:50:52 +0100 (Mon, 03 Feb 2014)
New Revision: 32160
Modified:
gnunet/src/ats-tests/ats-testing-experiment.c
gnunet/src/ats-tests/ats-testing.c
gnunet/src/ats-tests/gnunet-ats-sim.c
Log:
fixes
Modified: gnunet/src/ats-tests/ats-testing-experiment.c
===================================================================
--- gnunet/src/ats-tests/ats-testing-experiment.c 2014-02-03 12:36:25 UTC
(rev 32159)
+++ gnunet/src/ats-tests/ats-testing-experiment.c 2014-02-03 12:50:52 UTC
(rev 32160)
@@ -598,6 +598,11 @@
GNUNET_SCHEDULER_cancel (e->experiment_timeout_task);
e->experiment_timeout_task = GNUNET_SCHEDULER_NO_TASK;
}
+ if (GNUNET_SCHEDULER_NO_TASK != e->episode_timeout_task)
+ {
+ GNUNET_SCHEDULER_cancel (e->episode_timeout_task);
+ e->episode_timeout_task = GNUNET_SCHEDULER_NO_TASK;
+ }
free_experiment (e);
}
Modified: gnunet/src/ats-tests/ats-testing.c
===================================================================
--- gnunet/src/ats-tests/ats-testing.c 2014-02-03 12:36:25 UTC (rev 32159)
+++ gnunet/src/ats-tests/ats-testing.c 2014-02-03 12:50:52 UTC (rev 32160)
@@ -915,9 +915,6 @@
if (NULL == top)
return;
- GNUNET_free (top->mps);
- GNUNET_free (top->sps);
-
GNUNET_SCHEDULER_shutdown();
}
Modified: gnunet/src/ats-tests/gnunet-ats-sim.c
===================================================================
--- gnunet/src/ats-tests/gnunet-ats-sim.c 2014-02-03 12:36:25 UTC (rev
32159)
+++ gnunet/src/ats-tests/gnunet-ats-sim.c 2014-02-03 12:50:52 UTC (rev
32160)
@@ -141,6 +141,7 @@
GNUNET_ATS_TEST_shutdown_topology ();
}
+
static void
transport_recv_cb (void *cls,
const struct GNUNET_PeerIdentity * peer,
@@ -174,15 +175,23 @@
}
/* Stop logging */
GNUNET_ATS_TEST_logging_stop (l);
+
+ /* Stop traffic generation */
+ GNUNET_ATS_TEST_generate_traffic_stop_all();
+
evaluate (duration);
if (opt_log)
GNUNET_ATS_TEST_logging_write_to_file(l, opt_exp_file, opt_plot);
- /* Stop traffic generation */
- GNUNET_ATS_TEST_generate_traffic_stop_all();
+ if (NULL != l)
+ {
+ GNUNET_ATS_TEST_logging_stop (l);
+ GNUNET_ATS_TEST_logging_clean_up (l);
+ l = NULL;
+ }
+
/* Clean up experiment */
GNUNET_ATS_TEST_experimentation_stop (e);
- GNUNET_ATS_TEST_logging_clean_up (l);
e = NULL;
/* Shutdown topology */
@@ -199,8 +208,6 @@
struct BenchmarkPeer *masters,
struct BenchmarkPeer *slaves)
{
- int c_m;
- int c_s;
GNUNET_log (GNUNET_ERROR_TYPE_INFO, "Topology setup complete!\n");
masters_p = masters;
@@ -212,20 +219,22 @@
e->num_masters);
GNUNET_ATS_TEST_experimentation_run (e, &episode_done_cb,
&experiment_done_cb);
+#if 0
+ int c_m;
+ int c_s;
for (c_m = 0; c_m < e->num_masters; c_m++)
{
for (c_s = 0; c_s < e->num_slaves; c_s++)
{
/* Generate maximum traffic to all peers */
- /* Example: Generate traffic with constant 10,000 Bytes/s
+ /* Example: Generate traffic with constant 10,000 Bytes/s */
GNUNET_ATS_TEST_generate_traffic_start (&masters[c_m],
&masters[c_m].partners[c_s],
GNUNET_ATS_TEST_TG_CONSTANT,
10000,
GNUNET_TIME_UNIT_FOREVER_REL);
- */
/* Example: Generate traffic with an increasing rate from 1000 to 2000
- * Bytes/s with in a minute
+ * Bytes/s with in a minute */
GNUNET_ATS_TEST_generate_traffic_start (&masters[c_m],
&masters[c_m].partners[c_s],
GNUNET_ATS_TEST_TG_LINEAR,
@@ -233,9 +242,8 @@
2000,
GNUNET_TIME_UNIT_MINUTES,
GNUNET_TIME_UNIT_FOREVER_REL);
- */
/* Example: Generate traffic with a random rate between 1000 to 2000
- * Bytes/s
+ * Bytes/s */
GNUNET_ATS_TEST_generate_traffic_start (&masters[c_m],
&masters[c_m].partners[c_s],
GNUNET_ATS_TEST_TG_RANDOM,
@@ -243,10 +251,8 @@
2000,
GNUNET_TIME_UNIT_FOREVER_REL,
GNUNET_TIME_UNIT_FOREVER_REL);
- */
/* Example: Generate traffic with a sinus form, a base rate of
* 1000 Bytes/s, an amplitude of (max-base), and a period of 1 minute
*/
- /*
GNUNET_ATS_TEST_generate_traffic_start (&masters[c_m],
&masters[c_m].partners[c_s],
GNUNET_ATS_TEST_TG_SINUS,
@@ -254,9 +260,9 @@
2000,
GNUNET_TIME_UNIT_MINUTES,
GNUNET_TIME_UNIT_FOREVER_REL);
- */
}
}
+#endif
timeout_task = GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_relative_add
(GNUNET_TIME_UNIT_MINUTES,
e->max_duration), &do_shutdown, NULL);
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [GNUnet-SVN] r32160 - gnunet/src/ats-tests,
gnunet <=