/[escript]/trunk/run-escript.in
ViewVC logotype

Diff of /trunk/run-escript.in

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 4505 by caltinay, Tue Jul 2 01:10:41 2013 UTC revision 4506 by caltinay, Wed Jul 24 01:28:42 2013 UTC
# Line 140  Usage: run-escript [options] script.py [ Line 140  Usage: run-escript [options] script.py [
140      -o      redirect output from MPI to files      -o      redirect output from MPI to files
141      -v      print diagnostics      -v      print diagnostics
142      -x      run in new xterm instance      -x      run in new xterm instance
143      -m      run with valgrind memcheck      -m tool     run with valgrind {tool=m[emcheck]/c[allgrind]}
144      script.py   Your python script      script.py   Your python script
145      arguments...    The optional command-line arguments to your script      arguments...    The optional command-line arguments to your script
146  "  "
# Line 152  fi Line 152  fi
152  #==============================================================================  #==============================================================================
153    
154  # Parse the command-line options  # Parse the command-line options
155  while getopts 'bn:p:t:f:echimoVvx' option  while getopts 'bn:p:t:f:echim:oVvx' option
156  do  do
157      case "$option" in      case "$option" in
158        "b")  DO_BINARY=y        "b")  DO_BINARY=y
159          ;;          ;;
160        "m")  DO_VALGRIND=y        "m")  DO_VALGRIND=$OPTARG
161          ;;          ;;
162        "n")  ESCRIPT_NUM_NODES=$OPTARG        "n")  ESCRIPT_NUM_NODES=$OPTARG
163          ;;          ;;
# Line 375  if [ ! -z "$DO_VALGRIND" ] Line 375  if [ ! -z "$DO_VALGRIND" ]
375  then  then
376      VALGRIND_BIN=`which valgrind 2>/dev/null`      VALGRIND_BIN=`which valgrind 2>/dev/null`
377      if [ $? -eq 0 ]; then      if [ $? -eq 0 ]; then
378          LOGDIR=$ESCRIPT_ROOT/memcheck_logs          LOGDIR=$ESCRIPT_ROOT/valgrind_logs
379          [ -d $LOGDIR ] || mkdir $LOGDIR          [ -d $LOGDIR ] || mkdir $LOGDIR
380          LAST_N=`ls -1 $LOGDIR|grep "^memcheck"|tail -1|cut -d. -f2`          if [ ${DO_VALGRIND:0:1} = "c" ];
381          NEW_N=`printf "%04d" $((10#$LAST_N + 1))`          then
382          LOGFILE=${LOGDIR}/memcheck.${NEW_N}.xml              # run callgrind
383          VALGRIND="valgrind --xml=yes --show-reachable=yes --error-limit=no --gen-suppressions=all --suppressions=$ESCRIPT_ROOT/scripts/escript.supp --leak-check=full --xml-file=$LOGFILE"              LOGFILE=${LOGDIR}/callgrind.%p.xml
384          EXEC_CMD="$EXEC_CMD $VALGRIND"              VALGRIND="valgrind --tool=callgrind --callgrind-out-file=$LOGFILE"
385                EXEC_CMD="$EXEC_CMD $VALGRIND"
386            else
387                # run memcheck by default
388                LAST_N=`ls -1 $LOGDIR|grep "^memcheck"|tail -1|cut -d. -f2`
389                NEW_N=`printf "%04d" $((10#$LAST_N + 1))`
390                LOGFILE=${LOGDIR}/memcheck.${NEW_N}.xml
391                VALGRIND="valgrind --tool=memcheck --xml=yes --show-reachable=yes --error-limit=no --gen-suppressions=all --suppressions=$ESCRIPT_ROOT/scripts/escript.supp --leak-check=full --xml-file=$LOGFILE"
392                EXEC_CMD="$EXEC_CMD $VALGRIND"
393            fi
394      else      else
395          echo "Valgrind memcheck requested but valgrind not in path!"          echo "Execution with valgrind requested but valgrind not in path!"
396          exit 1          exit 1
397      fi      fi
398  fi  fi

Legend:
Removed from v.4505  
changed lines
  Added in v.4506

  ViewVC Help
Powered by ViewVC 1.1.26