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 back the master trunk into the smpi branch
[simgrid.git]
/
src
/
smpi
/
smpi_global.c
diff --git
a/src/smpi/smpi_global.c
b/src/smpi/smpi_global.c
index
0089372
..
13d3c59
100644
(file)
--- a/
src/smpi/smpi_global.c
+++ b/
src/smpi/smpi_global.c
@@
-107,7
+107,7
@@
int smpi_global_size(void) {
smpi_process_data_t smpi_process_data(void)
{
smpi_process_data_t smpi_process_data(void)
{
- return SIMIX_process_self_get_data();
+ return SIMIX_process_self_get_data(
SIMIX_process_self()
);
}
smpi_process_data_t smpi_process_remote_data(int index)
}
smpi_process_data_t smpi_process_remote_data(int index)
@@
-254,6
+254,7
@@
int MAIN__(void)
NULL);
if(getenv("SMPI_PRETEND_CC") != NULL) {
NULL);
if(getenv("SMPI_PRETEND_CC") != NULL) {
+ /* Hack to ensure that smpicc can pretend to be a simple compiler. Particularly handy to pass it to the configuration tools */
return 0;
}
return 0;
}
@@
-285,7
+286,7
@@
int MAIN__(void)
SIMIX_run();
if (xbt_cfg_get_int(_surf_cfg_set, "smpi/display_timing"))
SIMIX_run();
if (xbt_cfg_get_int(_surf_cfg_set, "smpi/display_timing"))
- XBT_INFO("
simulation time %g
", SIMIX_get_clock());
+ XBT_INFO("
Simulation time: %g seconds.
", SIMIX_get_clock());
smpi_global_destroy();
smpi_global_destroy();