From 069db154e68a6da962deffdde9c4eff1a62e1402 Mon Sep 17 00:00:00 2001 From: Quentin Dufour Date: Wed, 5 Feb 2020 20:46:28 +0100 Subject: [PATCH] Better barrier --- scripts/container/dcall-dup2-client | 3 +-- scripts/container/dcall-dup2-server | 3 +-- scripts/container/dcall-dup2-server-single | 3 +-- scripts/container/dcall-lightning-client | 3 +-- scripts/container/dcall-lightning-server | 3 +-- scripts/container/dcall-lightning-server-single | 3 +-- scripts/container/dcall-simple-client | 3 +-- scripts/container/dcall-simple-server | 3 +-- scripts/container/dcall-simple-server-single | 3 +-- scripts/container/sync_barrier_donar | 12 ++++++++++++ 10 files changed, 21 insertions(+), 18 deletions(-) create mode 100755 scripts/container/sync_barrier_donar diff --git a/scripts/container/dcall-dup2-client b/scripts/container/dcall-dup2-client index 9f0fff9..04d05b2 100755 --- a/scripts/container/dcall-dup2-client +++ b/scripts/container/dcall-dup2-client @@ -11,9 +11,8 @@ donar \ -r 5000 \ > $3/log/client-donar-stdout.log 2> $3/log/client-donar-stderr.log & -measlat -h 127.13.3.7 -p 5000 -c 1 \ +sync_barrier_donar \ > $4/log/client-measboot-stdout.log 2> $4/log/client-measboot-stderr.log -sleep 10 dcall \ -t filesrc \ diff --git a/scripts/container/dcall-dup2-server b/scripts/container/dcall-dup2-server index d1dff27..8dc7358 100755 --- a/scripts/container/dcall-dup2-server +++ b/scripts/container/dcall-dup2-server @@ -11,9 +11,8 @@ donar \ -r 5000 \ > ../log/server-donar-stdout.log 2> ../log/server-donar-stderr.log & -measlat -l -h 127.0.0.1 -p 5000 -r -c 1 \ +sync_barrier_donar \ > ../log/server-measboot-stdout.log 2> ../log/server-measboot-stderr.log -sleep 10 dcall \ -t filesrc \ diff --git a/scripts/container/dcall-dup2-server-single b/scripts/container/dcall-dup2-server-single index e11796f..59ad85c 100755 --- a/scripts/container/dcall-dup2-server-single +++ b/scripts/container/dcall-dup2-server-single @@ -12,9 +12,8 @@ donar \ -r 5000 \ > ../log/server-donar-stdout.log 2> ../log/server-donar-stderr.log & -measlat -l -h 127.0.0.1 -p 5000 -r -c 1 \ +sync_barrier_donar \ > ../log/server-measboot-stdout.log 2> ../log/server-measboot-stderr.log & -sleep 10 dcall \ -t filesrc \ diff --git a/scripts/container/dcall-lightning-client b/scripts/container/dcall-lightning-client index ecfe17c..d31305c 100755 --- a/scripts/container/dcall-lightning-client +++ b/scripts/container/dcall-lightning-client @@ -12,9 +12,8 @@ donar \ -r 5000 \ > $4/log/client-donar-stdout.log 2> $4/log/client-donar-stderr.log & -measlat -h 127.13.3.7 -p 5000 -c 1 \ +sync_barrier_donar \ > $4/log/client-measboot-stdout.log 2> $4/log/client-measboot-stderr.log -sleep 10 dcall \ -t filesrc \ diff --git a/scripts/container/dcall-lightning-server b/scripts/container/dcall-lightning-server index f81d6d6..c1aa938 100755 --- a/scripts/container/dcall-lightning-server +++ b/scripts/container/dcall-lightning-server @@ -12,9 +12,8 @@ donar \ -r 5000 \ > ../log/server-donar-stdout.log 2> ../log/server-donar-stderr.log & -measlat -l -h 127.0.0.1 -p 5000 -r -c 1 \ +sync_barrier_donar \ > ../log/server-measboot-stdout.log 2> ../log/server-measboot-stderr.log -sleep 10 dcall \ -t filesrc \ diff --git a/scripts/container/dcall-lightning-server-single b/scripts/container/dcall-lightning-server-single index ec37771..9c9fead 100755 --- a/scripts/container/dcall-lightning-server-single +++ b/scripts/container/dcall-lightning-server-single @@ -13,9 +13,8 @@ donar \ -r 5000 \ > ../log/server-donar-stdout.log 2> ../log/server-donar-stderr.log & -measlat -l -h 127.0.0.1 -p 5000 -r -c 1 \ +sync_barrier_donar \ > ../log/server-measboot-stdout.log 2> ../log/server-measboot-stderr.log & -sleep 10 dcall \ -t filesrc \ diff --git a/scripts/container/dcall-simple-client b/scripts/container/dcall-simple-client index 9a7214f..9a59674 100755 --- a/scripts/container/dcall-simple-client +++ b/scripts/container/dcall-simple-client @@ -11,9 +11,8 @@ donar \ -r 5000 \ > $3/log/client-donar-stdout.log 2> $3/log/client-donar-stderr.log & -measlat -h 127.13.3.7 -p 5000 -c 1 \ +sync_barrier_donar \ > $4/log/client-measboot-stdout.log 2> $4/log/client-measboot-stderr.log -sleep 10 dcall \ -t filesrc \ diff --git a/scripts/container/dcall-simple-server b/scripts/container/dcall-simple-server index 89f9214..d3c2898 100755 --- a/scripts/container/dcall-simple-server +++ b/scripts/container/dcall-simple-server @@ -11,9 +11,8 @@ donar \ -r 5000 \ > ../log/server-donar-stdout.log 2> ../log/server-donar-stderr.log & -measlat -l -h 127.0.0.1 -p 5000 -r -c 1 \ +sync_barrier_donar \ > ../log/server-measboot-stdout.log 2> ../log/server-measboot-stderr.log -sleep 10 dcall \ -t filesrc \ diff --git a/scripts/container/dcall-simple-server-single b/scripts/container/dcall-simple-server-single index 22930bd..0af29ee 100755 --- a/scripts/container/dcall-simple-server-single +++ b/scripts/container/dcall-simple-server-single @@ -11,9 +11,8 @@ donar \ -r 5000 \ > ../log/server-donar-stdout.log 2> ../log/server-donar-stderr.log & -measlat -l -h 127.0.0.1 -p 5000 -r -c 1 \ +sync_barrier_donar \ > ../log/server-measboot-stdout.log 2> ../log/server-measboot-stderr.log & -sleep 10 dcall \ -t filesrc \ diff --git a/scripts/container/sync_barrier_donar b/scripts/container/sync_barrier_donar new file mode 100755 index 0000000..c322268 --- /dev/null +++ b/scripts/container/sync_barrier_donar @@ -0,0 +1,12 @@ +#!/bin/bash + +sleep 1 +echo "sync_barrier_start" +nc -u 127.13.3.7 5000 --sh-exec 'while true; do sleep 1; echo a; done' & +CAPTURE=$! +nc -ul 127.0.0.1 5000 --exec /bin/true +echo "sync_barrier_release" +sleep 1 +kill $CAPTURE +sleep 10 +echo "sync_barrier_done"