diff --git a/scripts/Makefile b/scripts/Makefile index 28ca5a4..608b6a5 100644 --- a/scripts/Makefile +++ b/scripts/Makefile @@ -228,6 +228,34 @@ thunder_configure_full_parse: @. parse_lib.sh && \ parse_thunder thunder_configure 6 +thunder_configure_2_part: + ./run-3 \ + 2,thunder_configure_2. \ + thunder-client 9900 30 100 2 ${jmax}, \ + thunder-client 9900 30 100 4 ${jmax}, \ + thunder-client 9900 30 100 6 ${jmax}, \ + thunder-client 9900 30 100 8 ${jmax}, \ + thunder-client 9900 30 100 12 ${jmax}, \ + thunder-client 9900 30 100 16 ${jmax}. \ + thunder-server 2 ${jmax}, \ + thunder-server 4 ${jmax}, \ + thunder-server 6 ${jmax}, \ + thunder-server 8 ${jmax}, \ + thunder-server 12 ${jmax}, \ + thunder-server 16 ${jmax}. \ + tor2 -f /etc/torrc_simple, \ + tor2 -f /etc/torrc_simple, \ + tor2 -f /etc/torrc_simple, \ + tor2 -f /etc/torrc_simple, \ + tor2 -f /etc/torrc_simple, \ + tor2 -f /etc/torrc_simple. \ + tor2 -f /etc/torrc_simple, \ + tor2 -f /etc/torrc_simple, \ + tor2 -f /etc/torrc_simple, \ + tor2 -f /etc/torrc_simple, \ + tor2 -f /etc/torrc_simple, \ + tor2 -f /etc/torrc_simple. + thunder_configure_2_full: ./run-3 \ 16,thunder_configure_2. \ diff --git a/src/algo_thunder.c b/src/algo_thunder.c index 3bcad7b..2443d74 100644 --- a/src/algo_thunder.c +++ b/src/algo_thunder.c @@ -6,7 +6,7 @@ #include "timer.h" #include "proxy.h" -#define PROBE_EVERY 3 +#define PROBE_EVERY 2 uint64_t compute_delta(struct timespec* prev_time, uint64_t max, uint8_t update) { struct timespec curr; int secs, nsecs; @@ -396,7 +396,8 @@ void adapt(struct evt_core_ctx* ctx, struct evt_core_fdinfo* fdinfo, struct buff int64_t estimation_index = i > sorted_occurencies - 1 ? sorted_occurencies - 1 : i; if (sorted_estimation[estimation_index] > thunderc->allowed_jitter_ms) { - continue; + printf("Would have dropped %d\n",i); + //continue; } // Find destination