somehow smpif90 was not handling trace_call_location at all.

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

diff --git a/src/smpi/smpif90.in b/src/smpi/smpif90.in
index 356e290..eae18c8 100644 (file)
--- a/src/smpi/smpif90.in
+++ b/src/smpi/smpif90.in
@@ -1,6 +1,6 @@
 #!/usr/bin/env sh
 
-# Copyright (c) 2012-2020. The SimGrid Team. All rights reserved.
+# Copyright (c) 2012-2021. The SimGrid Team. All rights reserved.
 
 # This program is free software; you can redistribute it and/or modify it
 # under the terms of the license (GNU LGPL) which comes with this package.
@@ -38,15 +38,19 @@ cleanup () {
 trap 'cleanup' EXIT
 
 filter_and_compile() {
-    list_add TMPFILES "\"${TMPFILE}\""
     #replace "program main_name by subroutine user_main (and the end clause as well)"
-    if [ "x${SMPI_PRETEND_CC}" = "x" ]; then
+    if [ "x${SMPI_PRETEND_CC}" = "x" ] && [ "x${TMPFILE}" != "x" ]; then
+      list_add TMPFILES "${TMPFILE}"
+      if [ "$TRACE_CALL_LOCATION" -gt 0 ]; then
+        echo "#include \"@includedir@/smpi/smpi_extended_traces_fortran.h\"" > "${TMPFILE}"
+        echo "#line 1 \"${ARG}\"" >> "${TMPFILE}"
+      fi
       sed 's/^\([[:space:]]*\)\([eE][nN][dD] \)\{0,1\}[pP][rR][oO][gG][rR][aA][mM][^a-zA-Z0-9]*\([a-zA-Z0-9_]*\)/\1\2subroutine user_main /g' "${ARG}" >> "${TMPFILE}"
       SRCFILE="${TMPFILE}"
     else
       SRCFILE="${ARG}"
     fi
-    list_add CMDLINE "\"${SRCFILE}\""
+    list_add CMDLINE "${SRCFILE}"
 }
 
 NEEDS_OUTPUT=1
@@ -64,13 +68,17 @@ while [ $# -gt 0 ]; do
             ;;
         *.f90)
             FILENAME=$(basename "${ARG}")
-            TMPFILE=$(mymktemp "${ARG}" ".f90")
+            if [ "$TRACE_CALL_LOCATION" -gt 0 ] || main=$(grep -q -i "program" "${ARG}"); then
+              TMPFILE=$(mymktemp "${ARG}" ".f90")
+            fi
             ORIGFILE="${FILENAME%.f90}"
             filter_and_compile
             ;;
         *.F90)
             FILENAME=$(basename "${ARG}")
-            TMPFILE=$(mymktemp "${ARG}" ".F90")
+            if [ "$TRACE_CALL_LOCATION" -gt 0 ] || main=$(grep -q -i "program" "${ARG}"); then
+              TMPFILE=$(mymktemp "${ARG}" ".F90")
+            fi
             ORIGFILE="${FILENAME%.F90}"
             filter_and_compile
             ;;
@@ -86,7 +94,7 @@ while [ $# -gt 0 ]; do
             ${REAL_FORTRAN_COMPILER} --version
             ;;
         -o)
-            list_add CMDLINE "\"-o$1\""
+            list_add CMDLINE "-o$1"
             NEEDS_OUTPUT=0
             shift
             ;;
@@ -101,7 +109,7 @@ while [ $# -gt 0 ]; do
 done
 
 if [ $NEEDS_OUTPUT -ne 0 ]; then
-   list_add CMDLINE "\"-o${ORIGFILE}.o\""
+   list_add CMDLINE "-o${ORIGFILE}.o"
 fi
 
 list_add_not_empty CMDLINE ${INCLUDEARGS}
@@ -113,4 +121,4 @@ if [ "x$VERBOSE" = x1 ] || [ "x$show" = x1 ] ; then
   echo "$@"
   [ "x$show" = x1 ] && exit 0
 fi
-eval "$@"
+"$@"