Support alternative locations for the pacct file.

git-svn-id: svn://svn.valgrind.org/valgrind/trunk@8255

diff --git a/exp-drd/scripts/measurement-functions b/exp-drd/scripts/measurement-functions
index ab02d39ada0c3ec450e05d15d5e4c79568a16db8..dae5696166d2cf3f834c753ce445b3e844204624 100644 (file)
--- a/exp-drd/scripts/measurement-functions
+++ b/exp-drd/scripts/measurement-functions
@@ -41,14 +41,24 @@ function avgstddev {
 ## Query the virtual memory size for the last invocation of command $1 from
 #  the information logged by the kernel (BSD process accounting).
 function query_cmd_vsz {
+  local pacct
+
   if [ ! -e /usr/sbin/dump-acct ]; then
     echo "Error: userspace tools for BSD process accounting have not been" >&2
     echo "installed. Please install the acct package (Debian systems)."    >&2
     return 1
   fi
 
-  /usr/sbin/dump-acct /var/log/account/pacct | \
-    grep -- "^$(basename "$1")" | \
+  if [ -e /var/log/account/pacct ]; then
+    pacct=/var/log/account/pacct
+  elif [ -e /var/account/pacct ]; then
+    pacct=/var/account/pacct
+  else
+    echo "Where is the pacct file ?" >&2
+    return 1
+  fi
+  /usr/sbin/dump-acct "${pacct}" | \
+    grep -- "^$(basename "$1").*|v3|" | \
     cut -f8 -d'|' | \
     tail -n 1
 }

diff --git a/exp-drd/scripts/run-splash2 b/exp-drd/scripts/run-splash2
index ff63199529ab00aaa0065fea6fb25446edd66dfc..7997e83117cd65e534618e5601add6d41b02afe4 100755 (executable)
--- a/exp-drd/scripts/run-splash2
+++ b/exp-drd/scripts/run-splash2
@@ -137,7 +137,7 @@ fi
 # Results:                native       native       native       none     none       DRD       DRD      HG       ITC ITC
 #                         -p1          -p2          -p4           -p1      -p4       -p4      -p4+f     -p4     -p4 -p4+f
 # .......................................................................................................................
-# Cholesky                0.21  .....  0.14  .....  4.49  ..... .... .... .... ....    4 ....   3 ....    2 .... 239  82
+# Cholesky                0.21  45565  0.14  55658  4.49  74667 9.05 2.31 0.64 1.80    4 2.11   3 2.22    1 3.28 239  82
 # FFT                     0.11  .....  0.08  .....  0.07  ..... .... .... .... ....  138 ....  66 ....  380 ....  90  41
 # LU, contiguous          0.56  .....  0.34  .....  0.34  ..... .... .... .... ....   72 ....  68 ....   96 .... 428 128
 # LU, non-contiguous      0.59  .....  0.32  .....  0.35  ..... .... .... .... ....   92 .... 109 ....   60 .... 428 128