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
Fix the execution with NS3
[simgrid.git]
/
src
/
smpi
/
smpi_global.cpp
diff --git
a/src/smpi/smpi_global.cpp
b/src/smpi/smpi_global.cpp
index
39d769a
..
0ae9822
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);
}