diff --git a/pausetimes/pausetimes_multicore b/pausetimes/pausetimes_multicore old mode 100644 new mode 100755 index fd9df587b3..416f16aa40 --- a/pausetimes/pausetimes_multicore +++ b/pausetimes/pausetimes_multicore @@ -1,11 +1,9 @@ #!/bin/bash -export OCAML_EVENTLOG_ENABLED="1" +TMP=$(mktemp) OUTFILE=$1 BENCH_NAME=$(basename $OUTFILE .pausetimes_multicore.bench) shift -eval $@ -if ls *.eventlog 1> /dev/null 2>&1; then - ocaml-eventlog-pausetimes *.eventlog $BENCH_NAME > $OUTFILE - rm *.eventlog -fi +eval "olly latency -o $TMP --json '$@'" +cat $TMP | jq "{name: \"$BENCH_NAME\"} + ." >$OUTFILE +rm $TMP diff --git a/run_config.json b/run_config.json index f8141f12f6..d7b1a8653d 100644 --- a/run_config.json +++ b/run_config.json @@ -14,7 +14,7 @@ }, { "name": "pausetimes_multicore", - "command": "olly latency -o %{output} --json 'taskset --cpu-list 5 %{command}'" + "command": "bash pausetimes_multicore %{output} taskset --cpu-list 5 %{command}" } ], "benchmarks": [