From e8c2c1798163570f59864cb7a84fe151eacf1f47 Mon Sep 17 00:00:00 2001
From: Peter Cai <peter.cai@uwaterloo.ca>
Date: Wed, 15 Feb 2023 09:33:07 -0500
Subject: [PATCH] THREADS should be a global option
---
configs/base.sh | 4 ++++
configs/memcached.sh | 1 -
experiments/memcached_qps_scan.sh | 14 --------------
run.sh | 5 +++++
4 files changed, 9 insertions(+), 15 deletions(-)
diff --git a/configs/base.sh b/configs/base.sh
index 4bec23a..6a561c0 100644
--- a/configs/base.sh
+++ b/configs/base.sh
@@ -5,3 +5,7 @@ X86_ENERGY_PERF_POLICY=x86_energy_perf_policy
# Execute all SSH commands under this user
# so that we don't need ssh keys for root
SSH_USER=p5cai
+
+# Default No. of threads
+# Note that not all experiments honor this setting
+THREADS=8
diff --git a/configs/memcached.sh b/configs/memcached.sh
index 3f18bbf..df1ce8c 100644
--- a/configs/memcached.sh
+++ b/configs/memcached.sh
@@ -1,2 +1 @@
MEMCACHED=/home/p5cai/workspace/memcached/memcached
-THREADS=8 # default
diff --git a/experiments/memcached_qps_scan.sh b/experiments/memcached_qps_scan.sh
index 4492f5a..59bd354 100644
--- a/experiments/memcached_qps_scan.sh
+++ b/experiments/memcached_qps_scan.sh
@@ -3,20 +3,6 @@ source "$EXP_ROOT/experiments/memcached.shared.sh"
pre_start() {
load_config
- while [[ $# -gt 0 ]]; do
- case $1 in
- -t)
- [ -z "$2" ] && echo "# of threads must not be empty" && exit 1
- THREADS="$2"
- shift
- shift
- ;;
- *)
- break
- ;;
- esac
- done
-
EXPERIMENT_NAME_EXT="t$THREADS.c$CONNS"
cleanup_mutilate
diff --git a/run.sh b/run.sh
index d1ca374..703d5c9 100755
--- a/run.sh
+++ b/run.sh
@@ -31,6 +31,11 @@ while [[ $# -gt 0 ]]; do
shift
shift
;;
+ -t|--threads)
+ THREADS="$2"
+ shift
+ shift
+ ;;
*)
break
;;
--
GitLab