Use different logs logs

Author: uurien

benchmark/sirun/initialize/meta.json

@@ -7,7 +7,8 @@
   "variants": {
     "main": {
       "run": "node ./init.js",
-      "run_with_affinity": "bash -c \"echo $CPU_AFFINITY && taskset -c $CPU_AFFINITY node ./init.js\""
+      "run_with_affinity2": "bash -c \"echo taskset -c $CPU_AFFINITY node ./init.js\"",
+      "run_with_affinity": "bash -c \"echo initialize\""
     }
   }
 }

benchmark/sirun/rewrite/meta.json

@@ -8,7 +8,8 @@
     "iast+orchestrion": {
       "setup": "bash -c \"nohup node server.js > /dev/null 2>&1 &\"",
       "run": "node client.js",
-      "run_with_affinity": "bash -c \"taskset -c $CPU_AFFINITY node client.js\""
+      "run_with_affinity2": "bash -c \"echo taskset -c $CPU_AFFINITY node client.js\"",
+      "run_with_affinity": "bash -c \"echo iastorchestrion\""
     }
   }
 }

benchmark/sirun/run-one-variant.js

@@ -4,4 +4,6 @@
 
 const { exec, stdio } = require('./run-util')
 
-exec('sirun', ['meta-temp.json'], { env: process.env, stdio })
+const env = Object.assign({}, process.env)
+
+exec('sirun', ['meta-temp.json'], { env, stdio })

benchmark/sirun/run-util.js

@@ -6,8 +6,9 @@ const readline = require('readline')
 function exec (...args) {
   return new Promise((resolve, reject) => {
     const proc = childProcess.spawn(...args)
-    streamAddVersion(proc.stdout)
+    // streamAddVersion(proc.stdout)
     proc.on('error', (e) => {
+      console.log('error', e)
       reject(e)
     })
     proc.on('exit', (code) => {
@@ -37,6 +38,6 @@ function streamAddVersion (input) {
 
 module.exports = {
   exec,
-  stdio: ['inherit', 'pipe', 'inherit'],
+  stdio: [0, 1, 1], //['inherit', 'pipe', 'inherit'],
   streamAddVersion
 }

benchmark/sirun/runall.sh

@@ -28,6 +28,7 @@ for ((i=0; i<TOTAL_CPU_CORES; i++)); do
 done
 
 
+echo "CPU_START_ID: ${CPU_START_ID}"
 CPU_AFFINITY_BASE="${CPU_START_ID:-$TOTAL_CPU_CORES}" # Benchmarking Platform convention
 
 MAJOR_VERSION=${MAJOR_VERSION:-22}  # provided by each benchmark stage
@@ -57,12 +58,15 @@ run_benchmark() {
   local cpu_id=$3
 
   cd "${dir}"
+  echo cd "${dir}"
 
   export CPU_AFFINITY=$((CPU_AFFINITY_BASE + cpu_id))
   echo "running ${dir}/${variant} in background, pinned to core ${CPU_AFFINITY}..."
 
   export SIRUN_VARIANT=$variant
+  sleep $((RANDOM % 10))
   (time node ../run-one-variant.js >> ../results.ndjson && echo "${D}/${V} finished.")
+  
   cd ..
 
   echo "1" > "core_${cpu_id}.lock_core"

benchmark/sirun/strip-unwanted-results.js

@@ -6,11 +6,13 @@ const path = require('path')
 const IGNORE_STATS = [
   'system.time'
 ]
-
-const lines = fs
+const fileContent = fs
   .readFileSync(path.join(__dirname, 'results.ndjson'))
   .toString()
   .trim()
+console.log('results.ndjson', fileContent)
+
+const lines = fileContent
   .split('\n')
 
 if (lines.length === 1 && lines[0] === '') {