aboutsummaryrefslogtreecommitdiff
path: root/src/ats-tests/ats-testing-experiment.c
diff options
context:
space:
mode:
authorMatthias Wachs <wachs@net.in.tum.de>2014-03-20 09:58:43 +0000
committerMatthias Wachs <wachs@net.in.tum.de>2014-03-20 09:58:43 +0000
commitad410474d7c7a71f726860e936200f80feedca1f (patch)
tree76ebef7de101cf810d61cb7ff6ea0d52dd0550a8 /src/ats-tests/ats-testing-experiment.c
parent173a142f9b7acd4a788f41dd23ca349cd4b901e9 (diff)
downloadgnunet-ad410474d7c7a71f726860e936200f80feedca1f.tar.gz
gnunet-ad410474d7c7a71f726860e936200f80feedca1f.zip
renaming generator type for ats
addign comment for bandwidth
Diffstat (limited to 'src/ats-tests/ats-testing-experiment.c')
-rw-r--r--src/ats-tests/ats-testing-experiment.c22
1 files changed, 11 insertions, 11 deletions
diff --git a/src/ats-tests/ats-testing-experiment.c b/src/ats-tests/ats-testing-experiment.c
index ae92b58c2..97409e2a2 100644
--- a/src/ats-tests/ats-testing-experiment.c
+++ b/src/ats-tests/ats-testing-experiment.c
@@ -188,19 +188,19 @@ load_episode (struct Experiment *e, struct Episode *cur,
188 /* Load arguments for set_rate, start_send, set_preference */ 188 /* Load arguments for set_rate, start_send, set_preference */
189 if (0 == strcmp (type, "constant")) 189 if (0 == strcmp (type, "constant"))
190 { 190 {
191 o->tg_type = GNUNET_ATS_TEST_TG_CONSTANT; 191 o->gen_type = GNUNET_ATS_TEST_TG_CONSTANT;
192 } 192 }
193 else if (0 == strcmp (type, "linear")) 193 else if (0 == strcmp (type, "linear"))
194 { 194 {
195 o->tg_type = GNUNET_ATS_TEST_TG_LINEAR; 195 o->gen_type = GNUNET_ATS_TEST_TG_LINEAR;
196 } 196 }
197 else if (0 == strcmp (type, "sinus")) 197 else if (0 == strcmp (type, "sinus"))
198 { 198 {
199 o->tg_type = GNUNET_ATS_TEST_TG_SINUS; 199 o->gen_type = GNUNET_ATS_TEST_TG_SINUS;
200 } 200 }
201 else if (0 == strcmp (type, "random")) 201 else if (0 == strcmp (type, "random"))
202 { 202 {
203 o->tg_type = GNUNET_ATS_TEST_TG_RANDOM; 203 o->gen_type = GNUNET_ATS_TEST_TG_RANDOM;
204 } 204 }
205 else 205 else
206 { 206 {
@@ -232,9 +232,9 @@ load_episode (struct Experiment *e, struct Episode *cur,
232 if (GNUNET_SYSERR == GNUNET_CONFIGURATION_get_value_number (cfg, 232 if (GNUNET_SYSERR == GNUNET_CONFIGURATION_get_value_number (cfg,
233 sec_name, op_name, &o->max_rate)) 233 sec_name, op_name, &o->max_rate))
234 { 234 {
235 if ((GNUNET_ATS_TEST_TG_LINEAR == o->tg_type) || 235 if ((GNUNET_ATS_TEST_TG_LINEAR == o->gen_type) ||
236 (GNUNET_ATS_TEST_TG_RANDOM == o->tg_type) || 236 (GNUNET_ATS_TEST_TG_RANDOM == o->gen_type) ||
237 (GNUNET_ATS_TEST_TG_SINUS == o->tg_type)) 237 (GNUNET_ATS_TEST_TG_SINUS == o->gen_type))
238 { 238 {
239 fprintf (stderr, "Missing max rate in operation %u `%s' in episode %u\n", 239 fprintf (stderr, "Missing max rate in operation %u `%s' in episode %u\n",
240 op_counter, op, cur->id); 240 op_counter, op, cur->id);
@@ -306,8 +306,8 @@ load_episode (struct Experiment *e, struct Episode *cur,
306 } 306 }
307 307
308 /* Safety checks */ 308 /* Safety checks */
309 if ((GNUNET_ATS_TEST_TG_LINEAR == o->tg_type) || 309 if ((GNUNET_ATS_TEST_TG_LINEAR == o->gen_type) ||
310 (GNUNET_ATS_TEST_TG_SINUS == o->tg_type)) 310 (GNUNET_ATS_TEST_TG_SINUS == o->gen_type))
311 { 311 {
312 if ((o->max_rate - o->base_rate) > o->base_rate) 312 if ((o->max_rate - o->base_rate) > o->base_rate)
313 { 313 {
@@ -437,7 +437,7 @@ enforce_start_send (struct GNUNET_ATS_TEST_Operation *op)
437 } 437 }
438 438
439 partner->tg = GNUNET_ATS_TEST_generate_traffic_start(peer, partner, 439 partner->tg = GNUNET_ATS_TEST_generate_traffic_start(peer, partner,
440 op->tg_type, op->base_rate, op->max_rate, op->period, 440 op->gen_type, op->base_rate, op->max_rate, op->period,
441 GNUNET_TIME_UNIT_FOREVER_REL); 441 GNUNET_TIME_UNIT_FOREVER_REL);
442} 442}
443 443
@@ -495,7 +495,7 @@ enforce_start_preference (struct GNUNET_ATS_TEST_Operation *op)
495 } 495 }
496 496
497 partner->pg = GNUNET_ATS_TEST_generate_preferences_start(peer, partner, 497 partner->pg = GNUNET_ATS_TEST_generate_preferences_start(peer, partner,
498 op->tg_type, op->base_rate, op->max_rate, op->period, op->frequency, 498 op->gen_type, op->base_rate, op->max_rate, op->period, op->frequency,
499 op->pref_type); 499 op->pref_type);
500} 500}
501 501