Additional stat tracking for data processing.

[distributedratelimiting.git] / drl / estimate.c

diff --git a/drl/estimate.c b/drl/estimate.c
index 80560ea..bfe22c5 100644 (file)
--- a/drl/estimate.c
+++ b/drl/estimate.c
@@ -18,7 +18,7 @@
 #include "ratetypes.h" /* needs util and pthread.h */
 #include "logging.h"
 
-#define PRINT_COUNTER_RESET (7)
+#define PRINT_COUNTER_RESET (0)
 
 extern uint8_t system_loglevel;
 static int printcounter = PRINT_COUNTER_RESET - 1;
@@ -237,9 +237,17 @@ static uint32_t allocate_fps(identity_t *ident, double total_weight) {
     }
 
     if (printcounter <= 0) {
-        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);
+        struct timeval tv;
+        double time_now;
+
+        gettimeofday(&tv, NULL);
+        time_now = (double) tv.tv_sec + (double) ((double) tv.tv_usec / (double) 1000000);
+
+        printlog(LOG_WARN, "%.2f %d %.2f %.2f %.2f %d %d %d %d %d %d %d %d", time_now, ftable->inst_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,
+            ftable->max_flow_rate, ftable->max_flow_rate_flow_hash);
+
         printcounter = PRINT_COUNTER_RESET;
     } else {
         printcounter -= 1;