#include "simgrid/exec.h"
#include "simgrid/s4u/Actor.hpp"
#include "simgrid/s4u/Exec.hpp"
+#include "simgrid/s4u/Host.hpp"
#include "src/kernel/activity/ExecImpl.hpp"
#include "src/kernel/actor/ActorImpl.hpp"
#include "src/kernel/actor/SimcallObserver.hpp"
ExecPtr Exec::init()
{
auto pimpl = kernel::activity::ExecImplPtr(new kernel::activity::ExecImpl());
+ unsigned int cb_id = Host::on_state_change.connect([pimpl](s4u::Host const& h) {
+ if (not h.is_on() && pimpl->state_ == kernel::activity::State::RUNNING &&
+ std::find(pimpl->get_hosts().begin(), pimpl->get_hosts().end(), &h) != pimpl->get_hosts().end()) {
+ pimpl->state_ = kernel::activity::State::FAILED;
+ pimpl->post();
+ }
+ });
+ pimpl->set_cb_id(cb_id);
return ExecPtr(pimpl->get_iface());
}
pimpl_->suspend();
state_ = State::STARTED;
- start_time_ = pimpl_->surf_action_->get_start_time();
on_start(*this);
return this;
}
-Exec* Exec::wait()
-{
- return this->wait_for(-1);
-}
-
-Exec* Exec::wait_for(double timeout)
-{
- if (state_ == State::INITED)
- vetoable_start();
-
- kernel::actor::ActorImpl* issuer = kernel::actor::ActorImpl::self();
- kernel::actor::simcall_blocking([this, issuer, timeout] { this->get_impl()->wait_for(issuer, timeout); });
- complete(State::FINISHED);
- return this;
-}
-
-int Exec::wait_any_for(std::vector<ExecPtr>* execs, double timeout)
+ssize_t Exec::wait_any_for(const std::vector<ExecPtr>& execs, double timeout)
{
- std::vector<kernel::activity::ExecImpl*> rexecs(execs->size());
- std::transform(begin(*execs), end(*execs), begin(rexecs),
+ std::vector<kernel::activity::ExecImpl*> rexecs(execs.size());
+ std::transform(begin(execs), end(execs), begin(rexecs),
[](const ExecPtr& exec) { return static_cast<kernel::activity::ExecImpl*>(exec->pimpl_.get()); });
kernel::actor::ActorImpl* issuer = kernel::actor::ActorImpl::self();
kernel::actor::ExecutionWaitanySimcall observer{issuer, rexecs, timeout};
- int changed_pos = kernel::actor::simcall_blocking(
+ ssize_t changed_pos = kernel::actor::simcall_blocking(
[&observer] {
kernel::activity::ExecImpl::wait_any_for(observer.get_issuer(), observer.get_execs(), observer.get_timeout());
},
&observer);
if (changed_pos != -1)
- execs->at(changed_pos)->complete(State::FINISHED);
+ execs.at(changed_pos)->complete(State::FINISHED);
return changed_pos;
}
-Exec* Exec::cancel()
-{
- kernel::actor::simcall([this] { boost::static_pointer_cast<kernel::activity::ExecImpl>(pimpl_)->cancel(); });
- complete(State::CANCELED);
- return this;
-}
-
/** @brief change the execution bound
* This means changing the maximal amount of flops per second that it may consume, regardless of what the host may
* deliver. Currently, this cannot be changed once the exec started.
return this;
}
-ExecPtr Exec::set_timeout(double timeout) // XBT_ATTRIB_DEPRECATED_v329
-{
- xbt_assert(state_ == State::INITED || state_ == State::STARTING,
- "Cannot change the bound of an exec after its start");
- kernel::actor::simcall(
- [this, timeout] { boost::static_pointer_cast<kernel::activity::ExecImpl>(pimpl_)->set_timeout(timeout); });
- return this;
-}
-
ExecPtr Exec::set_flops_amount(double flops_amount)
{
xbt_assert(state_ == State::INITED || state_ == State::STARTING,
return static_cast<kernel::activity::ExecImpl*>(pimpl_.get())->get_host_number();
}
+double Exec::get_start_time() const
+{
+ return static_cast<kernel::activity::ExecImpl*>(pimpl_.get())->get_start_time();
+}
+
+double Exec::get_finish_time() const
+{
+ return static_cast<kernel::activity::ExecImpl*>(pimpl_.get())->get_finish_time();
+}
+
/** @brief Change the host on which this activity takes place.
*
* The activity cannot be terminated already (but it may be started). */
sg_error_t sg_exec_wait(sg_exec_t exec)
{
- sg_error_t status = SG_OK;
-
- simgrid::s4u::ExecPtr s4u_exec(exec, false);
- try {
- s4u_exec->wait_for(-1);
- } catch (const simgrid::TimeoutException&) {
- status = SG_ERROR_TIMEOUT;
- } catch (const simgrid::CancelException&) {
- status = SG_ERROR_CANCELED;
- } catch (const simgrid::HostFailureException&) {
- status = SG_ERROR_HOST;
- }
- return status;
+ return sg_exec_wait_for(exec, -1.0);
}
sg_error_t sg_exec_wait_for(sg_exec_t exec, double timeout)
try {
s4u_exec->wait_for(timeout);
} catch (const simgrid::TimeoutException&) {
+ s4u_exec->add_ref(); // the wait_for timeouted, keep the exec alive
status = SG_ERROR_TIMEOUT;
} catch (const simgrid::CancelException&) {
status = SG_ERROR_CANCELED;
return status;
}
-int sg_exec_wait_any(sg_exec_t* execs, size_t count)
+ssize_t sg_exec_wait_any(sg_exec_t* execs, size_t count)
{
- return sg_exec_wait_any_for(execs, count, -1);
+ return sg_exec_wait_any_for(execs, count, -1.0);
}
-int sg_exec_wait_any_for(sg_exec_t* execs, size_t count, double timeout)
+ssize_t sg_exec_wait_any_for(sg_exec_t* execs, size_t count, double timeout)
{
std::vector<simgrid::s4u::ExecPtr> s4u_execs;
- for (unsigned int i = 0; i < count; i++)
+ for (size_t i = 0; i < count; i++)
s4u_execs.emplace_back(execs[i], false);
- int pos = simgrid::s4u::Exec::wait_any_for(&s4u_execs, timeout);
- for (unsigned i = 0; i < count; i++) {
- if (pos != -1 && static_cast<unsigned>(pos) != i)
+ ssize_t pos = simgrid::s4u::Exec::wait_any_for(s4u_execs, timeout);
+ for (size_t i = 0; i < count; i++) {
+ if (pos != -1 && static_cast<size_t>(pos) != i)
s4u_execs[i]->add_ref();
}
return pos;
