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
use our new toys
[simgrid.git]
/
src
/
s4u
/
s4u_Actor.cpp
diff --git
a/src/s4u/s4u_Actor.cpp
b/src/s4u/s4u_Actor.cpp
index
1aac413
..
b1f7456
100644
(file)
--- a/
src/s4u/s4u_Actor.cpp
+++ b/
src/s4u/s4u_Actor.cpp
@@
-7,7
+7,9
@@
#include "simgrid/s4u/Actor.hpp"
#include "simgrid/s4u/Exec.hpp"
#include "simgrid/s4u/Host.hpp"
#include "simgrid/s4u/Actor.hpp"
#include "simgrid/s4u/Exec.hpp"
#include "simgrid/s4u/Host.hpp"
+#include "src/kernel/activity/ExecImpl.hpp"
#include "src/simix/smx_private.hpp"
#include "src/simix/smx_private.hpp"
+
#include <sstream>
XBT_LOG_NEW_DEFAULT_CATEGORY(s4u_actor, "S4U actors");
#include <sstream>
XBT_LOG_NEW_DEFAULT_CATEGORY(s4u_actor, "S4U actors");
@@
-34,13
+36,13
@@
ActorPtr Actor::self()
return self_context->process()->iface();
}
return self_context->process()->iface();
}
-ActorPtr Actor::create(
const char*
name, s4u::Host* host, std::function<void()> code)
+ActorPtr Actor::create(
std::string
name, s4u::Host* host, std::function<void()> code)
{
simgrid::kernel::actor::ActorImpl* actor = simcall_process_create(name, std::move(code), nullptr, host, nullptr);
return actor->iface();
}
{
simgrid::kernel::actor::ActorImpl* actor = simcall_process_create(name, std::move(code), nullptr, host, nullptr);
return actor->iface();
}
-ActorPtr Actor::create(
const char* name, s4u::Host* host, const char*
function, std::vector<std::string> args)
+ActorPtr Actor::create(
std::string name, s4u::Host* host, std::string
function, std::vector<std::string> args)
{
simgrid::simix::ActorCodeFactory& factory = SIMIX_get_actor_code_factory(function);
simgrid::simix::ActorCode code = factory(std::move(args));
{
simgrid::simix::ActorCodeFactory& factory = SIMIX_get_actor_code_factory(function);
simgrid::simix::ActorCode code = factory(std::move(args));
@@
-71,10
+73,15
@@
void Actor::join(double timeout)
void Actor::set_auto_restart(bool autorestart)
{
void Actor::set_auto_restart(bool autorestart)
{
- simgrid::simix::simcall([this, autorestart]() { pimpl_->
auto_restart = autorestart
; });
+ simgrid::simix::simcall([this, autorestart]() { pimpl_->
set_auto_restart(autorestart)
; });
}
}
-void Actor::on_exit(int_f_pvoid_pvoid_t fun, void* data)
+void Actor::on_exit(int_f_pvoid_pvoid_t fun, void* data) /* deprecated */
+{
+ simgrid::simix::simcall([this, fun, data] { SIMIX_process_on_exit(pimpl_, fun, data); });
+}
+
+void Actor::on_exit(std::function<void(int, void*)> fun, void* data)
{
simgrid::simix::simcall([this, fun, data] { SIMIX_process_on_exit(pimpl_, fun, data); });
}
{
simgrid::simix::simcall([this, fun, data] { SIMIX_process_on_exit(pimpl_, fun, data); });
}
@@
-109,7
+116,7
@@
void Actor::migrate(Host* new_host)
s4u::Host* Actor::get_host()
{
s4u::Host* Actor::get_host()
{
- return this->pimpl_->host;
+ return this->pimpl_->host
_
;
}
void Actor::daemonize()
}
void Actor::daemonize()
@@
-119,7
+126,7
@@
void Actor::daemonize()
bool Actor::is_daemon() const
{
bool Actor::is_daemon() const
{
- return this->pimpl_->is
D
aemon();
+ return this->pimpl_->is
_d
aemon();
}
const simgrid::xbt::string& Actor::get_name() const
}
const simgrid::xbt::string& Actor::get_name() const
@@
-134,12
+141,12
@@
const char* Actor::get_cname() const
aid_t Actor::get_pid() const
{
aid_t Actor::get_pid() const
{
- return this->pimpl_->pid;
+ return this->pimpl_->pid
_
;
}
aid_t Actor::get_ppid() const
{
}
aid_t Actor::get_ppid() const
{
- return this->pimpl_->ppid;
+ return this->pimpl_->ppid
_
;
}
void Actor::suspend()
}
void Actor::suspend()
@@
-154,9
+161,9
@@
void Actor::resume()
s4u::Actor::on_resume(this);
}
s4u::Actor::on_resume(this);
}
-
int
Actor::is_suspended()
+
bool
Actor::is_suspended()
{
{
- return simgrid::simix::simcall([this] { return pimpl_->suspended; });
+ return simgrid::simix::simcall([this] { return pimpl_->suspended
_
; });
}
void Actor::set_kill_time(double time)
}
void Actor::set_kill_time(double time)
@@
-164,7
+171,7
@@
void Actor::set_kill_time(double time)
simcall_process_set_kill_time(pimpl_, time);
}
simcall_process_set_kill_time(pimpl_, time);
}
-/**
\
brief Get the kill time of an actor(or 0 if unset). */
+/**
@
brief Get the kill time of an actor(or 0 if unset). */
double Actor::get_kill_time()
{
return SIMIX_timer_get_date(pimpl_->kill_timer);
double Actor::get_kill_time()
{
return SIMIX_timer_get_date(pimpl_->kill_timer);
@@
-212,20
+219,20
@@
void Actor::kill_all()
simgrid::simix::simcall([&self] { SIMIX_process_killall(self); });
}
simgrid::simix::simcall([&self] { SIMIX_process_killall(self); });
}
-std::map<std::string, std::string>* Actor::get_properties()
+std::
unordered_
map<std::string, std::string>* Actor::get_properties()
{
{
- return simgrid::simix::simcall([this] { return this->pimpl_->get
P
roperties(); });
+ return simgrid::simix::simcall([this] { return this->pimpl_->get
_p
roperties(); });
}
/** Retrieve the property value (or nullptr if not set) */
}
/** Retrieve the property value (or nullptr if not set) */
-const char* Actor::get_property(
const char*
key)
+const char* Actor::get_property(
std::string
key)
{
{
- return simgrid::simix::simcall([this, key] { return pimpl_->get
P
roperty(key); });
+ return simgrid::simix::simcall([this, key] { return pimpl_->get
_p
roperty(key); });
}
}
-void Actor::set_property(
const char* key, const char*
value)
+void Actor::set_property(
std::string key, std::string
value)
{
{
- simgrid::simix::simcall([this, key, value] { pimpl_->set
P
roperty(key, value); });
+ simgrid::simix::simcall([this, key, value] { pimpl_->set
_p
roperty(key, value); });
}
Actor* Actor::restart()
}
Actor* Actor::restart()
@@
-278,18
+285,18
@@
XBT_PUBLIC void sleep_until(double timeout)
void execute(double flops)
{
void execute(double flops)
{
-
get_host()->execute(flops
);
+
execute(flops, 1.0 /* priority */
);
}
void execute(double flops, double priority)
{
}
void execute(double flops, double priority)
{
-
get_host()->execute(flops, priority
);
+
exec_init(flops)->set_priority(priority)->start()->wait(
);
}
void parallel_execute(int host_nb, s4u::Host** host_list, double* flops_amount, double* bytes_amount, double timeout)
{
smx_activity_t s =
}
void parallel_execute(int host_nb, s4u::Host** host_list, double* flops_amount, double* bytes_amount, double timeout)
{
smx_activity_t s =
- simcall_execution_parallel_start(
nullptr
, host_nb, host_list, flops_amount, bytes_amount, /* rate */ -1, timeout);
+ simcall_execution_parallel_start(
""
, host_nb, host_list, flops_amount, bytes_amount, /* rate */ -1, timeout);
simcall_execution_wait(s);
}
simcall_execution_wait(s);
}
@@
-316,12
+323,12
@@
ExecPtr exec_async(double flops)
aid_t get_pid()
{
aid_t get_pid()
{
- return SIMIX_process_self()->pid;
+ return SIMIX_process_self()->pid
_
;
}
aid_t get_ppid()
{
}
aid_t get_ppid()
{
- return SIMIX_process_self()->ppid;
+ return SIMIX_process_self()->ppid
_
;
}
std::string get_name()
}
std::string get_name()
@@
-336,7
+343,7
@@
const char* get_cname()
Host* get_host()
{
Host* get_host()
{
- return SIMIX_process_self()->host;
+ return SIMIX_process_self()->host
_
;
}
void suspend()
}
void suspend()
@@
-357,16
+364,16
@@
void resume()
bool is_suspended()
{
smx_actor_t process = SIMIX_process_self();
bool is_suspended()
{
smx_actor_t process = SIMIX_process_self();
- return simgrid::simix::simcall([process] { return process->suspended; });
+ return simgrid::simix::simcall([process] { return process->suspended
_
; });
}
}
-void
kill
()
+void
exit
()
{
smx_actor_t process = SIMIX_process_self();
simgrid::simix::simcall([process] { SIMIX_process_kill(process, process); });
}
{
smx_actor_t process = SIMIX_process_self();
simgrid::simix::simcall([process] { SIMIX_process_kill(process, process); });
}
-void on_exit(
int_f_pvoid_pvoid_t
fun, void* data)
+void on_exit(
std::function<void(int, void*)>
fun, void* data)
{
SIMIX_process_self()->iface()->on_exit(fun, data);
}
{
SIMIX_process_self()->iface()->on_exit(fun, data);
}
@@
-408,9
+415,17
@@
bool isSuspended() /* deprecated */
{
return is_suspended();
}
{
return is_suspended();
}
-void onExit /* deprecated */ (int_f_pvoid_pvoid_t fun, void* data)
+void on_exit(int_f_pvoid_pvoid_t fun, void* data) /* deprecated */
+{
+ SIMIX_process_self()->iface()->on_exit([fun](int a, void* b) { fun((void*)(intptr_t)a, b); }, data);
+}
+void onExit(int_f_pvoid_pvoid_t fun, void* data) /* deprecated */
{
{
- on_exit(fun, data);
+ on_exit([fun](int a, void* b) { fun((void*)(intptr_t)a, b); }, data);
+}
+void kill() /* deprecated */
+{
+ exit();
}
} // namespace this_actor
}
} // namespace this_actor
@@
-419,10
+434,10
@@
void onExit /* deprecated */ (int_f_pvoid_pvoid_t fun, void* data)
/* **************************** Public C interface *************************** */
/* **************************** Public C interface *************************** */
-/**
\
ingroup m_actor_management
- *
\brief Returns the process ID of \
a actor.
+/**
@
ingroup m_actor_management
+ *
@brief Returns the process ID of @
a actor.
*
*
- * This function checks whether
\
a actor is a valid pointer and return its PID (or 0 in case of problem).
+ * This function checks whether
@
a actor is a valid pointer and return its PID (or 0 in case of problem).
*/
int sg_actor_get_PID(sg_actor_t actor)
{
*/
int sg_actor_get_PID(sg_actor_t actor)
{
@@
-433,10
+448,10
@@
int sg_actor_get_PID(sg_actor_t actor)
return actor->get_pid();
}
return actor->get_pid();
}
-/**
\
ingroup m_actor_management
- *
\brief Returns the process ID of the parent of \
a actor.
+/**
@
ingroup m_actor_management
+ *
@brief Returns the process ID of the parent of @
a actor.
*
*
- * This function checks whether
\
a actor is a valid pointer and return its parent's PID.
+ * This function checks whether
@
a actor is a valid pointer and return its parent's PID.
* Returns -1 if the actor has not been created by any other actor.
*/
int sg_actor_get_PPID(sg_actor_t actor)
* Returns -1 if the actor has not been created by any other actor.
*/
int sg_actor_get_PPID(sg_actor_t actor)
@@
-444,12
+459,12
@@
int sg_actor_get_PPID(sg_actor_t actor)
return actor->get_ppid();
}
return actor->get_ppid();
}
-/**
\
ingroup m_actor_management
+/**
@
ingroup m_actor_management
*
*
- *
\
brief Return a #sg_actor_t given its PID.
+ *
@
brief Return a #sg_actor_t given its PID.
*
*
- * This function search in the list of all the created sg_actor_t for a sg_actor_t whose PID is equal to
\
a PID.
- * If none is found,
\
c nullptr is returned.
+ * This function search in the list of all the created sg_actor_t for a sg_actor_t whose PID is equal to
@
a PID.
+ * If none is found,
@
c nullptr is returned.
Note that the PID are unique in the whole simulation, not only on a given host.
*/
sg_actor_t sg_actor_by_PID(aid_t pid)
Note that the PID are unique in the whole simulation, not only on a given host.
*/
sg_actor_t sg_actor_by_PID(aid_t pid)
@@
-457,8
+472,8
@@
sg_actor_t sg_actor_by_PID(aid_t pid)
return simgrid::s4u::Actor::by_pid(pid).get();
}
return simgrid::s4u::Actor::by_pid(pid).get();
}
-/**
\
ingroup m_actor_management
- *
\
brief Return the name of an actor.
+/**
@
ingroup m_actor_management
+ *
@
brief Return the name of an actor.
*/
const char* sg_actor_get_name(sg_actor_t actor)
{
*/
const char* sg_actor_get_name(sg_actor_t actor)
{
@@
-470,20
+485,20
@@
sg_host_t sg_actor_get_host(sg_actor_t actor)
return actor->get_host();
}
return actor->get_host();
}
-/**
\
ingroup m_actor_management
- *
\
brief Returns the value of a given actor property
+/**
@
ingroup m_actor_management
+ *
@
brief Returns the value of a given actor property
*
*
- *
\
param actor an actor
- *
\
param name a property name
- *
\
return value of a property (or nullptr if the property is not set)
+ *
@
param actor an actor
+ *
@
param name a property name
+ *
@
return value of a property (or nullptr if the property is not set)
*/
const char* sg_actor_get_property_value(sg_actor_t actor, const char* name)
{
return actor->get_property(name);
}
*/
const char* sg_actor_get_property_value(sg_actor_t actor, const char* name)
{
return actor->get_property(name);
}
-/**
\
ingroup m_actor_management
- *
\
brief Return the list of properties
+/**
@
ingroup m_actor_management
+ *
@
brief Return the list of properties
*
* This function returns all the parameters associated with an actor
*/
*
* This function returns all the parameters associated with an actor
*/
@@
-491,17
+506,17
@@
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_properties();
+ std::
unordered_
map<std::string, std::string>* props = actor->get_properties();
if (props == nullptr)
return nullptr;
if (props == nullptr)
return nullptr;
- for (auto const&
elm
: *props) {
- xbt_dict_set(as_dict,
elm.first.c_str(), xbt_strdup(elm
.second.c_str()), nullptr);
+ for (auto const&
kv
: *props) {
+ xbt_dict_set(as_dict,
kv.first.c_str(), xbt_strdup(kv
.second.c_str()), nullptr);
}
return as_dict;
}
}
return as_dict;
}
-/**
\
ingroup m_actor_management
- *
\
brief Suspend the actor.
+/**
@
ingroup m_actor_management
+ *
@
brief Suspend the actor.
*
* This function suspends the actor by suspending the task on which it was waiting for the completion.
*/
*
* This function suspends the actor by suspending the task on which it was waiting for the completion.
*/
@@
-511,8
+526,8
@@
void sg_actor_suspend(sg_actor_t actor)
actor->suspend();
}
actor->suspend();
}
-/**
\
ingroup m_actor_management
- *
\
brief Resume a suspended actor.
+/**
@
ingroup m_actor_management
+ *
@
brief Resume a suspended actor.
*
* This function resumes a suspended actor by resuming the task on which it was waiting for the completion.
*/
*
* This function resumes a suspended actor by resuming the task on which it was waiting for the completion.
*/
@@
-522,8
+537,8
@@
void sg_actor_resume(sg_actor_t actor)
actor->resume();
}
actor->resume();
}
-/**
\
ingroup m_actor_management
- *
\
brief Returns true if the actor is suspended .
+/**
@
ingroup m_actor_management
+ *
@
brief Returns true if the actor is suspended .
*
* This checks whether an actor is suspended or not by inspecting the task on which it was waiting for the completion.
*/
*
* This checks whether an actor is suspended or not by inspecting the task on which it was waiting for the completion.
*/
@@
-533,14
+548,24
@@
int sg_actor_is_suspended(sg_actor_t actor)
}
/**
}
/**
- *
\
ingroup m_actor_management
- *
\
brief Restarts an actor from the beginning.
+ *
@
ingroup m_actor_management
+ *
@
brief Restarts an actor from the beginning.
*/
sg_actor_t sg_actor_restart(sg_actor_t actor)
{
return actor->restart();
}
*/
sg_actor_t sg_actor_restart(sg_actor_t actor)
{
return actor->restart();
}
+/**
+ * @ingroup m_actor_management
+ * @brief Sets the "auto-restart" flag of the actor.
+ * If the flag is set to 1, the actor will be automatically restarted when its host comes back up.
+ */
+void sg_actor_set_auto_restart(sg_actor_t actor, int auto_restart)
+{
+ actor->set_auto_restart(auto_restart);
+}
+
/** @ingroup m_actor_management
* @brief This actor will be terminated automatically when the last non-daemon actor finishes
*/
/** @ingroup m_actor_management
* @brief This actor will be terminated automatically when the last non-daemon actor finishes
*/
@@
-549,21
+574,21
@@
void sg_actor_daemonize(sg_actor_t actor)
actor->daemonize();
}
actor->daemonize();
}
-/**
\
ingroup m_actor_management
- *
\
brief Migrates an actor to another location.
+/**
@
ingroup m_actor_management
+ *
@
brief Migrates an actor to another location.
*
*
- * This function changes the value of the #sg_host_t on which
\
a actor is running.
+ * This function changes the value of the #sg_host_t on which
@
a actor is running.
*/
void sg_actor_migrate(sg_actor_t process, sg_host_t host)
{
process->migrate(host);
}
*/
void sg_actor_migrate(sg_actor_t process, sg_host_t host)
{
process->migrate(host);
}
-/**
\
ingroup m_actor_management
- *
\
brief Wait for the completion of a #sg_actor_t.
+/**
@
ingroup m_actor_management
+ *
@
brief Wait for the completion of a #sg_actor_t.
*
*
- *
\
param actor the actor to wait for
- *
\
param timeout wait until the actor is over, or the timeout expires
+ *
@
param actor the actor to wait for
+ *
@
param timeout wait until the actor is over, or the timeout expires
*/
void sg_actor_join(sg_actor_t actor, double timeout)
{
*/
void sg_actor_join(sg_actor_t actor, double timeout)
{
@@
-580,11
+605,11
@@
void sg_actor_kill_all()
simgrid::s4u::Actor::kill_all();
}
simgrid::s4u::Actor::kill_all();
}
-/**
\
ingroup m_actor_management
- *
\
brief Set the kill time of an actor.
+/**
@
ingroup m_actor_management
+ *
@
brief Set the kill time of an actor.
*
*
- *
\
param actor an actor
- *
\
param kill_time the time when the actor is killed.
+ *
@
param actor an actor
+ *
@
param kill_time the time when the actor is killed.
*/
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)
{