diff options
author | Christian Grothoff <christian@grothoff.org> | 2011-07-19 12:56:55 +0000 |
---|---|---|
committer | Christian Grothoff <christian@grothoff.org> | 2011-07-19 12:56:55 +0000 |
commit | 438477f091548c33f67fd609f30768151bf97aa3 (patch) | |
tree | f1722f3c36b76b6270236800fa1732efc1c0948a | |
parent | 17c4884e4aa9d57179a9b5d352aa959e8376e8ec (diff) | |
download | gnunet-438477f091548c33f67fd609f30768151bf97aa3.tar.gz gnunet-438477f091548c33f67fd609f30768151bf97aa3.zip |
cleanup
-rw-r--r-- | src/transport/gnunet-service-transport.c | 44 | ||||
-rw-r--r-- | src/transport/gnunet-service-transport_ats.c | 42 | ||||
-rw-r--r-- | src/transport/gnunet-service-transport_ats.h | 8 |
3 files changed, 40 insertions, 54 deletions
diff --git a/src/transport/gnunet-service-transport.c b/src/transport/gnunet-service-transport.c index 9fb2dc868..31ac55d34 100644 --- a/src/transport/gnunet-service-transport.c +++ b/src/transport/gnunet-service-transport.c | |||
@@ -6715,35 +6715,9 @@ run (void *cls, | |||
6715 | ATS_MAX_ITERATIONS, ATS_MAX_EXEC_DURATION, | 6715 | ATS_MAX_ITERATIONS, ATS_MAX_EXEC_DURATION, |
6716 | &create_ats_information, | 6716 | &create_ats_information, |
6717 | ats_result_cb); | 6717 | ats_result_cb); |
6718 | #endif | 6718 | ats_set_logging_options (ats, |
6719 | 6719 | stats, | |
6720 | int log_problem = GNUNET_NO; | 6720 | cfg); |
6721 | int log_solution = GNUNET_NO; | ||
6722 | int overwrite_dump = GNUNET_NO; | ||
6723 | int minimum_peers = 0; | ||
6724 | int minimum_addresses = 0; | ||
6725 | |||
6726 | log_problem = GNUNET_CONFIGURATION_get_value_yesno (cfg, | ||
6727 | "transport", | ||
6728 | "DUMP_MLP"); | ||
6729 | log_solution = GNUNET_CONFIGURATION_get_value_yesno (cfg, | ||
6730 | "transport", | ||
6731 | "DUMP_SOLUTION"); | ||
6732 | overwrite_dump = GNUNET_CONFIGURATION_get_value_yesno (cfg, | ||
6733 | "transport", | ||
6734 | "DUMP_OVERWRITE"); | ||
6735 | if (GNUNET_OK == | ||
6736 | GNUNET_CONFIGURATION_get_value_number(cfg, | ||
6737 | "transport", | ||
6738 | "DUMP_MIN_PEERS", | ||
6739 | &value)) | ||
6740 | minimum_peers = (int) value; | ||
6741 | if (GNUNET_OK == | ||
6742 | GNUNET_CONFIGURATION_get_value_number(cfg, | ||
6743 | "transport", | ||
6744 | "DUMP_MIN_ADDRS", | ||
6745 | &value)) | ||
6746 | minimum_addresses = (int) value; | ||
6747 | GNUNET_break (GNUNET_OK == | 6721 | GNUNET_break (GNUNET_OK == |
6748 | GNUNET_CONFIGURATION_get_value_time (cfg, | 6722 | GNUNET_CONFIGURATION_get_value_time (cfg, |
6749 | "transport", | 6723 | "transport", |
@@ -6754,19 +6728,9 @@ run (void *cls, | |||
6754 | "transport", | 6728 | "transport", |
6755 | "ATS_MIN_INTERVAL", | 6729 | "ATS_MIN_INTERVAL", |
6756 | &ats_minimum_interval)); | 6730 | &ats_minimum_interval)); |
6757 | #if HAVE_LIBGLPK | ||
6758 | ats_set_logging_options (ats, | ||
6759 | stats, | ||
6760 | minimum_addresses, | ||
6761 | minimum_peers, | ||
6762 | overwrite_dump, | ||
6763 | log_solution, | ||
6764 | log_problem); | ||
6765 | #endif | ||
6766 | if (ats != NULL) | 6731 | if (ats != NULL) |
6767 | ats_task = GNUNET_SCHEDULER_add_now (&schedule_ats, ats); | 6732 | ats_task = GNUNET_SCHEDULER_add_now (&schedule_ats, ats); |
6768 | 6733 | #endif | |
6769 | |||
6770 | 6734 | ||
6771 | 6735 | ||
6772 | #if DEBUG_TRANSPORT | 6736 | #if DEBUG_TRANSPORT |
diff --git a/src/transport/gnunet-service-transport_ats.c b/src/transport/gnunet-service-transport_ats.c index d8acb534b..df425bfb0 100644 --- a/src/transport/gnunet-service-transport_ats.c +++ b/src/transport/gnunet-service-transport_ats.c | |||
@@ -463,9 +463,9 @@ static void _dummy2 () | |||
463 | { | 463 | { |
464 | ats_modify_problem_state (NULL, 0); | 464 | ats_modify_problem_state (NULL, 0); |
465 | qm[1].atis_index = 0; | 465 | qm[1].atis_index = 0; |
466 | _dummy(); | 466 | _dummy(); |
467 | int t = ATS_COST_UPDATED + ATS_MODIFIED + ATS_NEW; | 467 | int t = ATS_COST_UPDATED + ATS_MODIFIED + ATS_NEW; |
468 | t = 0; | 468 | t++; |
469 | } | 469 | } |
470 | 470 | ||
471 | /* | 471 | /* |
@@ -1669,14 +1669,40 @@ void ats_update_problem_cr (struct ATS_Handle * ats) | |||
1669 | 1669 | ||
1670 | void ats_set_logging_options (struct ATS_Handle * ats, | 1670 | void ats_set_logging_options (struct ATS_Handle * ats, |
1671 | struct GNUNET_STATISTICS_Handle * stats, | 1671 | struct GNUNET_STATISTICS_Handle * stats, |
1672 | int minimum_addresses, | 1672 | const struct GNUNET_CONFIGURATION_Handle *cfg) |
1673 | int minimum_peers, | ||
1674 | int overwrite_dump, | ||
1675 | int log_solution, | ||
1676 | int log_problem) | ||
1677 | { | 1673 | { |
1674 | int minimum_addresses; | ||
1675 | int minimum_peers; | ||
1676 | int overwrite_dump; | ||
1677 | int log_solution; | ||
1678 | int log_problem; | ||
1679 | unsigned long long value; | ||
1680 | |||
1678 | if (ats == NULL) | 1681 | if (ats == NULL) |
1679 | return; | 1682 | return; |
1683 | log_problem = GNUNET_CONFIGURATION_get_value_yesno (cfg, | ||
1684 | "transport", | ||
1685 | "DUMP_MLP"); | ||
1686 | log_solution = GNUNET_CONFIGURATION_get_value_yesno (cfg, | ||
1687 | "transport", | ||
1688 | "DUMP_SOLUTION"); | ||
1689 | overwrite_dump = GNUNET_CONFIGURATION_get_value_yesno (cfg, | ||
1690 | "transport", | ||
1691 | "DUMP_OVERWRITE"); | ||
1692 | if (GNUNET_OK == | ||
1693 | GNUNET_CONFIGURATION_get_value_number(cfg, | ||
1694 | "transport", | ||
1695 | "DUMP_MIN_PEERS", | ||
1696 | &value)) | ||
1697 | minimum_peers = (int) value; | ||
1698 | if (GNUNET_OK == | ||
1699 | GNUNET_CONFIGURATION_get_value_number(cfg, | ||
1700 | "transport", | ||
1701 | "DUMP_MIN_ADDRS", | ||
1702 | &value)) | ||
1703 | minimum_addresses = (int) value; | ||
1704 | |||
1705 | |||
1680 | ats->stats = stats; | 1706 | ats->stats = stats; |
1681 | ats->dump_min_addr = minimum_addresses; | 1707 | ats->dump_min_addr = minimum_addresses; |
1682 | ats->dump_min_peers = minimum_peers; | 1708 | ats->dump_min_peers = minimum_peers; |
diff --git a/src/transport/gnunet-service-transport_ats.h b/src/transport/gnunet-service-transport_ats.h index 0e4427dc6..2dfe5ca0a 100644 --- a/src/transport/gnunet-service-transport_ats.h +++ b/src/transport/gnunet-service-transport_ats.h | |||
@@ -504,12 +504,8 @@ ats_update_problem_cr (struct ATS_Handle * ats); | |||
504 | 504 | ||
505 | void | 505 | void |
506 | ats_set_logging_options (struct ATS_Handle * ats, | 506 | ats_set_logging_options (struct ATS_Handle * ats, |
507 | struct GNUNET_STATISTICS_Handle *stats, | 507 | struct GNUNET_STATISTICS_Handle *stats, |
508 | int minimum_addresses, | 508 | const struct GNUNET_CONFIGURATION_Handle *cfg); |
509 | int minimum_peers, | ||
510 | int overwrite_dump, | ||
511 | int log_solution, | ||
512 | int log_problem); | ||
513 | 509 | ||
514 | #endif | 510 | #endif |
515 | /* end of file gnunet-service-transport_ats.h */ | 511 | /* end of file gnunet-service-transport_ats.h */ |