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 Actor (::this_actor remains)
[simgrid.git]
/
src
/
s4u
/
s4u_actor.cpp
diff --git
a/src/s4u/s4u_actor.cpp
b/src/s4u/s4u_actor.cpp
index
4ed7584
..
f0d1a57
100644
(file)
--- a/
src/s4u/s4u_actor.cpp
+++ b/
src/s4u/s4u_actor.cpp
@@
-61,11
+61,12
@@
void Actor::join(double timeout)
simcall_process_join(this->pimpl_, timeout);
}
simcall_process_join(this->pimpl_, timeout);
}
-void Actor::setAutoRestart(bool autorestart) {
+void Actor::set_auto_restart(bool autorestart)
+{
simgrid::simix::kernelImmediate([this, autorestart]() { pimpl_->auto_restart = autorestart; });
}
simgrid::simix::kernelImmediate([this, autorestart]() { pimpl_->auto_restart = autorestart; });
}
-void Actor::on
E
xit(int_f_pvoid_pvoid_t fun, void* data)
+void Actor::on
_e
xit(int_f_pvoid_pvoid_t fun, void* data)
{
simcall_process_on_exit(pimpl_, fun, data);
}
{
simcall_process_on_exit(pimpl_, fun, data);
}
@@
-143,12
+144,12
@@
const char* Actor::get_cname() const
return this->pimpl_->get_cname();
}
return this->pimpl_->get_cname();
}
-aid_t Actor::get_pid()
+aid_t Actor::get_pid()
const
{
return this->pimpl_->pid;
}
{
return this->pimpl_->pid;
}
-aid_t Actor::get_ppid()
+aid_t Actor::get_ppid()
const
{
return this->pimpl_->ppid;
}
{
return this->pimpl_->ppid;
}
@@
-168,17
+169,18
@@
void Actor::resume()
simgrid::instr::Container::byName(instr_pid(this))->getState("ACTOR_STATE")->popEvent();
}
simgrid::instr::Container::byName(instr_pid(this))->getState("ACTOR_STATE")->popEvent();
}
-int Actor::is
S
uspended()
+int Actor::is
_s
uspended()
{
return simgrid::simix::kernelImmediate([this] { return pimpl_->suspended; });
}
{
return simgrid::simix::kernelImmediate([this] { return pimpl_->suspended; });
}
-void Actor::setKillTime(double time) {
+void Actor::set_kill_time(double time)
+{
simcall_process_set_kill_time(pimpl_,time);
}
/** \brief Get the kill time of an actor(or 0 if unset). */
simcall_process_set_kill_time(pimpl_,time);
}
/** \brief Get the kill time of an actor(or 0 if unset). */
-double Actor::get
KillT
ime()
+double Actor::get
_kill_t
ime()
{
return SIMIX_timer_get_date(pimpl_->kill_timer);
}
{
return SIMIX_timer_get_date(pimpl_->kill_timer);
}
@@
-202,14
+204,14
@@
void Actor::kill() {
[this, process] { SIMIX_process_kill(pimpl_, (pimpl_ == simix_global->maestro_process) ? pimpl_ : process); });
}
[this, process] { SIMIX_process_kill(pimpl_, (pimpl_ == simix_global->maestro_process) ? pimpl_ : process); });
}
-smx_actor_t Actor::get
I
mpl()
+smx_actor_t Actor::get
_i
mpl()
{
return pimpl_;
}
// ***** Static functions *****
{
return pimpl_;
}
// ***** Static functions *****
-ActorPtr Actor::by
P
id(aid_t pid)
+ActorPtr Actor::by
_p
id(aid_t pid)
{
smx_actor_t process = SIMIX_process_from_PID(pid);
if (process != nullptr)
{
smx_actor_t process = SIMIX_process_from_PID(pid);
if (process != nullptr)
@@
-218,23
+220,23
@@
ActorPtr Actor::byPid(aid_t pid)
return ActorPtr();
}
return ActorPtr();
}
-void Actor::kill
A
ll()
+void Actor::kill
_a
ll()
{
simcall_process_killall();
}
{
simcall_process_killall();
}
-std::map<std::string, std::string>* Actor::get
P
roperties()
+std::map<std::string, std::string>* Actor::get
_p
roperties()
{
return simgrid::simix::kernelImmediate([this] { return this->pimpl_->getProperties(); });
}
/** Retrieve the property value (or nullptr if not set) */
{
return simgrid::simix::kernelImmediate([this] { return this->pimpl_->getProperties(); });
}
/** Retrieve the property value (or nullptr if not set) */
-const char* Actor::get
P
roperty(const char* key)
+const char* Actor::get
_p
roperty(const char* key)
{
return simgrid::simix::kernelImmediate([this, key] { return pimpl_->getProperty(key); });
}
{
return simgrid::simix::kernelImmediate([this, key] { return pimpl_->getProperty(key); });
}
-void Actor::set
P
roperty(const char* key, const char* value)
+void Actor::set
_p
roperty(const char* key, const char* value)
{
simgrid::simix::kernelImmediate([this, key, value] { pimpl_->setProperty(key, value); });
}
{
simgrid::simix::kernelImmediate([this, key, value] { pimpl_->setProperty(key, value); });
}
@@
-406,7
+408,7
@@
int sg_actor_get_PID(sg_actor_t actor)
{
/* Do not raise an exception here: this function is called by the logs
* and the exceptions, so it would be called back again and again */
{
/* Do not raise an exception here: this function is called by the logs
* and the exceptions, so it would be called back again and again */
- if (actor == nullptr || actor->get
I
mpl() == nullptr)
+ if (actor == nullptr || actor->get
_i
mpl() == nullptr)
return 0;
return actor->get_pid();
}
return 0;
return actor->get_pid();
}
@@
-444,7
+446,7
@@
sg_host_t sg_actor_get_host(sg_actor_t actor)
*/
const char* sg_actor_get_property_value(sg_actor_t actor, const char* name)
{
*/
const char* sg_actor_get_property_value(sg_actor_t actor, const char* name)
{
- return actor->get
P
roperty(name);
+ return actor->get
_p
roperty(name);
}
/** \ingroup m_actor_management
}
/** \ingroup m_actor_management
@@
-456,7
+458,7
@@
xbt_dict_t sg_actor_get_properties(sg_actor_t actor)
{
xbt_assert(actor != nullptr, "Invalid parameter: First argument must not be nullptr");
xbt_dict_t as_dict = xbt_dict_new_homogeneous(xbt_free_f);
{
xbt_assert(actor != nullptr, "Invalid parameter: First argument must not be nullptr");
xbt_dict_t as_dict = xbt_dict_new_homogeneous(xbt_free_f);
- std::map<std::string, std::string>* props = actor->get
P
roperties();
+ std::map<std::string, std::string>* props = actor->get
_p
roperties();
if (props == nullptr)
return nullptr;
for (auto const& elm : *props) {
if (props == nullptr)
return nullptr;
for (auto const& elm : *props) {
@@
-494,7
+496,7
@@
void sg_actor_resume(sg_actor_t actor)
*/
int sg_actor_is_suspended(sg_actor_t actor)
{
*/
int sg_actor_is_suspended(sg_actor_t actor)
{
- return actor->is
S
uspended();
+ return actor->is
_s
uspended();
}
/**
}
/**
@@
-548,5
+550,5
@@
void sg_actor_kill(sg_actor_t actor)
*/
void sg_actor_set_kill_time(sg_actor_t actor, double kill_time)
{
*/
void sg_actor_set_kill_time(sg_actor_t actor, double kill_time)
{
- actor->set
KillT
ime(kill_time);
+ actor->set
_kill_t
ime(kill_time);
}
}