X-Git-Url: http://git.onelab.eu/?p=distributedratelimiting.git;a=blobdiff_plain;f=drl%2Festimate.c;h=29704bee49307796bcb86c2458049405fe1f38f6;hp=e55639bfd96b6bc521d809c240f50f88d87639e1;hb=a3ef11b996352e66f4031c684c7dcda536bc3bf1;hpb=72b9872d1025afa4e1db53b6bc0d4a00a5afd123

diff --git a/drl/estimate.c b/drl/estimate.c
index e55639b..29704be 100644
--- a/drl/estimate.c
+++ b/drl/estimate.c
@@ -18,9 +18,12 @@
 #include "ratetypes.h" /* needs util and pthread.h */
 #include "logging.h"
 
-static int underlimit_flowcount_count = 0;
-static int underlimit_normal_count = 0;
+#define PRINT_COUNTER_RESET (7)
+
 extern uint8_t system_loglevel;
+static int printcounter = PRINT_COUNTER_RESET - 1;
+
+uint8_t do_enforcement = 0;
 
 /**
  * Called for each identity each estimate interval.  Uses flow table information
@@ -156,7 +159,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);
@@ -166,11 +170,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 */
@@ -234,11 +236,18 @@ static uint32_t allocate_fps(identity_t *ident, double total_weight) {
             local_rate, idealweight, ident->localweight, total_weight);
     }
 
+    if (printcounter <= 0) {
+        printlog(LOG_WARN, "%d %.1f %.1f %.1f %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;
+    } 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);
@@ -354,7 +363,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
@@ -368,14 +377,21 @@ static void enforce(limiter_t *limiter, identity_t *ident) {
             }
             printlog(LOG_DEBUG, "%d Limit ID:%d\n", ident->locallimit, ident->id);
 
+            if (printcounter == PRINT_COUNTER_RESET) {
+                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",
                      ident->htb_parent, ident->htb_node, ident->locallimit);
 
-            ret = system(cmd);
+            if (do_enforcement) {
+                ret = system(cmd);
 
-            if (ret) {
-                /* FIXME: call failed.  What to do? */
+                if (ret) {
+                    /* FIXME: call failed.  What to do? */
+                    printlog(LOG_CRITICAL, "***TC call failed?***\n");
+                }
             }
             break;
 
@@ -419,10 +435,13 @@ static void enforce(limiter_t *limiter, identity_t *ident) {
                          ident->leaves[i]->xid, ident->leaves[i]->xid,
                          (100 * ident->leaves[i]->drop_prob));
 #endif
-                ret = system(cmd);
+                if (do_enforcement) {
+                    ret = system(cmd);
 
-                if (ret) {
-                    /* FIXME: call failed.  What to do? */
+                    if (ret) {
+                        /* FIXME: call failed.  What to do? */
+                        printlog(LOG_CRITICAL, "***TC call failed?***\n");
+                    }
                 }
             }
 
@@ -492,6 +511,7 @@ void handle_estimation(void *arg) {
 
     sigemptyset(&signal_mask);
     sigaddset(&signal_mask, SIGHUP);
+    sigaddset(&signal_mask, SIGUSR1);
     pthread_sigmask(SIG_BLOCK, &signal_mask, NULL);
 
     /* Determine the number of intervals we should wait before hitting the