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();
ExecImpl& ExecImpl::set_host(s4u::Host* host)
{
- host_ = host;
+ if (not hosts_.empty())
+ hosts_.clear();
+ hosts_.push_back(host);
return *this;
}
-ExecImpl& ExecImpl::set_name(const std::string& name)
+ExecImpl& ExecImpl::set_hosts(const std::vector<s4u::Host*>& hosts)
{
- ActivityImpl::set_name(name);
+ hosts_ = hosts;
return *this;
}
-ExecImpl& ExecImpl::set_tracing_category(const std::string& category)
+ExecImpl& ExecImpl::set_timeout(double timeout)
{
- ActivityImpl::set_category(category);
+ 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::set_timeout(double timeout)
+ExecImpl& ExecImpl::set_flops_amount(double flops_amount)
{
- if (timeout > 0 && not MC_is_active() && not MC_record_replay_is_active()) {
- timeout_detector_ = host_->pimpl_cpu->sleep(timeout);
- timeout_detector_->set_data(this);
- }
+ if (not flops_amounts_.empty())
+ flops_amounts_.clear();
+ flops_amounts_.push_back(flops_amount);
return *this;
}
-ExecImpl* ExecImpl::start(double flops_amount, double priority, double bound)
+ExecImpl& ExecImpl::set_flops_amounts(const std::vector<double>& flops_amounts)
{
- 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);
- }
+ flops_amounts_ = flops_amounts;
+ return *this;
+}
- XBT_DEBUG("Create execute synchro %p: %s", this, get_cname());
- ExecImpl::on_creation(*this);
- return this;
+ExecImpl& ExecImpl::set_bytes_amounts(const std::vector<double>& bytes_amounts)
+{
+ bytes_amounts_ = bytes_amounts;
+
+ return *this;
}
-ExecImpl* ExecImpl::start(const std::vector<s4u::Host*>& hosts, const std::vector<double>& flops_amounts,
- const std::vector<double>& bytes_amounts)
+ExecImpl* ExecImpl::start()
{
state_ = SIMIX_RUNNING;
- /* set surf's synchro */
if (not MC_is_active() && not MC_record_replay_is_active()) {
- surf_action_ = surf_host_model->execute_parallel(hosts, flops_amounts.data(), bytes_amounts.data(), -1);
- if (surf_action_ != nullptr) {
- surf_action_->set_data(this);
+ 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 parallel execute synchro %p", this);
+
+ XBT_DEBUG("Create execute synchro %p: %s", this, get_cname());
ExecImpl::on_creation(*this);
return this;
}
-void ExecImpl::cancel()
-{
- XBT_VERB("This exec %p is canceled", this);
- if (surf_action_ != nullptr)
- surf_action_->cancel();
-}
-
-double ExecImpl::get_remaining() const
-{
- return surf_action_ ? surf_action_->get_remains() : 0;
-}
double ExecImpl::get_seq_remaining_ratio()
{
return (surf_action_ == nullptr) ? 0 : surf_action_->get_remains();
}
-void ExecImpl::set_bound(double bound)
+ExecImpl& ExecImpl::set_bound(double bound)
{
- if (surf_action_)
- surf_action_->set_bound(bound);
+ bound_ = bound;
+ return *this;
}
-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;
on_completion(*this);
- if (surf_action_) {
- surf_action_->unref();
- surf_action_ = nullptr;
- }
+ clean_action();
+
if (timeout_detector_) {
timeout_detector_->unref();
timeout_detector_ = nullptr;
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;
