diff options
author | Matthias Wachs <wachs@net.in.tum.de> | 2014-02-11 08:33:19 +0000 |
---|---|---|
committer | Matthias Wachs <wachs@net.in.tum.de> | 2014-02-11 08:33:19 +0000 |
commit | c45d65f668cf599ff9fa47a96823d18b30a2df47 (patch) | |
tree | 568e957c8fc9082d6adac44bf59d8b9284afe096 /src | |
parent | 97484d04c2ae1deb5e95c4472977b2333ce55b60 (diff) | |
download | gnunet-c45d65f668cf599ff9fa47a96823d18b30a2df47.tar.gz gnunet-c45d65f668cf599ff9fa47a96823d18b30a2df47.zip |
fixing property generation
Diffstat (limited to 'src')
-rw-r--r-- | src/ats/gnunet-ats-solver-eval.c | 27 |
1 files changed, 17 insertions, 10 deletions
diff --git a/src/ats/gnunet-ats-solver-eval.c b/src/ats/gnunet-ats-solver-eval.c index 57d5f7582..9aa9fd093 100644 --- a/src/ats/gnunet-ats-solver-eval.c +++ b/src/ats/gnunet-ats-solver-eval.c | |||
@@ -318,27 +318,34 @@ GNUNET_ATS_solver_generate_property_start (unsigned int peer, | |||
318 | switch (type) { | 318 | switch (type) { |
319 | case GNUNET_ATS_TEST_TG_CONSTANT: | 319 | case GNUNET_ATS_TEST_TG_CONSTANT: |
320 | GNUNET_log (GNUNET_ERROR_TYPE_INFO, | 320 | GNUNET_log (GNUNET_ERROR_TYPE_INFO, |
321 | "Setting up constant property generator peer [%u] address [%u] `%s' max %u Bips\n", | 321 | "Setting up %s property generator peer [%u] address [%u] `%s'"\ |
322 | pg->peer, pg->address_id, GNUNET_ATS_print_property_type (ats_property), | 322 | "max %u Bips\n", |
323 | print_generator_type(type), pg->peer, pg->address_id, | ||
324 | GNUNET_ATS_print_property_type (ats_property), | ||
323 | base_value); | 325 | base_value); |
324 | break; | 326 | break; |
325 | case GNUNET_ATS_TEST_TG_LINEAR: | 327 | case GNUNET_ATS_TEST_TG_LINEAR: |
326 | GNUNET_log (GNUNET_ERROR_TYPE_INFO, | 328 | GNUNET_log (GNUNET_ERROR_TYPE_INFO, |
327 | "Setting up linear property generator peer [%u] address [%u] `%s' min %u Bips max %u Bips\n", | 329 | "Setting up %s property generator peer [%u] address [%u] `%s' " \ |
328 | pg->peer, pg->address_id, GNUNET_ATS_print_property_type(ats_property), | 330 | "min %u Bips max %u Bips\n", |
331 | print_generator_type(type), pg->peer, pg->address_id, | ||
332 | GNUNET_ATS_print_property_type(ats_property), | ||
329 | base_value, value_rate); | 333 | base_value, value_rate); |
330 | break; | 334 | break; |
331 | case GNUNET_ATS_TEST_TG_SINUS: | 335 | case GNUNET_ATS_TEST_TG_SINUS: |
332 | GNUNET_log (GNUNET_ERROR_TYPE_INFO, | 336 | GNUNET_log (GNUNET_ERROR_TYPE_INFO, |
333 | "Setting up sinus property generator peer [%u] address [%u] `%s' baserate %u Bips, amplitude %u Bps\n", | 337 | "Setting up %s property generator peer [%u] address [%u] `%s' "\ |
334 | pg->peer, pg->address_id, GNUNET_ATS_print_property_type(ats_property), | 338 | "baserate %u Bips, amplitude %u Bps\n", |
339 | print_generator_type(type), pg->peer, pg->address_id, | ||
340 | GNUNET_ATS_print_property_type(ats_property), | ||
335 | base_value, value_rate); | 341 | base_value, value_rate); |
336 | |||
337 | break; | 342 | break; |
338 | case GNUNET_ATS_TEST_TG_RANDOM: | 343 | case GNUNET_ATS_TEST_TG_RANDOM: |
339 | GNUNET_log (GNUNET_ERROR_TYPE_INFO, | 344 | GNUNET_log (GNUNET_ERROR_TYPE_INFO, |
340 | "Setting up random property generator peer [%u] address [%u] `%s' min %u Bips max %u Bps\n", | 345 | "Setting up %s property generator peer [%u] address [%u] `%s' "\ |
341 | pg->peer, pg->address_id, GNUNET_ATS_print_property_type(ats_property), | 346 | "min %u Bips max %u Bps\n", |
347 | print_generator_type(type), pg->peer, pg->address_id, | ||
348 | GNUNET_ATS_print_property_type(ats_property), | ||
342 | base_value, value_rate); | 349 | base_value, value_rate); |
343 | break; | 350 | break; |
344 | default: | 351 | default: |
@@ -1765,7 +1772,7 @@ enforce_start_property (struct GNUNET_ATS_TEST_Operation *op) | |||
1765 | 1772 | ||
1766 | GNUNET_ATS_solver_generate_property_start (op->peer_id, | 1773 | GNUNET_ATS_solver_generate_property_start (op->peer_id, |
1767 | op->address_id, | 1774 | op->address_id, |
1768 | op->type, | 1775 | op->gen_type, |
1769 | op->base_rate, | 1776 | op->base_rate, |
1770 | op->max_rate, | 1777 | op->max_rate, |
1771 | op->period, | 1778 | op->period, |