A
lgorithmique
N
umérique
D
istribuée
Public GIT Repository
projects
/
simgrid.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge remote-tracking branch 'origin/master'
[simgrid.git]
/
src
/
smpi
/
smpirun.in
diff --git
a/src/smpi/smpirun.in
b/src/smpi/smpirun.in
index
673d0cc
..
2ef2757
100755
(executable)
--- a/
src/smpi/smpirun.in
+++ b/
src/smpi/smpirun.in
@@
-27,6
+27,8
@@
function usage () {
echo " [-np <numprocs>] # use that amount of processes from the hostfile."
echo " # By default, all processes of the hostfile are used."
echo " [-trace] # activate tracing"
echo " [-np <numprocs>] # use that amount of processes from the hostfile."
echo " # By default, all processes of the hostfile are used."
echo " [-trace] # activate tracing"
+ echo " [-trace-comment <comment>]# put a comment on the top of the trace file"
+ echo " [-trace-comment-file <file>] # put file contents on the top of the trace file as comment"
echo " [-trace-grouped] # group MPI processes by location"
echo " [-trace-resource] # trace resource utilization"
echo " [-trace-triva] # generate configuration for Triva's GraphView"
echo " [-trace-grouped] # group MPI processes by location"
echo " [-trace-resource] # trace resource utilization"
echo " [-trace-triva] # generate configuration for Triva's GraphView"
@@
-80,8
+82,18
@@
while true; do
;;
"-trace")
;;
"-trace")
- TRACE_ACTIVE="true"
- shift 1
+ TRACE_ACTIVE="true"
+ shift 1
+ ;;
+
+ "-trace-comment")
+ TRACE_COMMENT="$2"
+ shift 2
+ ;;
+
+ "-trace-comment-file")
+ TRACE_COMMENT_FILE="$2"
+ shift 2
;;
"-trace-file")
;;
"-trace-file")
@@
-212,7
+224,7
@@
if [ -n "${HOSTFILE}" ] && [ -f ${HOSTFILE} ]; then
NUMHOSTS=`cat ${HOSTFILE} | wc -l`
fi
NUMHOSTS=`cat ${HOSTFILE} | wc -l`
fi
-if [ ${EXEC} = "./replay" ]; then
+if [ ${EXEC} = "./
smpi_
replay" ]; then
APP_TRACES=$1;
if [ -n "${APP_TRACES}" ] && [ -f ${APP_TRACES} ]; then
hosttraces=(`cat ${APP_TRACES} | tr \\\n " "`)
APP_TRACES=$1;
if [ -n "${APP_TRACES}" ] && [ -f ${APP_TRACES} ]; then
hosttraces=(`cat ${APP_TRACES} | tr \\\n " "`)
@@
-258,7
+270,7
@@
do
fi
echo " <process host=\"${host}\" function=\"$i\"> <!-- function name used only for logging -->" >> ${APPLICATIONTMP}
echo " <argument value=\"$i\"/> <!-- rank -->" >> ${APPLICATIONTMP}
fi
echo " <process host=\"${host}\" function=\"$i\"> <!-- function name used only for logging -->" >> ${APPLICATIONTMP}
echo " <argument value=\"$i\"/> <!-- rank -->" >> ${APPLICATIONTMP}
- if [ ${EXEC} = "./replay" ]; then
+ if [ ${EXEC} = "./
smpi_
replay" ]; then
if [ ${NUMTRACES} -gt 1 ]; then
echo " <argument value=\"${hosttraces[$j]}\"/>" >> ${APPLICATIONTMP}
else
if [ ${NUMTRACES} -gt 1 ]; then
echo " <argument value=\"${hosttraces[$j]}\"/>" >> ${APPLICATIONTMP}
else
@@
-285,6
+297,14
@@
if [ -n "${TRACE_ACTIVE}" ]; then
fi
TRACEOPTIONS="--cfg=tracing:1 --cfg=tracing/filename:${TRACE_FILENAME} --cfg=tracing/smpi:1"
fi
TRACEOPTIONS="--cfg=tracing:1 --cfg=tracing/filename:${TRACE_FILENAME} --cfg=tracing/smpi:1"
+ if [ -n "${TRACE_COMMENT}" ]; then
+ TRACEOPTIONS="${TRACEOPTIONS} --cfg=tracing/comment:${TRACE_COMMENT}"
+ fi
+
+ if [ -n "${TRACE_COMMENT_FILE}" ]; then
+ TRACEOPTIONS="${TRACEOPTIONS} --cfg=tracing/comment_file:${TRACE_COMMENT_FILE}"
+ fi
+
if [ -n "${TRACE_GROUPED}" ]; then
TRACEOPTIONS="${TRACEOPTIONS} --cfg=tracing/smpi/group:1"
fi
if [ -n "${TRACE_GROUPED}" ]; then
TRACEOPTIONS="${TRACEOPTIONS} --cfg=tracing/smpi/group:1"
fi