aboutsummaryrefslogtreecommitdiff
path: root/src/ats
diff options
context:
space:
mode:
authorMatthias Wachs <wachs@net.in.tum.de>2013-07-03 15:20:12 +0000
committerMatthias Wachs <wachs@net.in.tum.de>2013-07-03 15:20:12 +0000
commitea04a93c9dd42a640509512f85aeac093c04ea2a (patch)
treea55064a36095bc60b7aa8387e157e2c3a82fb3e5 /src/ats
parent1da7ad0c7bbf692c89991c3d110fa8786ffe15a1 (diff)
downloadgnunet-ea04a93c9dd42a640509512f85aeac093c04ea2a.tar.gz
gnunet-ea04a93c9dd42a640509512f85aeac093c04ea2a.zip
removing breaks and output
Diffstat (limited to 'src/ats')
-rw-r--r--src/ats/gnunet-service-ats-solver_proportional.c17
1 files changed, 9 insertions, 8 deletions
diff --git a/src/ats/gnunet-service-ats-solver_proportional.c b/src/ats/gnunet-service-ats-solver_proportional.c
index 95d27e654..3aca61156 100644
--- a/src/ats/gnunet-service-ats-solver_proportional.c
+++ b/src/ats/gnunet-service-ats-solver_proportional.c
@@ -655,11 +655,12 @@ find_best_address_it (void *cls, const struct GNUNET_HashCode * key, void *value
655 655
656 norm_prop_cur = fba_ctx->s->get_properties (fba_ctx->s->get_properties_cls, 656 norm_prop_cur = fba_ctx->s->get_properties (fba_ctx->s->get_properties_cls,
657 (const struct ATS_Address *) current); 657 (const struct ATS_Address *) current);
658 GNUNET_break (0);
659 norm_prop_prev = fba_ctx->s->get_properties (fba_ctx->s->get_properties_cls, 658 norm_prop_prev = fba_ctx->s->get_properties (fba_ctx->s->get_properties_cls,
660 (const struct ATS_Address *) fba_ctx->best); 659 (const struct ATS_Address *) fba_ctx->best);
661 660/*
662 GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "%s previous %u current %u\n", "DISTANCE", norm_prop_cur[1], norm_prop_cur[1]); 661 GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "%s previous %.2f current %.2f\n",
662 "DISTANCE", norm_prop_cur[1], norm_prop_cur[1]);
663*/
663 index = find_property_index (GNUNET_ATS_QUALITY_NET_DISTANCE); 664 index = find_property_index (GNUNET_ATS_QUALITY_NET_DISTANCE);
664 if (GNUNET_SYSERR == index) 665 if (GNUNET_SYSERR == index)
665 { 666 {
@@ -672,8 +673,10 @@ find_best_address_it (void *cls, const struct GNUNET_HashCode * key, void *value
672 fba_ctx->best = current; 673 fba_ctx->best = current;
673 return GNUNET_OK; 674 return GNUNET_OK;
674 } 675 }
675 676/*
676 GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "%s previous %u current %u\n", "DELAY", norm_prop_cur[1], norm_prop_cur[1]); 677 GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "%s previous %.2f current %.2f\n",
678 "DELAY", norm_prop_cur[1], norm_prop_cur[1]);
679 */
677 index = find_property_index (GNUNET_ATS_QUALITY_NET_DELAY); 680 index = find_property_index (GNUNET_ATS_QUALITY_NET_DELAY);
678 if (GNUNET_SYSERR == index) 681 if (GNUNET_SYSERR == index)
679 { 682 {
@@ -1124,7 +1127,7 @@ GAS_proportional_bulk_stop (void *solver)
1124 s->bulk_lock --; 1127 s->bulk_lock --;
1125 if ((0 == s->bulk_lock) && (0 < s->bulk_requests)) 1128 if ((0 == s->bulk_lock) && (0 < s->bulk_requests))
1126 { 1129 {
1127 LOG (GNUNET_ERROR_TYPE_ERROR, "No lock pending, recalculating\n"); 1130 LOG (GNUNET_ERROR_TYPE_DEBUG, "No lock pending, recalculating\n");
1128 distribute_bandwidth_in_all_networks (s); 1131 distribute_bandwidth_in_all_networks (s);
1129 s->bulk_requests = 0; 1132 s->bulk_requests = 0;
1130 } 1133 }
@@ -1249,11 +1252,9 @@ GAS_proportional_address_update (void *solver,
1249 /* Have an alternative address to suggest */ 1252 /* Have an alternative address to suggest */
1250 s->bw_changed (s->bw_changed_cls, new); 1253 s->bw_changed (s->bw_changed_cls, new);
1251 } 1254 }
1252
1253 } 1255 }
1254 } 1256 }
1255 } 1257 }
1256
1257 break; 1258 break;
1258 case GNUNET_ATS_ARRAY_TERMINATOR: 1259 case GNUNET_ATS_ARRAY_TERMINATOR:
1259 break; 1260 break;