#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);
/* 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, smx_activity_t synchro)
+void simcall_HANDLER_execution_test(smx_simcall_t simcall, simgrid::kernel::activity::ExecImpl* synchro)
{
int res = (synchro->state_ != SIMIX_WAITING && synchro->state_ != SIMIX_RUNNING);
if (res) {
synchro->simcalls_.push_back(simcall);
- boost::static_pointer_cast<simgrid::kernel::activity::ExecImpl>(synchro)->finish();
+ synchro->finish();
} else {
SIMIX_simcall_answer(simcall);
}
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)
+{
+ host_ = host;
+ return *this;
+}
- XBT_DEBUG("Create exec %p", this);
+ExecImpl& ExecImpl::set_name(const std::string& name)
+{
+ ActivityImpl::set_name(name);
+ return *this;
}
-ExecImpl::~ExecImpl()
+ExecImpl& ExecImpl::set_tracing_category(const std::string& category)
{
- if (surf_action_)
- surf_action_->unref();
- if (timeout_detector_)
- timeout_detector_->unref();
- XBT_DEBUG("Destroy exec %p", this);
+ ActivityImpl::set_category(category);
+ return *this;
+}
+
+ExecImpl& ExecImpl::set_timeout(double timeout)
+{
+ 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);
+ }
+ return *this;
}
ExecImpl* ExecImpl::start(double flops_amount, double priority, double bound)
{
+ 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);
}
XBT_DEBUG("Create execute synchro %p: %s", this, get_cname());
- ExecImpl::on_creation(this);
+ ExecImpl::on_creation(*this);
return this;
}
+ExecImpl* ExecImpl::start(const std::vector<s4u::Host*>& hosts, const std::vector<double>& flops_amounts,
+ const std::vector<double>& bytes_amounts)
+{
+ 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);
+ }
+ }
+ XBT_DEBUG("Create parallel execute synchro %p", this);
+ ExecImpl::on_creation(*this);
+ return this;
+}
void ExecImpl::cancel()
{
XBT_VERB("This exec %p is canceled", this);
surf_action_->cancel();
}
-double ExecImpl::get_remaining()
+double ExecImpl::get_remaining() const
{
- 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;
}
-double ExecImpl::get_remaining_ratio()
+double ExecImpl::get_seq_remaining_ratio()
{
- 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();
+ return (surf_action_ == nullptr) ? 0 : surf_action_->get_remains() / surf_action_->get_cost();
+}
+
+double ExecImpl::get_par_remaining_ratio()
+{
+ // parallel task: their remain is already between 0 and 1
+ return (surf_action_ == nullptr) ? 0 : surf_action_->get_remains();
}
void ExecImpl::set_bound(double bound)
state_ = SIMIX_DONE;
}
- on_completion(this);
+ on_completion(*this);
if (surf_action_) {
surf_action_->unref();
case SIMIX_DONE:
/* do nothing, synchro done */
- XBT_DEBUG("SIMIX_execution_finished: execution successful");
+ XBT_DEBUG("ExecImpl::finish(): execution successful");
break;
case SIMIX_FAILED:
- XBT_DEBUG("SIMIX_execution_finished: host '%s' failed", simcall->issuer->get_host()->get_cname());
+ 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:
- XBT_DEBUG("SIMIX_execution_finished: execution canceled");
+ XBT_DEBUG("ExecImpl::finish(): execution canceled");
simcall->issuer->exception_ =
std::make_exception_ptr(simgrid::CancelException(XBT_THROW_POINT, "Execution Canceled"));
break;
case SIMIX_TIMEOUT:
- XBT_DEBUG("SIMIX_execution_finished: execution timeouted");
+ XBT_DEBUG("ExecImpl::finish(): execution timeouted");
simcall->issuer->exception_ = std::make_exception_ptr(simgrid::TimeoutError(XBT_THROW_POINT, "Timeouted"));
break;
default:
- xbt_die("Internal error in SIMIX_execution_finish: unexpected synchro state %d", static_cast<int>(state_));
+ xbt_die("Internal error in ExecImpl::finish(): unexpected synchro state %d", static_cast<int>(state_));
}
simcall->issuer->waiting_synchro = nullptr;
}
}
-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_;
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
