From fe435539b0cdd528db1aa558ee37c1389cc8692b Mon Sep 17 00:00:00 2001 From: Quentin Dufour Date: Mon, 1 Apr 2019 11:12:38 +0200 Subject: [PATCH] Remove valgrind --- scripts/naive-client | 2 +- scripts/naive-server | 2 +- scripts/rr-client | 2 +- scripts/rr-server | 2 +- scripts/rrh-client | 2 +- scripts/rrh-server | 2 +- src/meas_lat.c | 1 - 7 files changed, 6 insertions(+), 7 deletions(-) diff --git a/scripts/naive-client b/scripts/naive-client index 8cb18c6..7e6c16a 100755 --- a/scripts/naive-client +++ b/scripts/naive-client @@ -3,7 +3,7 @@ mkdir -p ./log tor -f /etc/torrc > ./log/client-tor-stdout.log 2> ./log/client-tor-stderr.log & sleep 2 mkdir -p ./shared -valgrind donar -a naive -c -o ./shared/onion_services.pub -r 9000 > ./log/client-donar-stdout.log 2> ./log/client-donar-stderr.log & +donar -a naive -c -o ./shared/onion_services.pub -r 9000 > ./log/client-donar-stdout.log 2> ./log/client-donar-stderr.log & sleep 2 measlat -h 127.13.3.7 -p 9000 > /dev/null 2>&1 # Used to wait for connections measlat -h 127.13.3.7 -p 9000 -c $1 -i $2 -s $3 > ./res/naive.csv 2> ./log/client-measlat-stderr.log diff --git a/scripts/naive-server b/scripts/naive-server index a5a16d1..71ab544 100755 --- a/scripts/naive-server +++ b/scripts/naive-server @@ -5,5 +5,5 @@ sleep 2 mkdir -p ./shared cd ./shared pwd -valgrind donar -a naive -s -e 9000 > ../log/server-donar-stdout.log 2> ../log/server-donar-stderr.log & +donar -a naive -s -e 9000 > ../log/server-donar-stdout.log 2> ../log/server-donar-stderr.log & udpecho -p 9000 > ../log/server-udpecho-stdout.log 2> ../log/server-udpecho-stderr.log diff --git a/scripts/rr-client b/scripts/rr-client index f0e8329..1dab393 100755 --- a/scripts/rr-client +++ b/scripts/rr-client @@ -3,7 +3,7 @@ mkdir -p ./log tor -f /etc/torrc > ./log/client-tor-stdout.log 2> ./log/client-tor-stderr.log & sleep 2 mkdir -p ./shared -valgrind donar -a rr -b -c -o ./shared/onion_services.pub -r 9000 > ./log/client-donar-stdout.log 2> ./log/client-donar-stderr.log & +donar -a rr -b -c -o ./shared/onion_services.pub -r 9000 > ./log/client-donar-stdout.log 2> ./log/client-donar-stderr.log & sleep 2 measlat -h 127.13.3.7 -p 9000 > /dev/null 2>&1 # Used to wait for connections measlat -h 127.13.3.7 -p 9000 -c $1 -i $2 -s $3 > ./res/rr.csv 2> ./log/client-measlat-stderr.log diff --git a/scripts/rr-server b/scripts/rr-server index 35a8752..b7ceb86 100755 --- a/scripts/rr-server +++ b/scripts/rr-server @@ -5,5 +5,5 @@ sleep 2 mkdir -p ./shared cd ./shared pwd -valgrind donar -a rr -b -s -e 9000 > ../log/server-donar-stdout.log 2> ../log/server-donar-stderr.log & +donar -a rr -b -s -e 9000 > ../log/server-donar-stdout.log 2> ../log/server-donar-stderr.log & udpecho -p 9000 > ../log/server-udpecho-stdout.log 2> ../log/server-udpecho-stderr.log diff --git a/scripts/rrh-client b/scripts/rrh-client index 5d8564d..f9c6805 100755 --- a/scripts/rrh-client +++ b/scripts/rrh-client @@ -3,7 +3,7 @@ mkdir -p ./log tor -f /etc/torrc > ./log/client-tor-stdout.log 2> ./log/client-tor-stderr.log & sleep 2 mkdir -p ./shared -valgrind donar -a rr -b -h -c -o ./shared/onion_services.pub -r 9000 > ./log/client-donar-stdout.log 2> ./log/client-donar-stderr.log & +donar -a rr -b -h -c -o ./shared/onion_services.pub -r 9000 > ./log/client-donar-stdout.log 2> ./log/client-donar-stderr.log & sleep 2 measlat -h 127.13.3.7 -p 9000 > /dev/null 2>&1 # Used to wait for connections measlat -h 127.13.3.7 -p 9000 -c $1 -i $2 -s $3 > ./res/rrh.csv 2> ./log/client-measlat-stderr.log diff --git a/scripts/rrh-server b/scripts/rrh-server index e357adf..e0db554 100755 --- a/scripts/rrh-server +++ b/scripts/rrh-server @@ -5,5 +5,5 @@ sleep 2 mkdir -p ./shared cd ./shared pwd -valgrind donar -a rr -b -h -s -e 9000 > ../log/server-donar-stdout.log 2> ../log/server-donar-stderr.log & +donar -a rr -b -h -s -e 9000 > ../log/server-donar-stdout.log 2> ../log/server-donar-stderr.log & udpecho -p 9000 > ../log/server-udpecho-stdout.log 2> ../log/server-udpecho-stderr.log diff --git a/src/meas_lat.c b/src/meas_lat.c index 1eb76ed..6c16a93 100644 --- a/src/meas_lat.c +++ b/src/meas_lat.c @@ -61,7 +61,6 @@ int on_udp(struct evt_core_ctx* ctx, struct evt_core_fdinfo* fdinfo) { struct measure_conf* mc = fdinfo->other; res = read(fdinfo->fd, mc->payload, mc->payload_size); if (res == -1 && errno == EAGAIN) return 1; - if (res != mc->payload_size) { perror("read error"); exit(EXIT_FAILURE);