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
SMPI does not need to have its own userdata pointer anymore
[simgrid.git]
/
src
/
smpi
/
internals
/
smpi_actor.cpp
diff --git
a/src/smpi/internals/smpi_actor.cpp
b/src/smpi/internals/smpi_actor.cpp
index
0cbacec
..
b7bf6e6
100644
(file)
--- a/
src/smpi/internals/smpi_actor.cpp
+++ b/
src/smpi/internals/smpi_actor.cpp
@@
-7,7
+7,6
@@
#include "mc/mc.h"
#include "smpi_comm.hpp"
#include "src/mc/mc_replay.hpp"
#include "mc/mc.h"
#include "smpi_comm.hpp"
#include "src/mc/mc_replay.hpp"
-#include "src/msg/msg_private.hpp"
#include "src/simix/smx_private.hpp"
#if HAVE_PAPI
#include "src/simix/smx_private.hpp"
#if HAVE_PAPI
@@
-128,16
+127,6
@@
bool ActorExt::replaying()
return replaying_;
}
return replaying_;
}
-void ActorExt::set_user_data(void* data)
-{
- data_ = data;
-}
-
-void* ActorExt::get_user_data()
-{
- return data_;
-}
-
ActorPtr ActorExt::get_actor()
{
return actor_;
ActorPtr ActorExt::get_actor()
{
return actor_;
@@
-249,7
+238,7
@@
void ActorExt::init(int* argc, char*** argv)
}
if (argc != nullptr && argv != nullptr) {
simgrid::s4u::ActorPtr proc = simgrid::s4u::Actor::self();
}
if (argc != nullptr && argv != nullptr) {
simgrid::s4u::ActorPtr proc = simgrid::s4u::Actor::self();
- proc->get_impl()->context_->set_cleanup(&
MSG_process_cleanup_from_SIMIX
);
+ proc->get_impl()->context_->set_cleanup(&
SIMIX_process_cleanup
);
char* instance_id = (*argv)[1];
try {
char* instance_id = (*argv)[1];
try {