Update packet-histogram scripts

Add metadata information to a file in packet-histogram-stop
and import it when adding the measure

scripts/_packet-histogram-stop

@@ -4,14 +4,14 @@ usage() {
   echo "Usage: $0 OPTIONS -c OUTPUT CLIENT_BOARD SERVER_BOARD" 1>&2;
   echo "       $0 OPTIONS -s OUTPUT [-t]  (-p | (-e DELTA -o ETF_OFFSET)) CLIENT_BOARD SERVER_BOARD" 1>&2;
   echo "       $0 OPTIONS -C OUTPUT [-l]" 1>&2;
-  echo "OPTIONS: [-h] [-i INTERVAL]" 1>&2;
+  echo "OPTIONS: [-h] [-i INTERVAL] -k KERNEL_VERSION" 1>&2;
   exit 1;
 }
 
 script_dir=$(dirname $(realpath $0))
 interval=1000
 
-while getopts "hb:i:c:s:tjpe:o:C:l" opt; do
+while getopts "hb:i:c:s:tjpe:o:C:lk:" opt; do
   case "${opt}" in
     h )
         usage
@@ -50,6 +50,9 @@ while getopts "hb:i:c:s:tjpe:o:C:l" opt; do
     l )
         stop_load=1
       ;;
+    k )
+        kernel_version=${OPTARG}
+      ;;
     * )
         usage
       ;;
@@ -86,19 +89,50 @@ if [ -n "$client_histogram" ]; then
   scp $client_board:$output $script_dir/;
 
   cd $script_dir/../measure-analysis;
-  ./measure-analysis.py -i $script_dir/$output;
+
+  cat > client_metadata << EndOfMessage
+{"ker": "$kernel_version"}
+EndOfMessage
+
+  ./measure-analysis.py -i $script_dir/$output -I client_metadata;
   ./measure-analysis.py -R;
+  rm client_metadata;
+  rm $script_dir/$output;
   
 elif [ -n "$server_histogram" ]; then
 
-    ssh -t $server_board "echo olimex | sudo -S killall server";
-    ssh -t $client_board "echo olimex | sudo -S killall client";
+  ssh -t $server_board "echo olimex | sudo -S killall server";
+  ssh -t $client_board "echo olimex | sudo -S killall client";
+
+  scp $server_board:$output $script_dir/;
+
+  cd $script_dir/../measure-analysis;
+
+  if [ -n "$server_etf" ]; then
+
+    cat > server_metadata << EndOfMessage
+{
+  "ker": "$kernel_version",
+  "qdisc": "etf",
+  "etf_offset": "${etf_offset}us",
+  "delta": "${etf_delta}us"
+}
+EndOfMessage
+
+  else
+
+    cat > server_metadata << EndOfMessage
+{
+"ker": "$kernel_version"
+}
 
-    scp $server_board:$output $script_dir/;
+EndOfMessage
+  fi
 
-    cd $script_dir/../measure-analysis;
-    ./measure-analysis.py -i $script_dir/$output;
-    ./measure-analysis.py -R;
+  ./measure-analysis.py -i $script_dir/$output -I server_metadata;
+  ./measure-analysis.py -R;
+  rm server_metadata;
+  rm $script_dir/$output;
   
 elif [ -n "$cyclictest_histogram" ]; then
 
@@ -112,6 +146,30 @@ elif [ -n "$cyclictest_histogram" ]; then
   scp $board:$output $script_dir/;
 
   cd $script_dir/../measure-analysis;
-  ./measure-analysis.py -i $script_dir/$output -c;
+
+  if [ -n "$stop_load" ]; then
+
+    cat > cyclictest_metadata << EndOfMessage
+{
+"ker": "$kernel_version",
+"load": "hackbench",
+"i": "${interval}us"
+}
+EndOfMessage
+
+  else
+
+    cat > cyclictest_metadata << EndOfMessage
+{
+"ker": "$kernel_version",
+"i": "${interval}us"
+}
+
+EndOfMessage
+  fi
+
+  ./measure-analysis.py -i $script_dir/$output -c -I cyclictest_metadata;
   ./measure-analysis.py -R;
+  rm cyclictest_metadata;
+  rm $script_dir/$output;
 fi

