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
New option: smpi/keep-temps to not cleanup temp files
[simgrid.git]
/
src
/
smpi
/
smpi_global.cpp
diff --git
a/src/smpi/smpi_global.cpp
b/src/smpi/smpi_global.cpp
index
39d769a
..
7f62db8
100644
(file)
--- a/
src/smpi/smpi_global.cpp
+++ b/
src/smpi/smpi_global.cpp
@@
-95,7
+95,10
@@
int smpi_process_count()
simgrid::smpi::Process* smpi_process()
{
simgrid::smpi::Process* smpi_process()
{
- simgrid::MsgActorExt* msgExt = static_cast<simgrid::MsgActorExt*>(SIMIX_process_self()->data);
+ smx_actor_t me = SIMIX_process_self();
+ if (me == nullptr) // This happens sometimes (eg, when linking against NS3 because it pulls openMPI...)
+ return nullptr;
+ simgrid::MsgActorExt* msgExt = static_cast<simgrid::MsgActorExt*>(me->data);
return static_cast<simgrid::smpi::Process*>(msgExt->data);
}
return static_cast<simgrid::smpi::Process*>(msgExt->data);
}
@@
-603,7
+606,8
@@
int smpi_main(const char* executable, int argc, char *argv[])
// Load the copy and resolve the entry point:
void* handle = dlopen(target_executable.c_str(), RTLD_LAZY | RTLD_LOCAL | RTLD_DEEPBIND);
// Load the copy and resolve the entry point:
void* handle = dlopen(target_executable.c_str(), RTLD_LAZY | RTLD_LOCAL | RTLD_DEEPBIND);
- unlink(target_executable.c_str());
+ if (xbt_cfg_get_boolean("smpi/keep-temps") == false)
+ unlink(target_executable.c_str());
if (handle == nullptr)
xbt_die("dlopen failed: %s (errno: %d -- %s)", dlerror(), errno, strerror(errno));
smpi_entry_point_type entry_point = smpi_resolve_function(handle);
if (handle == nullptr)
xbt_die("dlopen failed: %s (errno: %d -- %s)", dlerror(), errno, strerror(errno));
smpi_entry_point_type entry_point = smpi_resolve_function(handle);