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
move simix::ActorImpl to kernel::actor::ActorImpl
[simgrid.git]
/
src
/
simix
/
ActorImpl.cpp
diff --git
a/src/simix/ActorImpl.cpp
b/src/simix/ActorImpl.cpp
index
95cec9d
..
8d94d4e
100644
(file)
--- a/
src/simix/ActorImpl.cpp
+++ b/
src/simix/ActorImpl.cpp
@@
-146,7
+146,8
@@
void SIMIX_process_empty_trash()
namespace simgrid {
namespace simgrid {
-namespace simix {
+namespace kernel {
+namespace actor {
ActorImpl::~ActorImpl()
{
ActorImpl::~ActorImpl()
{
@@
-182,7
+183,7
@@
simgrid::s4u::Actor* ActorImpl::restart()
// retrieve the arguments of the old process
// FIXME: Factorize this with SIMIX_host_add_auto_restart_process ?
// retrieve the arguments of the old process
// FIXME: Factorize this with SIMIX_host_add_auto_restart_process ?
- simgrid::
simix
::ProcessArg arg;
+ simgrid::
kernel::actor
::ProcessArg arg;
arg.name = name;
arg.code = code;
arg.host = host;
arg.name = name;
arg.code = code;
arg.host = host;
@@
-264,7
+265,7
@@
void create_maestro(std::function<void()> code)
{
smx_actor_t maestro = nullptr;
/* Create maestro process and initialize it */
{
smx_actor_t maestro = nullptr;
/* Create maestro process and initialize it */
- maestro
= new simgrid::simix
::ActorImpl();
+ maestro
= new simgrid::kernel::actor
::ActorImpl();
maestro->pid = simix_process_maxpid++;
maestro->name = "";
maestro->userdata = nullptr;
maestro->pid = simix_process_maxpid++;
maestro->name = "";
maestro->userdata = nullptr;
@@
-281,13
+282,14
@@
void create_maestro(std::function<void()> code)
simix_global->maestro_process = maestro;
}
simix_global->maestro_process = maestro;
}
+} // namespace actor
}
}
/** @brief Creates and runs the maestro process */
void SIMIX_maestro_create(void (*code)(void*), void* data)
{
}
}
/** @brief Creates and runs the maestro process */
void SIMIX_maestro_create(void (*code)(void*), void* data)
{
- simgrid::
simix
::create_maestro(std::bind(code, data));
+ simgrid::
kernel::actor
::create_maestro(std::bind(code, data));
}
/**
}
/**
@@
-310,7
+312,7
@@
smx_actor_t SIMIX_process_create(const char* name, std::function<void()> code, v
return nullptr;
}
return nullptr;
}
- smx_actor_t process = new simgrid::
simix
::ActorImpl();
+ smx_actor_t process = new simgrid::
kernel::actor
::ActorImpl();
xbt_assert(code && host != nullptr, "Invalid parameters");
/* Process data */
xbt_assert(code && host != nullptr, "Invalid parameters");
/* Process data */
@@
-372,7
+374,7
@@
smx_actor_t SIMIX_process_attach(const char* name, void* data, const char* hostn
return nullptr;
}
return nullptr;
}
- smx_actor_t process = new simgrid::
simix
::ActorImpl();
+ smx_actor_t process = new simgrid::
kernel::actor
::ActorImpl();
/* Process data */
process->pid = simix_process_maxpid++;
process->name = std::string(name);
/* Process data */
process->pid = simix_process_maxpid++;
process->name = std::string(name);