[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] r16122 - gnunet/src/transport
From: |
gnunet |
Subject: |
[GNUnet-SVN] r16122 - gnunet/src/transport |
Date: |
Tue, 19 Jul 2011 14:56:55 +0200 |
Author: grothoff
Date: 2011-07-19 14:56:55 +0200 (Tue, 19 Jul 2011)
New Revision: 16122
Modified:
gnunet/src/transport/gnunet-service-transport.c
gnunet/src/transport/gnunet-service-transport_ats.c
gnunet/src/transport/gnunet-service-transport_ats.h
Log:
cleanup
Modified: gnunet/src/transport/gnunet-service-transport.c
===================================================================
--- gnunet/src/transport/gnunet-service-transport.c 2011-07-19 12:52:14 UTC
(rev 16121)
+++ gnunet/src/transport/gnunet-service-transport.c 2011-07-19 12:56:55 UTC
(rev 16122)
@@ -6715,35 +6715,9 @@
ATS_MAX_ITERATIONS, ATS_MAX_EXEC_DURATION,
&create_ats_information,
ats_result_cb);
-#endif
-
- int log_problem = GNUNET_NO;
- int log_solution = GNUNET_NO;
- int overwrite_dump = GNUNET_NO;
- int minimum_peers = 0;
- int minimum_addresses = 0;
-
- log_problem = GNUNET_CONFIGURATION_get_value_yesno (cfg,
- "transport",
- "DUMP_MLP");
- log_solution = GNUNET_CONFIGURATION_get_value_yesno (cfg,
- "transport",
- "DUMP_SOLUTION");
- overwrite_dump = GNUNET_CONFIGURATION_get_value_yesno (cfg,
- "transport",
- "DUMP_OVERWRITE");
- if (GNUNET_OK ==
- GNUNET_CONFIGURATION_get_value_number(cfg,
- "transport",
- "DUMP_MIN_PEERS",
- &value))
- minimum_peers = (int) value;
- if (GNUNET_OK ==
- GNUNET_CONFIGURATION_get_value_number(cfg,
- "transport",
- "DUMP_MIN_ADDRS",
- &value))
- minimum_addresses = (int) value;
+ ats_set_logging_options (ats,
+ stats,
+ cfg);
GNUNET_break (GNUNET_OK ==
GNUNET_CONFIGURATION_get_value_time (cfg,
"transport",
@@ -6754,21 +6728,11 @@
"transport",
"ATS_MIN_INTERVAL",
&ats_minimum_interval));
-#if HAVE_LIBGLPK
- ats_set_logging_options (ats,
- stats,
- minimum_addresses,
- minimum_peers,
- overwrite_dump,
- log_solution,
- log_problem);
-#endif
if (ats != NULL)
ats_task = GNUNET_SCHEDULER_add_now (&schedule_ats, ats);
+#endif
-
-
#if DEBUG_TRANSPORT
GNUNET_log (GNUNET_ERROR_TYPE_INFO,
_("Transport service ready.\n"));
Modified: gnunet/src/transport/gnunet-service-transport_ats.c
===================================================================
--- gnunet/src/transport/gnunet-service-transport_ats.c 2011-07-19 12:52:14 UTC
(rev 16121)
+++ gnunet/src/transport/gnunet-service-transport_ats.c 2011-07-19 12:56:55 UTC
(rev 16122)
@@ -463,9 +463,9 @@
{
ats_modify_problem_state (NULL, 0);
qm[1].atis_index = 0;
- _dummy();
- int t = ATS_COST_UPDATED + ATS_MODIFIED + ATS_NEW;
- t = 0;
+ _dummy();
+ int t = ATS_COST_UPDATED + ATS_MODIFIED + ATS_NEW;
+ t++;
}
/*
@@ -1669,14 +1669,40 @@
void ats_set_logging_options (struct ATS_Handle * ats,
struct GNUNET_STATISTICS_Handle * stats,
- int minimum_addresses,
- int minimum_peers,
- int overwrite_dump,
- int log_solution,
- int log_problem)
+ const struct GNUNET_CONFIGURATION_Handle *cfg)
{
+ int minimum_addresses;
+ int minimum_peers;
+ int overwrite_dump;
+ int log_solution;
+ int log_problem;
+ unsigned long long value;
+
if (ats == NULL)
return;
+ log_problem = GNUNET_CONFIGURATION_get_value_yesno (cfg,
+ "transport",
+ "DUMP_MLP");
+ log_solution = GNUNET_CONFIGURATION_get_value_yesno (cfg,
+ "transport",
+ "DUMP_SOLUTION");
+ overwrite_dump = GNUNET_CONFIGURATION_get_value_yesno (cfg,
+ "transport",
+ "DUMP_OVERWRITE");
+ if (GNUNET_OK ==
+ GNUNET_CONFIGURATION_get_value_number(cfg,
+ "transport",
+ "DUMP_MIN_PEERS",
+ &value))
+ minimum_peers = (int) value;
+ if (GNUNET_OK ==
+ GNUNET_CONFIGURATION_get_value_number(cfg,
+ "transport",
+ "DUMP_MIN_ADDRS",
+ &value))
+ minimum_addresses = (int) value;
+
+
ats->stats = stats;
ats->dump_min_addr = minimum_addresses;
ats->dump_min_peers = minimum_peers;
Modified: gnunet/src/transport/gnunet-service-transport_ats.h
===================================================================
--- gnunet/src/transport/gnunet-service-transport_ats.h 2011-07-19 12:52:14 UTC
(rev 16121)
+++ gnunet/src/transport/gnunet-service-transport_ats.h 2011-07-19 12:56:55 UTC
(rev 16122)
@@ -504,12 +504,8 @@
void
ats_set_logging_options (struct ATS_Handle * ats,
- struct GNUNET_STATISTICS_Handle *stats,
- int minimum_addresses,
- int minimum_peers,
- int overwrite_dump,
- int log_solution,
- int log_problem);
+ struct GNUNET_STATISTICS_Handle *stats,
+ const struct GNUNET_CONFIGURATION_Handle *cfg);
#endif
/* end of file gnunet-service-transport_ats.h */
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [GNUnet-SVN] r16122 - gnunet/src/transport,
gnunet <=