#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;
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;
}
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;
}
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);
+ 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;