Attempt to allow initializing log categories before threads are

[simgrid.git] / src / smpi / smpirun.in

diff --git a/src/smpi/smpirun.in b/src/smpi/smpirun.in
index a421431..51fc175 100755 (executable)
--- a/src/smpi/smpirun.in
+++ b/src/smpi/smpirun.in
@@ -59,6 +59,16 @@ while true; do
          shift 2
    ;;
 
+   "-trace-grouped")
+    TRACE_GROUPED="true"
+      shift 1
+   ;;
+
+   "-triva")
+       TRIVA="true"
+         shift 1
+   ;;
+
    "-keep-temps")
        KEEP="true"
       shift 1
@@ -100,7 +110,7 @@ if [ -z "${PLATFORM}" ]; then
 
        cat > ${PLATFORMTMP} <<PLATFORMHEAD
 <?xml version='1.0'?>
-<!DOCTYPE platform SYSTEM "simgrid.dtd">
+<!DOCTYPE platform SYSTEM "http://simgrid.gforge.inria.fr/simgrid.dtd">
 <platform version="3">
 <AS id="AS0" routing="Full">
 PLATFORMHEAD
@@ -138,7 +148,7 @@ APPLICATIONTMP="$(mktemp tmpXXXXXX)"
 
 cat > ${APPLICATIONTMP} <<APPLICATIONHEAD
 <?xml version='1.0'?>
-<!DOCTYPE platform SYSTEM "simgrid.dtd">
+<!DOCTYPE platform SYSTEM "http://simgrid.gforge.inria.fr/simgrid.dtd">
 <platform version="3">
 APPLICATIONHEAD
 
@@ -203,6 +213,14 @@ APPLICATIONFOOT
   else
     TRACEOPTIONS=""
   fi
+
+  if [ -n "${TRIVA}" ]; then
+    TRACEOPTIONS="$TRACEOPTIONS --cfg=triva/categorized:smpi_cat.plist --cfg=triva/uncategorized:smpi_uncat.plist"
+  fi
+
+  if [ -n "${TRACE_GROUPED}" ]; then
+    TRACEOPTIONS="$TRACEOPTIONS --cfg=tracing/smpi/group:1"
+  fi
 ##---------------------- end SMPI TRACING OPTIONS ---------------------------------
 
 export SMPI_GLOBAL_SIZE=${NUMPROCS}