scripts/packet-histogram-start

@@ -4,7 +4,7 @@ usage() {
   echo "Usage: $0 OPTIONS -c CLIENT_BOARD SERVER_BOARD" 1>&2;
   echo "       $0 OPTIONS -s [-t]  (-p | (-e DELTA -o ETF_OFFSET)) CLIENT_BOARD SERVER_BOARD" 1>&2;
   echo "       $0 OPTIONS -C [-l] BOARD" 1>&2;
-  echo "OPTIONS: [-h] [-i INTERVAL]" 1>&2;
+  echo "OPTIONS: [-h] [-i INTERVAL] [-k KERNEL_VERSION]" 1>&2;
   exit 1;
 }
 
@@ -13,8 +13,9 @@ interval=1000
 server_opts=""
 cyclictest_opts=""
 etf_offset=600
+kernel_version="5.6-dirty"
 
-while getopts "hi:csCtpe:o:l" opt; do
+while getopts "hi:csCtpe:o:lk:" opt; do
   case "${opt}" in
     h )
         usage
@@ -47,6 +48,9 @@ while getopts "hi:csCtpe:o:l" opt; do
     l )
         cyclictest_opts+=" -l"
       ;;
+    k )
+        kernel_version=${OPTARG}
+      ;;
     * )
         usage
       ;;
@@ -55,6 +59,8 @@ done
 
 shift $((OPTIND-1))
 
+stop_opts="-i $interval -k $kernel_version"
+
 if [ -n "$client_histogram" ] || [ -n "$server_histogram" ]; then
   if [ $# -ne 2 ]; then
     echo "Wrong number of arguments";
@@ -81,7 +87,7 @@ if [ -n "$client_histogram" ]; then
   $script_dir/exec-ssh-nohup $server_board "run-server";
   $script_dir/exec-ssh-nohup $client_board "run-client -p -i $interval -t -g $server_board";
 
-  echo "-c client_i${interval}_pfast -i $interval $client_board $server_board" > $script_dir/packet-histogram-stop_options;
+  echo "$stop_opts -c client_i${interval}_pfast -i $interval $client_board $server_board" > $script_dir/packet-histogram-stop_options;
 
 # Server histogram
 elif [ -n "$server_histogram" ]; then
@@ -91,7 +97,7 @@ elif [ -n "$server_histogram" ]; then
     $script_dir/exec-ssh-nohup $server_board "run-server -g ${interval}$server_opts";
     $script_dir/exec-ssh-nohup $client_board "run-client -p -i $interval $server_board";
 
-    echo "-i $interval -s server_i${interval} $server_opts -p $client_board $server_board" > $script_dir/packet-histogram-stop_options;
+    echo "$stop_opts -s server_i${interval} $server_opts -p $client_board $server_board" > $script_dir/packet-histogram-stop_options;
 
   # Server ETF qdisc histogram
   elif [ -n "$server_etf" ]; then
@@ -99,7 +105,7 @@ elif [ -n "$server_histogram" ]; then
     $script_dir/exec-ssh-nohup $server_board "run-server -g ${interval}$server_opts";
     $script_dir/exec-ssh-nohup $client_board "run-client -e $etf_delta -o $etf_offset -i $interval $server_board";
 
-    echo "-i $interval -s server_i${interval} $server_opts -e $etf_delta -o $etf_offset $client_board $server_board" > $script_dir/packet-histogram-stop_options;
+    echo "$stop_opts -s server_i${interval} $server_opts -e $etf_delta -o $etf_offset $client_board $server_board" > $script_dir/packet-histogram-stop_options;
 
   else
     echo "Server histogram requires choosing between pfifo_fast or etf qdisc";
@@ -110,6 +116,6 @@ elif [ -n "$cyclictest_histogram" ]; then
 
   $script_dir/exec-ssh-nohup $board "run-cyclictest -g $cyclictest_opts -i $interval";
 
-  echo "-i $interval -C cyclictest_hist $cyclictest_opts $board" > $script_dir/packet-histogram-stop_options;
+  echo "$stop_opts -C cyclictest_hist $cyclictest_opts $board" > $script_dir/packet-histogram-stop_options;
 
 fi