X-Git-Url: http://nitlanguage.org
diff --git a/benchmarks/bench_common.sh b/benchmarks/bench_common.sh
index c600732..dfdbc6b 100644
--- a/benchmarks/bench_common.sh
+++ b/benchmarks/bench_common.sh
@@ -13,6 +13,14 @@
# See the License for the specific language governing permissions and
# limitations under the License.
+# Global variables
+
+# Number of times a command must be run with bench_command
+count=1
+
+# User time limit (in second) before a command is aborted
+usertimelimit=120
+
# Common functions for all the bench scripts
# Run a single command multiple time and store the execution times
@@ -37,16 +45,31 @@ function bench_command()
echo "** [$title] $desc **"
echo " $ $@"
+ failed=
+
# Execute the commands $count times
for i in `seq 1 "$count"`; do
- /usr/bin/time -f "%U" -o "$timeout" -a "$@" > $outputopts 2>&1 || die "$1: failed"
+ (
+ ulimit -t "$usertimelimit" 2> /dev/null
+ /usr/bin/time -f "%U" -o "$timeout" -a "$@" > $outputopts 2>&1
+ ) || { err=$?; failed=true; die "$1: failed with $err"; }
echo -n "$i. "
tail -n 1 "$timeout"
+ test -n "$failed" && break
done
line=`compute_stats "$timeout"`
echo "$line ($res)"
echo $line >> "$res"
+
+ if test -n "$xml"; then
+ echo >>"$xml" "