Adding time to total-data.json and lap-data.json (#60)

* Add time as a parameter to total-data.json * Add time parameter parsing * Fix typo * Add debugging lines * Fix typo * Remove debugging lines * Add time as parameter in make_measurement * Fix typo
green-coding-solutions · Feb 23, 2024 · 2aac9aa · 2aac9aa
1 parent 29d49af
commit 2aac9aa
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 3 deletions.
diff --git a/scripts/add-data.sh b/scripts/add-data.sh
@@ -6,6 +6,7 @@ LABEL=""
 CPU=""
 ENERGY=""
 POWER=""
+TIME=""
 
 # Parse named parameters
 while [[ $# -gt 0 ]]; do
@@ -37,6 +38,11 @@ while [[ $# -gt 0 ]]; do
         shift # past argument
         shift # past value
         ;;
+        -t|--time)
+        TIME="$2"
+        shift # past argument
+        shift # past value
+        ;;
         *)  # unknown option
         echo "Unknown option: $1"
         exit 1
@@ -55,7 +61,8 @@ NEW_STEP=$(cat <<EOM
     "label": "$LABEL",
     "cpu_avg_percent": "$CPU",
     "energy_joules": "$ENERGY",
-    "power_avg_watts": "$POWER"
+    "power_avg_watts": "$POWER",
+    "time": "$TIME"
 }
 EOM
 )

diff --git a/scripts/display_results.sh b/scripts/display_results.sh
@@ -146,7 +146,7 @@ function display_results {
     echo "show create-and-add-meta.sh output"
     echo "--file $total_data_file --repository $repo_enc --branch $branch_enc --workflow $WORKFLOW_ID --run_id $run_id_enc"
     source "$(dirname "$0")/create-and-add-meta.sh" --file "${total_data_file}" --repository "${repo_enc}" --branch "${branch_enc}" --workflow "$WORKFLOW_ID" --run_id "${run_id_enc}"
-    source "$(dirname "$0")/add-data.sh" --file "${total_data_file}" --label "TOTAL" --cpu "${cpu_avg}" --energy "${total_energy}" --power "${power_avg}"
+    source "$(dirname "$0")/add-data.sh" --file "${total_data_file}" --label "TOTAL" --cpu "${cpu_avg}" --energy "${total_energy}" --power "${power_avg}" --time "${time}"
 
 }
 

diff --git a/scripts/make_measurement.sh b/scripts/make_measurement.sh
@@ -122,7 +122,7 @@ function make_measurement() {
         echo "--file $lap_data_file --repository $repo_enc --branch $branch_enc --workflow $WORKFLOW_ID --run_id $run_id_enc"
 
         source "$(dirname "$0")/create-and-add-meta.sh" --file "${lap_data_file}" --repository "${repo_enc}" --branch "${branch_enc}" --workflow "$WORKFLOW_ID" --run_id "${run_id_enc}"
-        source "$(dirname "$0")/add-data.sh" --file "${lap_data_file}" --label "$label" --cpu "${cpu_avg}" --energy "${total_energy}" --power "${power_avg}"
+        source "$(dirname "$0")/add-data.sh" --file "${lap_data_file}" --label "$label" --cpu "${cpu_avg}" --energy "${total_energy}" --power "${power_avg}" --time "${time}"
 
         killall -9 -q /tmp/eco-ci/demo-reporter || true
         /tmp/eco-ci/demo-reporter | tee -a /tmp/eco-ci/cpu-util-total.txt > /tmp/eco-ci/cpu-util.txt &