quentin/tor_multipath_voip
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

fix measlat again

Browse source
This commit is contained in:
Quentin 2020-02-05 10:52:21 +01:00
parent 23491bd692
commit 119a82d593
11 changed files with 15 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
scripts/container/dcall-dup2-client
View file

@ -11,7 +11,7 @@ donar \
-r 5000 \ -r 5000 \
> $3/log/client-donar-stdout.log 2> $3/log/client-donar-stderr.log & > $3/log/client-donar-stdout.log 2> $3/log/client-donar-stderr.log &
measlat -h 127.13.3.7 -p 5000 -c 2 \ measlat -h 127.13.3.7 -p 5000 -c 1 \
> $4/log/client-measboot-stdout.log 2> $4/log/client-measboot-stderr.log > $4/log/client-measboot-stdout.log 2> $4/log/client-measboot-stderr.log
sleep 10 sleep 10

2
scripts/container/dcall-dup2-server
View file

@ -11,7 +11,7 @@ donar \
-r 5000 \ -r 5000 \
> ../log/server-donar-stdout.log 2> ../log/server-donar-stderr.log & > ../log/server-donar-stdout.log 2> ../log/server-donar-stderr.log &
measlat -l -h 127.0.0.1 -p 5000 -r -c 2 \ measlat -l -h 127.0.0.1 -p 5000 -r -c 1 \
> ../log/server-measboot-stdout.log 2> ../log/server-measboot-stderr.log & > ../log/server-measboot-stdout.log 2> ../log/server-measboot-stderr.log &
sleep 10 sleep 10

2
scripts/container/dcall-dup2-server-single
View file

@ -12,7 +12,7 @@ donar \
-r 5000 \ -r 5000 \
> ../log/server-donar-stdout.log 2> ../log/server-donar-stderr.log & > ../log/server-donar-stdout.log 2> ../log/server-donar-stderr.log &
measlat -l -h 127.0.0.1 -p 5000 -r -c 2 \ measlat -l -h 127.0.0.1 -p 5000 -r -c 1 \
> ../log/server-measboot-stdout.log 2> ../log/server-measboot-stderr.log & > ../log/server-measboot-stdout.log 2> ../log/server-measboot-stderr.log &
sleep 10 sleep 10

2
scripts/container/dcall-lightning-client
View file

@ -12,7 +12,7 @@ donar \
-r 5000 \ -r 5000 \
> $4/log/client-donar-stdout.log 2> $4/log/client-donar-stderr.log & > $4/log/client-donar-stdout.log 2> $4/log/client-donar-stderr.log &
measlat -h 127.13.3.7 -p 5000 -c 2 \ measlat -h 127.13.3.7 -p 5000 -c 1 \
> $4/log/client-measboot-stdout.log 2> $4/log/client-measboot-stderr.log > $4/log/client-measboot-stdout.log 2> $4/log/client-measboot-stderr.log
sleep 10 sleep 10

2
scripts/container/dcall-lightning-server
View file

@ -12,7 +12,7 @@ donar \
-r 5000 \ -r 5000 \
> ../log/server-donar-stdout.log 2> ../log/server-donar-stderr.log & > ../log/server-donar-stdout.log 2> ../log/server-donar-stderr.log &
measlat -l -h 127.0.0.1 -p 5000 -r -c 2 \ measlat -l -h 127.0.0.1 -p 5000 -r -c 1 \
> ../log/server-measboot-stdout.log 2> ../log/server-measboot-stderr.log & > ../log/server-measboot-stdout.log 2> ../log/server-measboot-stderr.log &
sleep 10 sleep 10

2
scripts/container/dcall-lightning-server-single
View file

@ -13,7 +13,7 @@ donar \
-r 5000 \ -r 5000 \
> ../log/server-donar-stdout.log 2> ../log/server-donar-stderr.log & > ../log/server-donar-stdout.log 2> ../log/server-donar-stderr.log &
measlat -l -h 127.0.0.1 -p 5000 -r -c 2 \ measlat -l -h 127.0.0.1 -p 5000 -r -c 1 \
> ../log/server-measboot-stdout.log 2> ../log/server-measboot-stderr.log & > ../log/server-measboot-stdout.log 2> ../log/server-measboot-stderr.log &
sleep 10 sleep 10

2
scripts/container/dcall-simple-client
View file

@ -11,7 +11,7 @@ donar \
-r 5000 \ -r 5000 \
> $3/log/client-donar-stdout.log 2> $3/log/client-donar-stderr.log & > $3/log/client-donar-stdout.log 2> $3/log/client-donar-stderr.log &
measlat -h 127.13.3.7 -p 5000 -c 2 \ measlat -h 127.13.3.7 -p 5000 -c 1 \
> $4/log/client-measboot-stdout.log 2> $4/log/client-measboot-stderr.log > $4/log/client-measboot-stdout.log 2> $4/log/client-measboot-stderr.log
sleep 10 sleep 10

2
scripts/container/dcall-simple-server
View file

@ -11,7 +11,7 @@ donar \
-r 5000 \ -r 5000 \
> ../log/server-donar-stdout.log 2> ../log/server-donar-stderr.log & > ../log/server-donar-stdout.log 2> ../log/server-donar-stderr.log &
measlat -l -h 127.0.0.1 -p 5000 -r -c 2 \ measlat -l -h 127.0.0.1 -p 5000 -r -c 1 \
> ../log/server-measboot-stdout.log 2> ../log/server-measboot-stderr.log & > ../log/server-measboot-stdout.log 2> ../log/server-measboot-stderr.log &
sleep 10 sleep 10

2
scripts/container/dcall-simple-server-single
View file

@ -11,7 +11,7 @@ donar \
-r 5000 \ -r 5000 \
> ../log/server-donar-stdout.log 2> ../log/server-donar-stderr.log & > ../log/server-donar-stdout.log 2> ../log/server-donar-stderr.log &
measlat -l -h 127.0.0.1 -p 5000 -r -c 2 \ measlat -l -h 127.0.0.1 -p 5000 -r -c 1 \
> ../log/server-measboot-stdout.log 2> ../log/server-measboot-stderr.log & > ../log/server-measboot-stdout.log 2> ../log/server-measboot-stderr.log &
sleep 10 sleep 10

6
src/meas_lat.c
View file

@ -115,6 +115,12 @@ int on_receive_measure_packet(struct evt_core_ctx* ctx, struct evt_core_fdinfo*
register_timer (ctx, &next_tick); register_timer (ctx, &next_tick);
} }
struct measure_packet* head = (struct measure_packet*) mctx->mc.payload_rcv;
if ((!mctx->mc.is_server || mctx->mc.is_rtt) && head->counter >= mctx->mc.max_measure) {
printf("Measurement done\n");
exit(EXIT_SUCCESS);
}
return 0; return 0;
} }

5
src/measure.c
View file

@ -43,11 +43,6 @@ void measure_parse(int size, struct measure_conf* mc) {
is_slow, is_slow,
link_id, link_id,
is_vanilla); is_vanilla);
if ((!mc->is_server || mc->is_rtt) && head->counter >= mc->max_measure) {
printf("Measurement done\n");
exit(EXIT_SUCCESS);
}
} }
void measure_prepare(struct measure_conf* mc) { void measure_prepare(struct measure_conf* mc) {