From fdbd34c7c9033ac91ab677261af3667bdb19efa6 Mon Sep 17 00:00:00 2001
From: AlexWells <alex.wells@diamond.ac.uk>
Date: Thu, 22 Jun 2023 15:13:53 +0100
Subject: [PATCH] Make record names consistent for large numbers

Also neatens up the generated database file
---
 benchmark/coniql_performance_test.py |  5 +----
 benchmark/run_performance_test.sh    | 24 +++++++++++-------------
 2 files changed, 12 insertions(+), 17 deletions(-)

diff --git a/benchmark/coniql_performance_test.py b/benchmark/coniql_performance_test.py
index ab92364e..8cdd34c9 100644
--- a/benchmark/coniql_performance_test.py
+++ b/benchmark/coniql_performance_test.py
@@ -246,10 +246,7 @@ def main():
     t.start()
     for i in range(n_pvs):
         # Get the PV name
-        if i < 10:
-            pv_name = PV_PREFIX + "0" + str(i)
-        else:
-            pv_name = PV_PREFIX + str(i)
+        pv_name = PV_PREFIX + str(i)
 
         t = threading.Thread(
             target=coniql_subscription,
diff --git a/benchmark/run_performance_test.sh b/benchmark/run_performance_test.sh
index 80ec23ff..6ec5dcac 100755
--- a/benchmark/run_performance_test.sh
+++ b/benchmark/run_performance_test.sh
@@ -78,21 +78,19 @@ fi
 echo "-> Creating EPICS db with $N_PVS PVs"
 for ((i=0;i<$N_PVS;i++))
 do
-    if [ $i -lt 10 ]; then 
-        str_name="0$i"
-    else
-        str_name="$i"
-    fi
 
-    STR="record(calcout, \"TEST:REC$str_name\"){ field(DESC, \"Performance test record\") \
-    field(SCAN, \".1 second\") field(A, \"0\") field(CALC, \"A + 1\") field(OUT, \"TEST:REC$str_name.A\")}"
+    record_name="TEST:REC$i"
+    cat <<EOF
+record(calcout, "$record_name")
+{ 
+    field(DESC, "Performance test record") 
+    field(SCAN, ".1 second") field(A, "0") 
+    field(CALC, "A + 1") 
+    field(OUT, "$record_name.A")
+}
+EOF
 
-    if [ $i -eq 0 ]; then
-        echo $STR > $SUB_DIR/coniqlPerformanceTestDb.db
-    else 
-        echo $STR >> $SUB_DIR/coniqlPerformanceTestDb.db
-    fi
-done
+done >$SUB_DIR/coniqlPerformanceTestDb.db
 
 
 # 1. EPICS IOCS