X-Git-Url: http://git.onelab.eu/?p=distributedratelimiting.git;a=blobdiff_plain;f=drl%2Festimate.c;h=17a0fd89b5b69c646d1fbf193be1b5ae1c686e35;hp=ed08447b1b378413532acc2b5bf1427ae8f213d0;hb=f54a05e4b5bef7c5c90663765656a9084d622e82;hpb=19bf89f36a91be2fdd4a0b6c7099f7515507e1e1

diff --git a/drl/estimate.c b/drl/estimate.c
index ed08447..17a0fd8 100644
--- a/drl/estimate.c
+++ b/drl/estimate.c
@@ -18,8 +18,8 @@
 #include "ratetypes.h" /* needs util and pthread.h */
 #include "logging.h"
 
-static int underlimit_flowcount_count = 0;
-static int underlimit_normal_count = 0;
+extern uint8_t system_loglevel;
+static int printcounter = 8;
 
 /**
  * Called for each identity each estimate interval.  Uses flow table information
@@ -155,7 +155,8 @@ static uint32_t allocate_fps(identity_t *ident, double total_weight) {
 
     if (local_rate <= 0) {
         idealweight = 0;
-    } else if (dampen_increase == 0 && (ident->locallimit <= 0 || local_rate < ident->locallimit || ident->flowstart)) {
+    } else if (dampen_increase == 0 &&
+               (ident->locallimit <= 0 || local_rate < (ident->locallimit * CLOSE_ENOUGH) || ident->flowstart)) {
         /* We're under the limit - all flows are bottlenecked. */
         idealweight = allocate_fps_under_limit(ident, local_rate, peer_weights);
         ideal_over = allocate_fps_over_limit(ident);
@@ -165,11 +166,9 @@ static uint32_t allocate_fps(identity_t *ident, double total_weight) {
             idealweight = ideal_over;
             regime = 3;
             dampen = 2;
-            underlimit_flowcount_count += 1;
         } else {
             regime = 1;
             dampen = 0;
-            underlimit_normal_count += 1;
         }
 
         /* Apply EWMA */
@@ -228,14 +227,21 @@ static uint32_t allocate_fps(identity_t *ident, double total_weight) {
 
     printlog(LOG_DEBUG, "%.3f %.3f IdealUnd IdealOve\n",ideal_under,ideal_over);
 
-    printf("local_rate: %d, idealweight: %.3f, localweight: %.3f, total_weight: %.3f\n",
+    if (system_loglevel == LOG_DEBUG) {
+        printf("local_rate: %d, idealweight: %.3f, localweight: %.3f, total_weight: %.3f\n",
             local_rate, idealweight, ident->localweight, total_weight);
+    }
+
+    if (printcounter <= 0) {
+        printlog(LOG_WARN, "%d %.1f %.1f %.1f\n", local_rate, idealweight, ident->localweight, total_weight);
+        printcounter = 8;
+    } else {
+        printcounter -= 1;
+    }
 
     //printf("Dampen: %d, dampen_increase: %d, peer_weights: %.3f, regime: %d\n",
     //       dampen, dampen_increase, peer_weights, regime);
 
-    //printf("normal_count: %d, flowcount_count: %d\n", underlimit_normal_count, underlimit_flowcount_count);
-
     if (regime == 3) {
         printlog(LOG_DEBUG, "MIN: min said to use flow counting, which was %.3f when other method said %.3f.\n",
                  ideal_over, ideal_under);
@@ -260,8 +266,10 @@ static double allocate_grd(identity_t *ident, double aggdemand) {
         dropprob = 0.0;
     }
     
-    printf("local rate: %d, aggregate demand: %.3f, drop prob: %.3f\n",
+    if (system_loglevel == LOG_DEBUG) {
+        printf("local rate: %d, aggregate demand: %.3f, drop prob: %.3f\n",
            ident->common.rate, aggdemand, dropprob);
+    }
 
     return dropprob;
 }
@@ -349,7 +357,7 @@ static void enforce(limiter_t *limiter, identity_t *ident) {
              * FLOW_START_THRESHOLD. */
 
             if (ident->locallimit < FLOW_START_THRESHOLD) {
-                ident->locallimit = FLOW_START_THRESHOLD * 2;
+                ident->locallimit = FLOW_START_THRESHOLD;
             }
 
             /* Do not allow the node to set a limit higher than its
@@ -358,8 +366,11 @@ static void enforce(limiter_t *limiter, identity_t *ident) {
                 ident->locallimit = limiter->nodelimit;
             }
 
-            printf("FPS: Setting local limit to %d\n", ident->locallimit);
+            if (system_loglevel == LOG_DEBUG) {
+                printf("FPS: Setting local limit to %d\n", ident->locallimit);
+            }
             printlog(LOG_DEBUG, "%d Limit ID:%d\n", ident->locallimit, ident->id);
+            printlog(LOG_WARN, "%d\n", ident->locallimit);
 
             snprintf(cmd, CMD_BUFFER_SIZE,
                      "/sbin/tc class change dev eth0 parent 1:%x classid 1:%x htb rate 8bit ceil %dbps quantum 1600",