#include "src/include/mc/mc.h"
#include "src/kernel/activity/ExecImpl.hpp"
#include "src/mc/mc_replay.hpp"
-#include "src/simix/smx_private.hpp"
#include "src/surf/HostImpl.hpp"
#include <algorithm>
return self_context->get_actor()->ciface();
}
+
ActorPtr Actor::init(const std::string& name, s4u::Host* host)
{
- smx_actor_t self = SIMIX_process_self();
+ kernel::actor::ActorImpl* self = SIMIX_process_self();
kernel::actor::ActorImpl* actor =
kernel::actor::simcall([self, &name, host] { return self->init(name, host).get(); });
return actor->iface();
ActorPtr Actor::create(const std::string& name, s4u::Host* host, const std::function<void()>& code)
{
- smx_actor_t self = SIMIX_process_self();
+ kernel::actor::ActorImpl* self = SIMIX_process_self();
kernel::actor::ActorImpl* actor =
kernel::actor::simcall([self, &name, host, &code] { return self->init(name, host)->start(code); });
void Actor::join(double timeout)
{
- auto issuer = SIMIX_process_self();
- auto target = pimpl_;
- kernel::actor::simcall_blocking([issuer, target, timeout] {
+ kernel::actor::ActorImpl* issuer = SIMIX_process_self();
+ kernel::actor::ActorImpl* target = pimpl_;
+ kernel::actor::simcall_blocking<void>([issuer, target, timeout] {
if (target->finished_) {
// The joined process is already finished, just wake up the issuer right away
issuer->simcall_answer();
pimpl_->set_auto_restart(autorestart);
kernel::actor::ProcessArg* arg = new kernel::actor::ProcessArg(pimpl_->get_host(), pimpl_);
- XBT_DEBUG("Adding Process %s to the actors_at_boot_ list of Host %s", arg->name.c_str(), arg->host->get_cname());
- pimpl_->get_host()->pimpl_->actors_at_boot_.emplace_back(arg);
+ XBT_DEBUG("Adding %s to the actors_at_boot_ list of Host %s", arg->name.c_str(), arg->host->get_cname());
+ pimpl_->get_host()->pimpl_->add_actor_at_boot(arg);
});
}
-void Actor::on_exit(const std::function<void(int, void*)>& fun, void* data) /* deprecated */
-{
- on_exit([fun, data](bool failed) { fun(failed ? SMX_EXIT_FAILURE : SMX_EXIT_SUCCESS, data); });
-}
-
void Actor::on_exit(const std::function<void(bool /*failed*/)>& fun) const
{
kernel::actor::simcall([this, &fun] { SIMIX_process_on_exit(pimpl_, fun); });
kernel::actor::simcall([this, new_host]() {
if (pimpl_->waiting_synchro != nullptr) {
// The actor is blocked on an activity. If it's an exec, migrate it too.
- // FIXME: implement the migration of other kind of activities
+ // FIXME: implement the migration of other kinds of activities
kernel::activity::ExecImplPtr exec =
boost::dynamic_pointer_cast<kernel::activity::ExecImpl>(pimpl_->waiting_synchro);
xbt_assert(exec.get() != nullptr, "We can only migrate blocked actors when they are blocked on executions.");
void Actor::suspend()
{
- auto issuer = SIMIX_process_self();
- auto target = pimpl_;
+ kernel::actor::ActorImpl* issuer = SIMIX_process_self();
+ kernel::actor::ActorImpl* target = pimpl_;
s4u::Actor::on_suspend(*this);
- kernel::actor::simcall_blocking([issuer, target]() {
- target->suspend(issuer);
+ kernel::actor::simcall_blocking<void>([issuer, target]() {
+ target->suspend();
if (target != issuer) {
/* If we are suspending ourselves, then just do not finish the simcall now */
issuer->simcall_answer();
return pimpl_->get_kill_time();
}
-void Actor::kill(aid_t pid) // deprecated
-{
- kernel::actor::ActorImpl* killer = SIMIX_process_self();
- kernel::actor::ActorImpl* victim = SIMIX_process_from_PID(pid);
- if (victim != nullptr) {
- kernel::actor::simcall([killer, victim] { killer->kill(victim); });
- } else {
- std::ostringstream oss;
- oss << "kill: (" << pid << ") - No such actor" << std::endl;
- throw std::runtime_error(oss.str());
- }
-}
-
void Actor::kill()
{
- kernel::actor::ActorImpl* process = SIMIX_process_self();
- kernel::actor::simcall([this, process] {
- xbt_assert(pimpl_ != simix_global->maestro_process, "Killing maestro is a rather bad idea");
- process->kill(pimpl_);
- });
+ kernel::actor::ActorImpl* self = SIMIX_process_self();
+ kernel::actor::simcall([this, self] { self->kill(pimpl_); });
}
// ***** Static functions *****
ActorPtr Actor::by_pid(aid_t pid)
{
- kernel::actor::ActorImpl* process = SIMIX_process_from_PID(pid);
- if (process != nullptr)
- return process->iface();
+ kernel::actor::ActorImpl* actor = SIMIX_process_from_PID(pid);
+ if (actor != nullptr)
+ return actor->iface();
else
return ActorPtr();
}
*/
bool is_maestro()
{
- kernel::actor::ActorImpl* process = SIMIX_process_self();
- return process == nullptr || process == simix_global->maestro_process;
+ return SIMIX_is_maestro();
}
void sleep_for(double duration)
kernel::actor::ActorImpl* issuer = SIMIX_process_self();
Actor::on_sleep(*issuer->ciface());
- kernel::actor::simcall_blocking([issuer, duration]() {
+ kernel::actor::simcall_blocking<void>([issuer, duration]() {
if (MC_is_active() || MC_record_replay_is_active()) {
MC_process_clock_add(issuer, duration);
issuer->simcall_answer();
exec_init(hosts, flops_amounts, bytes_amounts)->set_timeout(timeout)->wait();
}
-// deprecated
-void parallel_execute(int host_nb, s4u::Host* const* host_list, const double* flops_amount, const double* bytes_amount,
- double timeout)
-{
- smx_activity_t s =
- simcall_execution_parallel_start("", host_nb, host_list, flops_amount, bytes_amount, /* rate */ -1, timeout);
- simcall_execution_wait(s);
- delete[] flops_amount;
- delete[] bytes_amount;
-}
-
-// deprecated
-void parallel_execute(int host_nb, s4u::Host* const* host_list, const double* flops_amount, const double* bytes_amount)
-{
- smx_activity_t s = simcall_execution_parallel_start("", host_nb, host_list, flops_amount, bytes_amount,
- /* rate */ -1, /*timeout*/ -1);
- simcall_execution_wait(s);
- delete[] flops_amount;
- delete[] bytes_amount;
-}
-
ExecPtr exec_init(double flops_amount)
{
return ExecPtr(new ExecSeq(get_host(), flops_amount));
void suspend()
{
- SIMIX_process_self()->iface()->suspend();
+ kernel::actor::ActorImpl* self = SIMIX_process_self();
+ s4u::Actor::on_suspend(*self->ciface());
+ kernel::actor::simcall_blocking<void>([self] { self->suspend(); });
}
void resume()
SIMIX_process_self()->iface()->on_exit(fun);
}
-void on_exit(const std::function<void(int, void*)>& fun, void* data) /* deprecated */
-{
- SIMIX_process_self()->iface()->on_exit([fun, data](bool exit) { fun(exit, data); });
-}
-
/** @brief Moves the current actor to another host
*
* @see simgrid::s4u::Actor::migrate() for more information
/* **************************** Public C interface *************************** */
+sg_actor_t sg_actor_init(const char* name, sg_host_t host)
+{
+ return simgrid::s4u::Actor::init(name, host).get();
+}
+
+void sg_actor_start(sg_actor_t actor, xbt_main_func_t code, int argc, char** argv)
+{
+ simgrid::simix::ActorCode function;
+ if (code)
+ function = simgrid::xbt::wrap_main(code, argc, static_cast<const char* const*>(argv));
+ actor->start(std::move(function));
+}
+
/** @ingroup m_actor_management
* @brief Returns the process ID of @a actor.
*
if (props == nullptr)
return nullptr;
for (auto const& kv : *props) {
- xbt_dict_set(as_dict, kv.first.c_str(), xbt_strdup(kv.second.c_str()), nullptr);
+ xbt_dict_set(as_dict, kv.first.c_str(), xbt_strdup(kv.second.c_str()));
}
return as_dict;
}
{
intrusive_ptr_release(actor);
}
+
+/** @brief Return the user data of a #sg_actor_t */
+void* sg_actor_data(sg_actor_t actor)
+{
+ return actor->get_data();
+}
+/** @brief Set the user data of a #sg_actor_t */
+void sg_actor_data_set(sg_actor_t actor, void* userdata)
+{
+ actor->set_data(userdata);
+}
