X-Git-Url: http://git.onelab.eu/?p=distributedratelimiting.git;a=blobdiff_plain;f=drl%2Festimate.c;h=80560eaeb0dbccdf52f3c813cfb350218a3f5ee6;hp=29704bee49307796bcb86c2458049405fe1f38f6;hb=1283484fb8f6a4531219984cf4d8d54e14a2ad05;hpb=fd949261f2be814d8deb410999e1dafcc2c5bb35 diff --git a/drl/estimate.c b/drl/estimate.c index 29704be..80560ea 100644 --- a/drl/estimate.c +++ b/drl/estimate.c @@ -105,8 +105,8 @@ static double allocate_fps_over_limit(identity_t *ident) { if (ident->common.max_flow_rate > 0) { ideal_weight = (double) ident->locallimit / (double) ident->common.max_flow_rate; - printlog(LOG_DEBUG, "%.3f %d %d FlowCount, TotalRate, MaxRate\n", - ideal_weight, ident->common.rate, ident->common.max_flow_rate); + printlog(LOG_DEBUG, "%.3f %d %d %d FlowCount, Limit, MaxRate, TotalRate\n", + ideal_weight, ident->locallimit, ident->common.max_flow_rate, ident->common.rate); } else { ideal_weight = 1; } @@ -122,7 +122,7 @@ static uint32_t allocate_fps(identity_t *ident, double total_weight) { common_accounting_t *ftable = &ident->common; /* Common flow table info */ uint32_t local_rate = ftable->rate; uint32_t ideallocal = 0; - double peer_weights; /* sum of weights of all other limiters */ + double peer_weights; /* sum of weights of all other limiters */ double idealweight = 0; double last_portion = 0; double this_portion = 0; @@ -237,7 +237,7 @@ static uint32_t allocate_fps(identity_t *ident, double total_weight) { } if (printcounter <= 0) { - printlog(LOG_WARN, "%d %.1f %.1f %.1f %d %d %d %d %d %d ", local_rate, idealweight, + printlog(LOG_WARN, "%d %.2f %.2f %.2f %d %d %d %d %d %d ", local_rate, idealweight, ident->localweight, total_weight, ftable->num_flows, ftable->num_flows_5k, ftable->num_flows_10k, ftable->num_flows_20k, ftable->num_flows_50k, ftable->avg_rate); printcounter = PRINT_COUNTER_RESET;