Commit 9c4656a1 authored by rna's avatar rna
Browse files

Add iperf3. Uncomment test code.

parent 9c0e3412
Pipeline #2981 passed with stages
in 3 minutes and 51 seconds
...@@ -7,6 +7,7 @@ ENV DEBIAN_FRONTEND noninteractive ...@@ -7,6 +7,7 @@ ENV DEBIAN_FRONTEND noninteractive
RUN apt-get update && apt-get install --yes --force-yes \ RUN apt-get update && apt-get install --yes --force-yes \
bc \ bc \
cmake \ cmake \
iperf3 \
psmisc \ psmisc \
traceroute \ traceroute \
tshark tshark
......
...@@ -7,6 +7,7 @@ ENV DEBIAN_FRONTEND noninteractive ...@@ -7,6 +7,7 @@ ENV DEBIAN_FRONTEND noninteractive
RUN apt-get update && apt-get install --yes --force-yes \ RUN apt-get update && apt-get install --yes --force-yes \
bc \ bc \
cmake \ cmake \
iperf3 \
psmisc \ psmisc \
traceroute \ traceroute \
tshark tshark
......
...@@ -74,22 +74,23 @@ else ...@@ -74,22 +74,23 @@ else
fi fi
echo "iperf3 for TCP done." echo "iperf3 for TCP done."
if [ ]; then
if [[ "$command" == "sender" || "$command" == "time-sender" ]]; then
echo "Delaying $command"
sleep 10
fi
if [[ "$command" == "sender" || "$command" == "time-sender" ]]; then start=$(date +%s.%N);
echo "Delaying $command" echo "Running PRRT with command: \"$command $PRRT_PARAMS\" and link parameters: \"$NETEM_PARAMS\""
sleep 10
fi
start=$(date +%s.%N); #tc qdisc add dev $dev root netem $NETEM_PARAMS
echo "Running PRRT with command: \"$command $PRRT_PARAMS\" and link parameters: \"$NETEM_PARAMS\"" trap 'echo "Caught SIGINT."; echo "$(ps -a)"; killall -SIGINT $command' INT
LOG=$(/prrt/$command $PRRT_PARAMS 2>&1)
#tc qdisc add dev $dev root netem $NETEM_PARAMS printf "$LOG\n"
trap 'echo "Caught SIGINT."; echo "$(ps -a)"; killall -SIGINT $command' INT echo "Exit status: $?"
LOG=$(/prrt/$command $PRRT_PARAMS 2>&1) dur=$(echo "$(date +%s.%N) - $start" | bc);
printf "$LOG\n" printf "Done after %.6f seconds\n" $dur
echo "Exit status: $?" #tc qdisc del dev $dev root
dur=$(echo "$(date +%s.%N) - $start" | bc); fi
printf "Done after %.6f seconds\n" $dur
#tc qdisc del dev $dev root
kill $TSHARK_PID kill $TSHARK_PID
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment