X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/e6e67305ecc66829721213aea23743f933b23b5d..89634ac8447e4f5c99dd3c0c5984958d88764c72:/src/smpi/smpif2c.in

diff --git a/src/smpi/smpif2c.in b/src/smpi/smpif2c.in
index 02330f352c..0a48d50949 100755
--- a/src/smpi/smpif2c.in
+++ b/src/smpi/smpif2c.in
@@ -5,17 +5,29 @@ use strict;
 use File::Temp;
 use File::Copy;
 
-my $include="-I@top_srcdir@/include -I@top_srcdir@/include/smpi -I@includedir@ -I@includedir@/smpi";
+my $include="@includeflag@@f2cflags@";
 
 foreach my $fortran (@ARGV) {
    my $output = $fortran;
    $output =~ s/.f$/.c/;
+
+   #print "F2C INPUT : ".$fortran."\n";
+   #print "F2C OUTPUT: ".$output."\n";
+
+   my$outputdir = $output;
+   $outputdir=~s/[^\/]*\.c$//g;
+   #print "F2C DIR   : ".$outputdir."\n";
+
    my $tmp = new File::Temp;
    $tmp->autoflush(1);
-   `f2c $include -w -a $fortran`;
+   #print "f2c -d$outputdir $include -w -a $fortran\n";
+   `f2c -d$outputdir $include -w -a $fortran`;
    die "F2C failed\n" if $?;
-   open F2C,"<$output";
+   open F2C,"<$output" or die "Unable to open file $output";
    my $started = 0;
+   print $tmp "#ifndef INTEGER_STAR_8\n";
+   print $tmp "#define INTEGER_STAR_8\n";
+   print $tmp "#endif\n";
    print $tmp "#include <stdlib.h>\n";
    print $tmp "#include <smpif.h>\n";
    while(<F2C>) {
@@ -25,22 +37,23 @@ foreach my $fortran (@ARGV) {
       }
       if($started) {
          if(/^} (.*?);/) {
-            $_ = "}* $1 = NULL;\n";
+            $_ = "}* __attribute__((weak)) $1 = NULL;\n";
          } elsif(/^#define\s*(\S*)\s*\(?([^.]*)(\..*?)?\)?$/) {
-            $_ = "#define $1 $2\[smpi_global_rank()\]";
+            $_ = "#define $1 $2\[smpi_current_rank\]";
             if(defined $3) {
                $_ .= $3;
             }
             $_ .= "\n";
-            $_ .= "\nvoid __attribute__((constructor)) __preinit_$1(void) {\n  if(!$2) $2 = malloc(smpi_global_size() * sizeof(*$2));\n}\n";
-            $_ .= "\nvoid __attribute__((destructor)) __postfini_$1(void) {\n  free($2);\n  $2 = NULL;\n}\n";
+            $_ .= "\nvoid __attribute__((weak,constructor)) __preinit_$1(void) {\n  if(!$2) $2 = malloc(smpi_global_size() * sizeof(*$2));\n}\n";
+            $_ .= "\nvoid __attribute__((weak,destructor)) __postfini_$1(void) {\n  free($2);\n  $2 = NULL;\n}\n";
          }
       }
       if(/\/\* Table of constant values \*\// || /MAIN__/) {
          $started = 0;
       }
+      $_ =~ s/(mpi_[\w]*_)_/$1/g;
       if(/\/* Main program alias \*\/\s*int\s+.*\s*\(\s*\)\s*{(.*)}/) {
-         $_ = "int smpi_simulated_main(int argc, char** argv) { smpi_process_init(&argc, &argv); $1 }\n";
+         $_ = "int smpi_simulated_main_(int argc, char** argv) { smpi_process_init(&argc, &argv); $1 }\n";
       }
       print $tmp "$_\n";
    }