From 89aac49da28c4dd41324508085365a107abf8c55 Mon Sep 17 00:00:00 2001
From: Reiner Jung <reiner.jung@email.uni-kiel.de>
Date: Wed, 10 Aug 2022 14:14:00 +0200
Subject: [PATCH] minor updates.
---
frameworks/Kieker/java/config.rc | 2 +-
frameworks/OpenTelemetry/config.rc | 2 +-
frameworks/common-functions.sh | 19 +++----------------
frameworks/inspectIT/config.rc | 2 +-
frameworks/{stats.csv.r => statistics.r} | 0
5 files changed, 6 insertions(+), 19 deletions(-)
rename frameworks/{stats.csv.r => statistics.r} (100%)
diff --git a/frameworks/Kieker/java/config.rc b/frameworks/Kieker/java/config.rc
index 5e7b66e..b6216f9 100644
--- a/frameworks/Kieker/java/config.rc
+++ b/frameworks/Kieker/java/config.rc
@@ -4,7 +4,7 @@
# path setup
JAVA_BIN="/usr/bin/java"
-RSCRIPT_PATH="${BASE_DIR}/stats.csv.r"
+RSCRIPT_PATH="${BASE_DIR}/../../statistics.r"
MAIN_DIR="${BASE_DIR}/../../.."
diff --git a/frameworks/OpenTelemetry/config.rc b/frameworks/OpenTelemetry/config.rc
index 0b46b37..55aeb05 100644
--- a/frameworks/OpenTelemetry/config.rc
+++ b/frameworks/OpenTelemetry/config.rc
@@ -2,7 +2,7 @@
JAVA_BIN="/usr/bin/java"
-RSCRIPT_PATH="${BASE_DIR}/../stats.csv.r"
+RSCRIPT_PATH="${BASE_DIR}/../statistics.r"
AGENT_JAR="${BASE_DIR}/lib/opentelemetry-javaagent.jar"
diff --git a/frameworks/common-functions.sh b/frameworks/common-functions.sh
index 618490c..1b0509f 100755
--- a/frameworks/common-functions.sh
+++ b/frameworks/common-functions.sh
@@ -42,28 +42,14 @@ function createRLabels() {
}
## Generate Results file
-function runR() {
-R --vanilla --silent << EOF
-results_fn="${RAWFN}"
-outtxt_fn="${RESULTS_DIR}/results-text.txt"
-outcsv_fn="${RESULTS_DIR}/results-text.csv"
-configs.loop=${NUM_OF_LOOPS}
-configs.recursion=${RECURSION_DEPTH}
-configs.labels=c($LABELS)
-results.count=${TOTAL_NUM_OF_CALLS}
-results.skip=${TOTAL_NUM_OF_CALLS}/2
-source("${RSCRIPT_PATH}")
-EOF
-}
-
-## Generate Results file
-function runRyaml() {
+function runStatistics() {
cat << EOF
results_fn="${RAWFN}"
out_yaml_fn="${RESULTS_DIR}/results.yaml"
configs.loop=${NUM_OF_LOOPS}
configs.recursion=${RECURSION_DEPTH}
configs.labels=c($LABELS)
+configs.tool_id="$RESULTS_DIR}"
results.count=${TOTAL_NUM_OF_CALLS}
results.skip=${TOTAL_NUM_OF_CALLS}/2
source("${RSCRIPT_PATH}")
@@ -74,6 +60,7 @@ out_yaml_fn="${RESULTS_DIR}/results.yaml"
configs.loop=${NUM_OF_LOOPS}
configs.recursion=${RECURSION_DEPTH}
configs.labels=c($LABELS)
+configs.tool_id="$RESULTS_DIR}"
results.count=${TOTAL_NUM_OF_CALLS}
results.skip=${TOTAL_NUM_OF_CALLS}/2
source("${RSCRIPT_PATH}")
diff --git a/frameworks/inspectIT/config.rc b/frameworks/inspectIT/config.rc
index 6bcdafb..8453f04 100644
--- a/frameworks/inspectIT/config.rc
+++ b/frameworks/inspectIT/config.rc
@@ -1,6 +1,6 @@
# inspectIT
-RSCRIPT_PATH="${BASE_DIR}/../stats.csv.r"
+RSCRIPT_PATH="${BASE_DIR}/../statistics.r"
JAVA_BIN="/usr/bin/java"
diff --git a/frameworks/stats.csv.r b/frameworks/statistics.r
similarity index 100%
rename from frameworks/stats.csv.r
rename to frameworks/statistics.r
--
GitLab