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
further snake_case in routing
[simgrid.git]
/
src
/
s4u
/
s4u_actor.cpp
diff --git
a/src/s4u/s4u_actor.cpp
b/src/s4u/s4u_actor.cpp
index
0f329ae
..
8960fb8
100644
(file)
--- a/
src/s4u/s4u_actor.cpp
+++ b/
src/s4u/s4u_actor.cpp
@@
-119,7
+119,7
@@
void Actor::migrate(Host* new_host)
if (TRACE_actor_is_enabled()) {
// create new container on the new_host location
if (TRACE_actor_is_enabled()) {
// create new container on the new_host location
- simgrid::instr::Container::byName(new_host->get
N
ame())->createChild(instr_pid(this), "ACTOR");
+ simgrid::instr::Container::byName(new_host->get
_n
ame())->createChild(instr_pid(this), "ACTOR");
// end link
link->endEvent(simgrid::instr::Container::byName(instr_pid(this)), "M", key);
}
// end link
link->endEvent(simgrid::instr::Container::byName(instr_pid(this)), "M", key);
}
@@
-140,14
+140,14
@@
bool Actor::isDaemon()
return this->pimpl_->isDaemon();
}
return this->pimpl_->isDaemon();
}
-const simgrid::xbt::string& Actor::get
N
ame() const
+const simgrid::xbt::string& Actor::get
_n
ame() const
{
{
- return this->pimpl_->get
N
ame();
+ return this->pimpl_->get
_n
ame();
}
}
-const char* Actor::get
C
name() const
+const char* Actor::get
_c
name() const
{
{
- return this->pimpl_->get
C
name();
+ return this->pimpl_->get
_c
name();
}
aid_t Actor::getPid()
}
aid_t Actor::getPid()
@@
-339,14
+339,14
@@
aid_t getPpid()
return SIMIX_process_self()->ppid;
}
return SIMIX_process_self()->ppid;
}
-std::string get
N
ame()
+std::string get
_n
ame()
{
{
- return SIMIX_process_self()->get
N
ame();
+ return SIMIX_process_self()->get
_n
ame();
}
}
-const char* get
C
name()
+const char* get
_c
name()
{
{
- return SIMIX_process_self()->get
C
name();
+ return SIMIX_process_self()->get
_c
name();
}
Host* getHost()
}
Host* getHost()
@@
-357,7
+357,9
@@
Host* getHost()
void suspend()
{
if (TRACE_actor_is_enabled())
void suspend()
{
if (TRACE_actor_is_enabled())
- instr::Container::byName(getName() + "-" + std::to_string(getPid()))->getState("ACTOR_STATE")->pushEvent("suspend");
+ instr::Container::byName(get_name() + "-" + std::to_string(getPid()))
+ ->getState("ACTOR_STATE")
+ ->pushEvent("suspend");
simcall_process_suspend(SIMIX_process_self());
}
simcall_process_suspend(SIMIX_process_self());
}
@@
-367,7
+369,7
@@
void resume()
simgrid::simix::kernelImmediate([process] { process->resume(); });
if (TRACE_actor_is_enabled())
simgrid::simix::kernelImmediate([process] { process->resume(); });
if (TRACE_actor_is_enabled())
- instr::Container::byName(get
N
ame() + "-" + std::to_string(getPid()))->getState("ACTOR_STATE")->popEvent();
+ instr::Container::byName(get
_n
ame() + "-" + std::to_string(getPid()))->getState("ACTOR_STATE")->popEvent();
}
bool isSuspended()
}
bool isSuspended()
@@
-401,7
+403,7
@@
void migrate(Host* new_host)
} // namespace simgrid
/* **************************** Public C interface *************************** */
} // namespace simgrid
/* **************************** Public C interface *************************** */
-SG_BEGIN_DECL()
+
/** \ingroup m_actor_management
* \brief Returns the process ID of \a actor.
*
/** \ingroup m_actor_management
* \brief Returns the process ID of \a actor.
*
@@
-432,7
+434,7
@@
int sg_actor_get_PPID(sg_actor_t actor)
*/
const char* sg_actor_get_name(sg_actor_t actor)
{
*/
const char* sg_actor_get_name(sg_actor_t actor)
{
- return actor->get
C
name();
+ return actor->get
_c
name();
}
sg_host_t sg_actor_get_host(sg_actor_t actor)
}
sg_host_t sg_actor_get_host(sg_actor_t actor)
@@
-555,5
+557,3
@@
void sg_actor_set_kill_time(sg_actor_t actor, double kill_time)
{
actor->setKillTime(kill_time);
}
{
actor->setKillTime(kill_time);
}
-
-SG_END_DECL()