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
add yet another stunt with smpi_simulated_main to provide support for f90
[simgrid.git]
/
src
/
smpi
/
smpi_global.c
diff --git
a/src/smpi/smpi_global.c
b/src/smpi/smpi_global.c
index
1baf3ea
..
07b04a1
100644
(file)
--- a/
src/smpi/smpi_global.c
+++ b/
src/smpi/smpi_global.c
@@
-286,21
+286,26
@@
void smpi_global_destroy(void)
/* Fortran specific stuff */
/* With smpicc, the following weak symbols are used */
/* With smpiff, the following weak symbols are replaced by those in libf2c */
/* Fortran specific stuff */
/* With smpicc, the following weak symbols are used */
/* With smpiff, the following weak symbols are replaced by those in libf2c */
-
int __attribute__((weak)) xargc;
char** __attribute__((weak)) xargv;
int __attribute__((weak)) xargc;
char** __attribute__((weak)) xargv;
-
-int __attribute__((weak)) smpi_simulated_main(int argc, char** argv) {
+void __attribute__((weak)) user_main__(){
xbt_die("Should not be in this smpi_simulated_main");
xbt_die("Should not be in this smpi_simulated_main");
- return 1;
+ return;
+}
+
+int __attribute__((weak)) smpi_simulated_main__(int argc, char** argv) {
+ smpi_process_init(&argc, &argv);
+ user_main__();
+ //xbt_die("Should not be in this smpi_simulated_main");
+ return 0;
}
int __attribute__((weak)) main(int argc, char** argv) {
}
int __attribute__((weak)) main(int argc, char** argv) {
- return smpi_main(smpi_simulated_main,argc,argv);
+ return smpi_main(smpi_simulated_main
__
,argc,argv);
}
int __attribute__((weak)) MAIN__(){
}
int __attribute__((weak)) MAIN__(){
- return smpi_main(smpi_simulated_main,xargc, xargv);
+ return smpi_main(smpi_simulated_main
__
,xargc, xargv);
};
int smpi_main(int (*realmain) (int argc, char *argv[]),int argc, char *argv[])
};
int smpi_main(int (*realmain) (int argc, char *argv[]),int argc, char *argv[])
@@
-349,7
+354,7
@@
int smpi_main(int (*realmain) (int argc, char *argv[]),int argc, char *argv[])
fflush(stderr);
if (MC_is_active())
fflush(stderr);
if (MC_is_active())
- MC_modelcheck();
+ MC_modelcheck
_safety
();
else
SIMIX_run();
else
SIMIX_run();