X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/9bfc714f74d8044a224b5c94ad3f69e540361841..12e37132d1b9b141fa8497e17b0629cfd4173c36:/src/s4u/s4u_Actor.cpp diff --git a/src/s4u/s4u_Actor.cpp b/src/s4u/s4u_Actor.cpp index 945dfb47fd..ec1085f1b9 100644 --- a/src/s4u/s4u_Actor.cpp +++ b/src/s4u/s4u_Actor.cpp @@ -1,4 +1,4 @@ -/* Copyright (c) 2006-2018. The SimGrid Team. All rights reserved. */ +/* Copyright (c) 2006-2019. The SimGrid Team. All rights reserved. */ /* This program is free software; you can redistribute it and/or modify it * under the terms of the license (GNU LGPL) which comes with this package. */ @@ -31,11 +31,11 @@ simgrid::xbt::signal s4u::Actor::on_destruction; // ***** Actor creation ***** ActorPtr Actor::self() { - smx_context_t self_context = SIMIX_context_self(); + smx_context_t self_context = simgrid::kernel::context::Context::self(); if (self_context == nullptr) return simgrid::s4u::ActorPtr(); - return self_context->process()->iface(); + return self_context->get_actor()->iface(); } ActorPtr Actor::create(std::string name, s4u::Host* host, std::function code) @@ -47,9 +47,7 @@ ActorPtr Actor::create(std::string name, s4u::Host* host, std::function ActorPtr Actor::create(std::string name, s4u::Host* host, std::string function, std::vector args) { simgrid::simix::ActorCodeFactory& factory = SIMIX_get_actor_code_factory(function); - simgrid::simix::ActorCode code = factory(std::move(args)); - simgrid::kernel::actor::ActorImpl* actor = simcall_process_create(name, std::move(code), nullptr, host, nullptr); - return actor->iface(); + return create(name, host, factory(std::move(args))); } void intrusive_ptr_add_ref(Actor* actor) @@ -108,7 +106,7 @@ void Actor::migrate(Host* new_host) xbt_assert(exec.get() != nullptr, "We can only migrate blocked actors when they are blocked on executions."); exec->migrate(new_host); } - SIMIX_process_change_host(this->pimpl_, new_host); + this->pimpl_->set_host(new_host); }); s4u::Actor::on_migration_end(this); @@ -166,9 +164,9 @@ bool Actor::is_suspended() return simgrid::simix::simcall([this] { return pimpl_->suspended_; }); } -void Actor::set_kill_time(double time) +void Actor::set_kill_time(double kill_time) { - simcall_process_set_kill_time(pimpl_, time); + simgrid::simix::simcall([this, kill_time] { pimpl_->set_kill_time(kill_time); }); } /** @brief Get the kill time of an actor(or 0 if unset). */ @@ -177,12 +175,12 @@ double Actor::get_kill_time() return SIMIX_timer_get_date(pimpl_->kill_timer); } -void Actor::kill(aid_t pid) +void Actor::kill(aid_t pid) // deprecated { smx_actor_t killer = SIMIX_process_self(); - smx_actor_t process = SIMIX_process_from_PID(pid); - if (process != nullptr) { - simgrid::simix::simcall([killer, process] { SIMIX_process_kill(process, killer); }); + smx_actor_t victim = SIMIX_process_from_PID(pid); + if (victim != nullptr) { + simgrid::simix::simcall([killer, victim] { killer->kill(victim); }); } else { std::ostringstream oss; oss << "kill: (" << pid << ") - No such actor" << std::endl; @@ -193,8 +191,12 @@ void Actor::kill(aid_t pid) void Actor::kill() { smx_actor_t process = SIMIX_process_self(); - simgrid::simix::simcall( - [this, process] { SIMIX_process_kill(pimpl_, (pimpl_ == simix_global->maestro_process) ? pimpl_ : process); }); + simgrid::simix::simcall([this, process] { + if (pimpl_ == simix_global->maestro_process) + pimpl_->exit(); + else + process->kill(pimpl_); + }); } smx_actor_t Actor::get_impl() @@ -216,7 +218,7 @@ ActorPtr Actor::by_pid(aid_t pid) void Actor::kill_all() { smx_actor_t self = SIMIX_process_self(); - simgrid::simix::simcall([&self] { SIMIX_process_killall(self); }); + simgrid::simix::simcall([self] { self->kill_all(); }); } std::unordered_map* Actor::get_properties() @@ -293,25 +295,55 @@ void execute(double flops, double 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) +void parallel_execute(const std::vector& hosts, const std::vector& flops_amounts, + const std::vector& bytes_amounts) +{ + parallel_execute(hosts, flops_amounts, bytes_amounts, -1); +} +void parallel_execute(const std::vector& hosts, const std::vector& flops_amounts, + const std::vector& bytes_amounts, double timeout) +{ + xbt_assert(hosts.size() > 0, "Your parallel executions must span over at least one host."); + xbt_assert(hosts.size() == flops_amounts.size() || flops_amounts.empty(), + "Host count (%zu) does not match flops_amount count (%zu).", hosts.size(), flops_amounts.size()); + xbt_assert(hosts.size() * hosts.size() == bytes_amounts.size() || bytes_amounts.empty(), + "bytes_amounts must be a matrix of size host_count * host_count (%zu*%zu), but it's of size %zu.", + hosts.size(), hosts.size(), flops_amounts.size()); + + /* The vectors live as parameter of parallel_execute. No copy is created for simcall_execution_parallel_start(), + * but that's OK because simcall_execution_wait() is called from here too. + */ + smx_activity_t s = simcall_execution_parallel_start("", hosts.size(), hosts.data(), + (flops_amounts.empty() ? nullptr : flops_amounts.data()), + (bytes_amounts.empty() ? nullptr : bytes_amounts.data()), + /* rate */ -1, timeout); + simcall_execution_wait(s); +} + +// 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; } -void parallel_execute(int host_nb, sg_host_t* host_list, double* flops_amount, double* bytes_amount) +// deprecated +void parallel_execute(int host_nb, s4u::Host* const* host_list, const double* flops_amount, const double* bytes_amount) { - parallel_execute(host_nb, host_list, flops_amount, bytes_amount, /* timeout */ -1); + 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) { - ExecPtr res = ExecPtr(new Exec()); - res->host_ = get_host(); - res->flops_amount_ = flops_amount; - res->set_remaining(flops_amount); - return res; + return ExecPtr(new Exec(get_host(), flops_amount)); } ExecPtr exec_async(double flops) @@ -361,16 +393,10 @@ void resume() simgrid::s4u::Actor::on_resume(process->iface()); } -bool is_suspended() -{ - smx_actor_t process = SIMIX_process_self(); - return simgrid::simix::simcall([process] { return process->suspended_; }); -} - void exit() { - smx_actor_t process = SIMIX_process_self(); - simgrid::simix::simcall([process] { SIMIX_process_kill(process, process); }); + smx_actor_t actor = SIMIX_process_self(); + simgrid::simix::simcall([actor] { actor->exit(); }); } void on_exit(std::function fun, void* data) @@ -411,10 +437,6 @@ Host* getHost() /* deprecated */ { return get_host(); } -bool isSuspended() /* deprecated */ -{ - return is_suspended(); -} 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); @@ -439,7 +461,7 @@ void kill() /* deprecated */ * * 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) +aid_t 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 */ @@ -454,7 +476,7 @@ int sg_actor_get_PID(sg_actor_t actor) * 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) +aid_t sg_actor_get_PPID(sg_actor_t actor) { return actor->get_ppid(); } @@ -621,3 +643,8 @@ void sg_actor_yield() { simgrid::s4u::this_actor::yield(); } + +void sg_actor_sleep_for(double duration) +{ + simgrid::s4u::this_actor::sleep_for(duration); +}