Merge branch 'master' of gitlab.inria.fr:qdufour/donar

This commit is contained in:
Quentin 2019-09-17 08:34:08 +02:00
commit 425091431a
2 changed files with 12 additions and 12 deletions

View file

@ -230,63 +230,63 @@ thunder_configure_full_parse:
thunder_configure_2_full:
./run-3 \
1,thunder_configure_2. \
12,thunder_configure_2. \
thunder-client 9900 30 100 2 50, \
thunder-client 9900 30 100 2 150, \
thunder-client 9900 30 100 2 200, \
thunder-client 9900 30 100 2 250, \
thunder-client 9900 30 100 2 350, \
thunder-client 9900 30 100 2 450, \
thunder-client 9900 30 100 2 550, \
thunder-client 9900 30 100 2 650, \
thunder-client 9900 30 100 4 50, \
thunder-client 9900 30 100 4 150, \
thunder-client 9900 30 100 4 200, \
thunder-client 9900 30 100 4 250, \
thunder-client 9900 30 100 4 350, \
thunder-client 9900 30 100 4 450, \
thunder-client 9900 30 100 4 550, \
thunder-client 9900 30 100 4 650, \
thunder-client 9900 30 100 6 50, \
thunder-client 9900 30 100 6 150, \
thunder-client 9900 30 100 6 200, \
thunder-client 9900 30 100 6 250, \
thunder-client 9900 30 100 6 350, \
thunder-client 9900 30 100 6 450, \
thunder-client 9900 30 100 6 550, \
thunder-client 9900 30 100 6 650, \
thunder-client 9900 30 100 8 50, \
thunder-client 9900 30 100 8 150, \
thunder-client 9900 30 100 8 200, \
thunder-client 9900 30 100 8 250, \
thunder-client 9900 30 100 8 350, \
thunder-client 9900 30 100 8 450, \
thunder-client 9900 30 100 8 550. \
thunder-client 9900 30 100 8 550, \
thunder-client 9900 30 100 8 650. \
thunder-server 2 50, \
thunder-server 2 150, \
thunder-server 2 200, \
thunder-server 2 250, \
thunder-server 2 350, \
thunder-server 2 450, \
thunder-server 2 550, \
thunder-server 2 650, \
thunder-server 4 50, \
thunder-server 4 150, \
thunder-server 4 200, \
thunder-server 4 250, \
thunder-server 4 350, \
thunder-server 4 450, \
thunder-server 4 550, \
thunder-server 4 650, \
thunder-server 6 50, \
thunder-server 6 150, \
thunder-server 6 200, \
thunder-server 6 250, \
thunder-server 6 350, \
thunder-server 6 450, \
thunder-server 6 550, \
thunder-server 6 650, \
thunder-server 8 50, \
thunder-server 8 150, \
thunder-server 8 200, \
thunder-server 8 250, \
thunder-server 8 350, \
thunder-server 8 450, \
thunder-server 8 550. \
thunder-server 8 550, \
thunder-server 8 650. \
tor2 -f /etc/torrc_simple, \
tor2 -f /etc/torrc_simple, \
tor2 -f /etc/torrc_simple, \

View file

@ -6,7 +6,7 @@
#include "timer.h"
#include "proxy.h"
#define PROBE_EVERY 5
#define PROBE_EVERY 3
uint64_t compute_delta(struct timespec* prev_time, uint64_t max, uint8_t update) {
struct timespec curr;
int secs, nsecs;