diff options
author | Matthias Wachs <wachs@net.in.tum.de> | 2014-05-05 15:07:34 +0000 |
---|---|---|
committer | Matthias Wachs <wachs@net.in.tum.de> | 2014-05-05 15:07:34 +0000 |
commit | 8bcdff5d767e60d678a2eff637ae84d71665883e (patch) | |
tree | e9ac6a02561fcd9338e357aa9dc51a34d8e77010 /src/ats/gnunet-ats-solver-eval.c | |
parent | 5b96946e6dcb61d9b32227bc510f2a8ea0a96893 (diff) | |
download | gnunet-8bcdff5d767e60d678a2eff637ae84d71665883e.tar.gz gnunet-8bcdff5d767e60d678a2eff637ae84d71665883e.zip |
improved logging for eval tool
fix for proportional solver: reset calculated quota after assigning
Diffstat (limited to 'src/ats/gnunet-ats-solver-eval.c')
-rw-r--r-- | src/ats/gnunet-ats-solver-eval.c | 35 |
1 files changed, 26 insertions, 9 deletions
diff --git a/src/ats/gnunet-ats-solver-eval.c b/src/ats/gnunet-ats-solver-eval.c index 7a74833e8..c1ab82991 100644 --- a/src/ats/gnunet-ats-solver-eval.c +++ b/src/ats/gnunet-ats-solver-eval.c | |||
@@ -230,7 +230,7 @@ GNUNET_ATS_solver_logging_now (struct LoggingHandle *l) | |||
230 | } | 230 | } |
231 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "\t Active = %i\n", log_a->active); | 231 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "\t Active = %i\n", log_a->active); |
232 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "\t BW in = %llu\n", ntohl(log_a->assigned_bw_in.value__)); | 232 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "\t BW in = %llu\n", ntohl(log_a->assigned_bw_in.value__)); |
233 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "\t BW out = %llu\n", ntohl(log_a->assigned_bw_out.value__)); | 233 | GNUNET_log (GNUNET_ERROR_TYPE_INFO, "\t BW out = %llu\n", ntohl(log_a->assigned_bw_out.value__)); |
234 | 234 | ||
235 | GNUNET_CONTAINER_DLL_insert_tail (log_p->addr_head, log_p->addr_tail, log_a); | 235 | GNUNET_CONTAINER_DLL_insert_tail (log_p->addr_head, log_p->addr_tail, log_a); |
236 | } | 236 | } |
@@ -345,22 +345,22 @@ GNUNET_ATS_solver_logging_write_to_disk (struct LoggingHandle *l, int add_time_s | |||
345 | cur->pid = log_p->id; | 345 | cur->pid = log_p->id; |
346 | 346 | ||
347 | if (GNUNET_YES == add_time_stamp) | 347 | if (GNUNET_YES == add_time_stamp) |
348 | GNUNET_asprintf (&filename, "%s%s%s_%s_%u_%u_%llu.log", | 348 | GNUNET_asprintf (&filename, "%s%s%s_%s_p%u_a%u_%llu.log", |
349 | (GNUNET_YES == use_dir) ? output_dir : "", | 349 | (GNUNET_YES == use_dir) ? output_dir : "", |
350 | (GNUNET_YES == use_dir) ? DIR_SEPARATOR_STR : "", | 350 | (GNUNET_YES == use_dir) ? DIR_SEPARATOR_STR : "", |
351 | e->log_prefix, | 351 | e->log_prefix, |
352 | opt_solver, | 352 | opt_solver, |
353 | cur->aid, | ||
354 | cur->pid, | 353 | cur->pid, |
354 | cur->aid, | ||
355 | l->head->timestamp.abs_value_us); | 355 | l->head->timestamp.abs_value_us); |
356 | else | 356 | else |
357 | GNUNET_asprintf (&filename, "%s%s%s_%s_%u_%u.log", | 357 | GNUNET_asprintf (&filename, "%s%s%s_%s_p%u_a%u.log", |
358 | (GNUNET_YES == use_dir) ? output_dir : "", | 358 | (GNUNET_YES == use_dir) ? output_dir : "", |
359 | (GNUNET_YES == use_dir) ? DIR_SEPARATOR_STR : "", | 359 | (GNUNET_YES == use_dir) ? DIR_SEPARATOR_STR : "", |
360 | e->log_prefix, | 360 | e->log_prefix, |
361 | opt_solver, | 361 | opt_solver, |
362 | cur->aid, | 362 | cur->pid, |
363 | cur->pid); | 363 | cur->aid); |
364 | 364 | ||
365 | fprintf (stderr, "Add writing log data for peer %llu address %llu to file `%s'\n", | 365 | fprintf (stderr, "Add writing log data for peer %llu address %llu to file `%s'\n", |
366 | cur->pid, cur->aid, filename); | 366 | cur->pid, cur->aid, filename); |
@@ -2131,13 +2131,19 @@ enforce_del_address (struct GNUNET_ATS_TEST_Operation *op) | |||
2131 | GNUNET_ATS_solver_generate_property_stop (pg); | 2131 | GNUNET_ATS_solver_generate_property_stop (pg); |
2132 | } | 2132 | } |
2133 | 2133 | ||
2134 | GNUNET_CONTAINER_DLL_remove(p->addr_head, p->addr_tail, a); | ||
2135 | GNUNET_CONTAINER_multipeermap_remove (sh->addresses, &p->peer_id, a->ats_addr); | 2134 | GNUNET_CONTAINER_multipeermap_remove (sh->addresses, &p->peer_id, a->ats_addr); |
2136 | 2135 | ||
2137 | GNUNET_log (GNUNET_ERROR_TYPE_INFO, "Removing address %u for peer %u\n", | 2136 | GNUNET_log (GNUNET_ERROR_TYPE_INFO, "Removing address %u for peer %u\n", |
2138 | op->address_id, op->peer_id); | 2137 | op->address_id, op->peer_id); |
2139 | 2138 | ||
2140 | sh->env.sf.s_del (sh->solver, a->ats_addr, GNUNET_NO); | 2139 | sh->env.sf.s_del (sh->solver, a->ats_addr, GNUNET_NO); |
2140 | |||
2141 | if (NULL != l) | ||
2142 | { | ||
2143 | GNUNET_ATS_solver_logging_now (l); | ||
2144 | } | ||
2145 | GNUNET_CONTAINER_DLL_remove(p->addr_head, p->addr_tail, a); | ||
2146 | |||
2141 | GNUNET_free_non_null(a->ats_addr->atsi); | 2147 | GNUNET_free_non_null(a->ats_addr->atsi); |
2142 | GNUNET_free (a->ats_addr); | 2148 | GNUNET_free (a->ats_addr); |
2143 | GNUNET_free (a); | 2149 | GNUNET_free (a); |
@@ -2252,10 +2258,12 @@ enforce_start_request (struct GNUNET_ATS_TEST_Operation *op) | |||
2252 | res = sh->env.sf.s_get (sh->solver, &p->peer_id); | 2258 | res = sh->env.sf.s_get (sh->solver, &p->peer_id); |
2253 | if (NULL != res) | 2259 | if (NULL != res) |
2254 | { | 2260 | { |
2255 | GNUNET_log (GNUNET_ERROR_TYPE_INFO, "Requesting address for peer %u: %llu %llu\n", | 2261 | GNUNET_log (GNUNET_ERROR_TYPE_INFO, "Suggested address for peer %u: %llu %llu\n", |
2256 | op->peer_id, | 2262 | op->peer_id, |
2257 | ntohl(res->assigned_bw_in.value__), | 2263 | ntohl(res->assigned_bw_in.value__), |
2258 | ntohl(res->assigned_bw_out.value__)); | 2264 | ntohl(res->assigned_bw_out.value__)); |
2265 | if (NULL != l) | ||
2266 | GNUNET_ATS_solver_logging_now (l); | ||
2259 | } | 2267 | } |
2260 | } | 2268 | } |
2261 | 2269 | ||
@@ -2276,6 +2284,12 @@ enforce_stop_request (struct GNUNET_ATS_TEST_Operation *op) | |||
2276 | op->peer_id); | 2284 | op->peer_id); |
2277 | 2285 | ||
2278 | sh->env.sf.s_get_stop (sh->solver, &p->peer_id); | 2286 | sh->env.sf.s_get_stop (sh->solver, &p->peer_id); |
2287 | |||
2288 | if (NULL != l) | ||
2289 | { | ||
2290 | GNUNET_ATS_solver_logging_now (l); | ||
2291 | } | ||
2292 | |||
2279 | } | 2293 | } |
2280 | 2294 | ||
2281 | static void enforce_episode (struct Episode *ep) | 2295 | static void enforce_episode (struct Episode *ep) |
@@ -2782,10 +2796,13 @@ solver_bandwidth_changed_cb (void *cls, struct ATS_Address *address) | |||
2782 | "Bandwidth changed addresses %s %p to %u Bps out / %u Bps in\n", | 2796 | "Bandwidth changed addresses %s %p to %u Bps out / %u Bps in\n", |
2783 | GNUNET_i2s (&address->peer), | 2797 | GNUNET_i2s (&address->peer), |
2784 | address, | 2798 | address, |
2785 | (unsigned int) ntohl (address->assigned_bw_out.value__), | 2799 | (unsigned int) ntohl (address->assigned_bw_out.value__), |
2786 | (unsigned int) ntohl (address->assigned_bw_in.value__)); | 2800 | (unsigned int) ntohl (address->assigned_bw_in.value__)); |
2787 | /*if (GNUNET_YES == ph.bulk_running) | 2801 | /*if (GNUNET_YES == ph.bulk_running) |
2788 | GNUNET_break (0);*/ | 2802 | GNUNET_break (0);*/ |
2803 | if (NULL != l) | ||
2804 | GNUNET_ATS_solver_logging_now (l); | ||
2805 | |||
2789 | return; | 2806 | return; |
2790 | } | 2807 | } |
2791 | 2808 | ||