#include "simgrid/Exception.hpp"
#include "simgrid/modelchecker.h"
#include "src/mc/mc_replay.hpp"
-#include "src/simix/smx_host_private.hpp"
+#include "src/surf/HostImpl.hpp"
#include "src/surf/cpu_interface.hpp"
#include "src/surf/surf_interface.hpp"
XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(simix_process);
-void simcall_HANDLER_execution_wait(smx_simcall_t simcall, smx_activity_t synchro)
+void simcall_HANDLER_execution_wait(smx_simcall_t simcall, simgrid::kernel::activity::ExecImpl* synchro)
{
- XBT_DEBUG("Wait for execution of synchro %p, state %d", synchro.get(), (int)synchro->state_);
+ XBT_DEBUG("Wait for execution of synchro %p, state %d", synchro, (int)synchro->state_);
/* Associate this simcall to the synchro */
- synchro->simcalls_.push_back(simcall);
- simcall->issuer->waiting_synchro = synchro;
+ synchro->register_simcall(simcall);
/* set surf's synchro */
if (MC_is_active() || MC_record_replay_is_active()) {
synchro->state_ = SIMIX_DONE;
- boost::static_pointer_cast<simgrid::kernel::activity::ExecImpl>(synchro)->finish();
+ synchro->finish();
return;
}
/* If the synchro is already finished then perform the error handling */
if (synchro->state_ != SIMIX_RUNNING)
- boost::static_pointer_cast<simgrid::kernel::activity::ExecImpl>(synchro)->finish();
+ synchro->finish();
}
void simcall_HANDLER_execution_test(smx_simcall_t simcall, simgrid::kernel::activity::ExecImpl* synchro)
{
- int res = (synchro->state_ != SIMIX_WAITING && synchro->state_ != SIMIX_RUNNING);
+ bool res = (synchro->state_ != SIMIX_WAITING && synchro->state_ != SIMIX_RUNNING);
if (res) {
synchro->simcalls_.push_back(simcall);
synchro->finish();
namespace kernel {
namespace activity {
-ExecImpl::ExecImpl(std::string name, std::string tracing_category, resource::Action* timeout_detector, s4u::Host* host)
- : ActivityImpl(std::move(name)), host_(host), timeout_detector_(timeout_detector)
+ExecImpl::~ExecImpl()
{
- this->state_ = SIMIX_RUNNING;
- this->set_category(std::move(tracing_category));
+ if (timeout_detector_)
+ timeout_detector_->unref();
+ XBT_DEBUG("Destroy exec %p", this);
+}
- if (timeout_detector != nullptr)
- timeout_detector_->set_data(this);
+ExecImpl& ExecImpl::set_host(s4u::Host* host)
+{
+ if (not hosts_.empty())
+ hosts_.clear();
+ hosts_.push_back(host);
+ return *this;
+}
- XBT_DEBUG("Create exec %p", this);
+ExecImpl& ExecImpl::set_hosts(const std::vector<s4u::Host*>& hosts)
+{
+ hosts_ = hosts;
+ return *this;
}
-ExecImpl::~ExecImpl()
+ExecImpl& ExecImpl::set_timeout(double timeout)
{
- if (surf_action_)
- surf_action_->unref();
- if (timeout_detector_)
- timeout_detector_->unref();
- XBT_DEBUG("Destroy exec %p", this);
+ if (timeout > 0 && not MC_is_active() && not MC_record_replay_is_active()) {
+ timeout_detector_ = hosts_.front()->pimpl_cpu->sleep(timeout);
+ timeout_detector_->set_activity(this);
+ }
+ return *this;
}
-ExecImpl* ExecImpl::start(double flops_amount, double priority, double bound)
+ExecImpl& ExecImpl::set_flops_amount(double flops_amount)
{
+ if (not flops_amounts_.empty())
+ flops_amounts_.clear();
+ flops_amounts_.push_back(flops_amount);
+ return *this;
+}
+
+ExecImpl& ExecImpl::set_flops_amounts(const std::vector<double>& flops_amounts)
+{
+ flops_amounts_ = flops_amounts;
+ return *this;
+}
+
+ExecImpl& ExecImpl::set_bytes_amounts(const std::vector<double>& bytes_amounts)
+{
+ bytes_amounts_ = bytes_amounts;
+
+ return *this;
+}
+
+ExecImpl* ExecImpl::start()
+{
+ state_ = SIMIX_RUNNING;
if (not MC_is_active() && not MC_record_replay_is_active()) {
- surf_action_ = host_->pimpl_cpu->execution_start(flops_amount);
- surf_action_->set_data(this);
- surf_action_->set_priority(priority);
- if (bound > 0)
- surf_action_->set_bound(bound);
+ if (hosts_.size() == 1) {
+ surf_action_ = hosts_.front()->pimpl_cpu->execution_start(flops_amounts_.front());
+ surf_action_->set_priority(priority_);
+ surf_action_->set_category(get_tracing_category());
+
+ if (bound_ > 0)
+ surf_action_->set_bound(bound_);
+ } else {
+ surf_action_ = surf_host_model->execute_parallel(hosts_, flops_amounts_.data(), bytes_amounts_.data(), -1);
+ }
+ surf_action_->set_activity(this);
}
XBT_DEBUG("Create execute synchro %p: %s", this, get_cname());
- ExecImpl::on_creation(this);
+ ExecImpl::on_creation(*this);
return this;
}
-void ExecImpl::cancel()
+double ExecImpl::get_seq_remaining_ratio()
{
- XBT_VERB("This exec %p is canceled", this);
- if (surf_action_ != nullptr)
- surf_action_->cancel();
+ return (surf_action_ == nullptr) ? 0 : surf_action_->get_remains() / surf_action_->get_cost();
}
-double ExecImpl::get_remaining()
+double ExecImpl::get_par_remaining_ratio()
{
- xbt_assert(host_ != nullptr, "Calling remains() on a parallel execution is not allowed. "
- "We would need to return a vector instead of a scalar. "
- "Did you mean remainingRatio() instead?");
- return surf_action_ ? surf_action_->get_remains() : 0;
+ // parallel task: their remain is already between 0 and 1
+ return (surf_action_ == nullptr) ? 0 : surf_action_->get_remains();
}
-double ExecImpl::get_remaining_ratio()
+ExecImpl& ExecImpl::set_bound(double bound)
{
- if (host_ ==
- nullptr) // parallel task: their remain is already between 0 and 1 (see comment in ExecImpl::get_remaining())
- return (surf_action_ == nullptr) ? 0 : surf_action_->get_remains();
- else // Actually compute the ratio for sequential tasks
- return (surf_action_ == nullptr) ? 0 : surf_action_->get_remains() / surf_action_->get_cost();
+ bound_ = bound;
+ return *this;
}
-void ExecImpl::set_bound(double bound)
-{
- if (surf_action_)
- surf_action_->set_bound(bound);
-}
-void ExecImpl::set_priority(double priority)
+ExecImpl& ExecImpl::set_priority(double priority)
{
- if (surf_action_)
- surf_action_->set_priority(priority);
+ priority_ = priority;
+ return *this;
}
void ExecImpl::post()
{
- if (host_ && not host_->is_on()) { /* FIXME: handle resource failure for parallel tasks too */
+ if (hosts_.size() == 1 && not hosts_.front()->is_on()) { /* FIXME: handle resource failure for parallel tasks too */
/* If the host running the synchro failed, notice it. This way, the asking
* process can be killed if it runs on that host itself */
state_ = SIMIX_FAILED;
state_ = SIMIX_DONE;
}
- on_completion(this);
+ on_completion(*this);
+
+ clean_action();
- if (surf_action_) {
- surf_action_->unref();
- surf_action_ = nullptr;
- }
if (timeout_detector_) {
timeout_detector_->unref();
timeout_detector_ = nullptr;
case SIMIX_FAILED:
XBT_DEBUG("ExecImpl::finish(): host '%s' failed", simcall->issuer->get_host()->get_cname());
simcall->issuer->context_->iwannadie = true;
- simcall->issuer->exception_ =
- std::make_exception_ptr(simgrid::HostFailureException(XBT_THROW_POINT, "Host failed"));
+ if (simcall->issuer->get_host()->is_on())
+ simcall->issuer->exception_ =
+ std::make_exception_ptr(simgrid::HostFailureException(XBT_THROW_POINT, "Host failed"));
+ /* else, the actor will be killed with no possibility to survive */
break;
case SIMIX_CANCELED:
}
}
-ActivityImpl* ExecImpl::migrate(simgrid::s4u::Host* to)
+ActivityImpl* ExecImpl::migrate(s4u::Host* to)
{
if (not MC_is_active() && not MC_record_replay_is_active()) {
resource::Action* old_action = this->surf_action_;
resource::Action* new_action = to->pimpl_cpu->execution_start(old_action->get_cost());
new_action->set_remains(old_action->get_remains());
- new_action->set_data(this);
+ new_action->set_activity(this);
new_action->set_priority(old_action->get_priority());
// FIXME: the user-defined bound seem to not be kept by LMM, that seem to overwrite it for the multi-core modeling.
// I hope that the user did not provide any.
- old_action->set_data(nullptr);
+ old_action->set_activity(nullptr);
old_action->cancel();
old_action->unref();
this->surf_action_ = new_action;
}
- on_migration(this, to);
+ on_migration(*this, to);
return this;
}
/*************
* Callbacks *
*************/
-xbt::signal<void(ExecImplPtr)> ExecImpl::on_creation;
-xbt::signal<void(ExecImplPtr)> ExecImpl::on_completion;
-xbt::signal<void(ExecImplPtr, s4u::Host*)> ExecImpl::on_migration;
+xbt::signal<void(ExecImpl&)> ExecImpl::on_creation;
+xbt::signal<void(ExecImpl const&)> ExecImpl::on_completion;
+xbt::signal<void(ExecImpl const&, s4u::Host*)> ExecImpl::on_migration;
} // namespace activity
} // namespace kernel