-/* Copyright (c) 2006-2022. The SimGrid Team. All rights reserved. */
+/* Copyright (c) 2006-2023. 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. */
+#include "simgrid/simix.hpp"
#include <simgrid/Exception.hpp>
#include <simgrid/exec.h>
+#include <simgrid/s4u/ActivitySet.hpp>
#include <simgrid/s4u/Exec.hpp>
#include <simgrid/s4u/Host.hpp>
XBT_LOG_NEW_DEFAULT_SUBCATEGORY(s4u_exec, s4u_activity, "S4U asynchronous executions");
-namespace simgrid {
-namespace s4u {
-xbt::signal<void(Exec const&)> Exec::on_start;
+namespace simgrid::s4u {
Exec::Exec(kernel::activity::ExecImplPtr pimpl)
{
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->get_state() == kernel::activity::State::RUNNING &&
- std::find(pimpl->get_hosts().begin(), pimpl->get_hosts().end(), &h) != pimpl->get_hosts().end()) {
- pimpl->set_state(kernel::activity::State::FAILED);
- pimpl->post();
- }
- });
- pimpl->set_cb_id(cb_id);
return ExecPtr(static_cast<Exec*>(pimpl->get_iface()));
}
-Exec* Exec::start()
+Exec* Exec::do_start()
{
kernel::actor::simcall_answered([this] {
(*boost::static_pointer_cast<kernel::activity::ExecImpl>(pimpl_))
pimpl_->suspend();
state_ = State::STARTED;
- on_start(*this);
+ fire_on_start();
+ fire_on_this_start();
return this;
}
-ssize_t Exec::wait_any_for(const std::vector<ExecPtr>& execs, double timeout)
+ssize_t Exec::deprecated_wait_any_for(const std::vector<ExecPtr>& execs, double timeout) // XBT_ATTRIB_DEPRECATED_v339
{
- std::vector<ActivityPtr> activities;
+ if (execs.empty())
+ return -1;
+ ActivitySet set;
for (const auto& exec : execs)
- activities.push_back(boost::dynamic_pointer_cast<Activity>(exec));
- return Activity::wait_any_for(activities, timeout);
+ set.push(exec);
+ try {
+ auto* ret = set.wait_any_for(timeout).get();
+ for (size_t i = 0; i < execs.size(); i++)
+ if (execs[i].get() == ret)
+ return i;
+
+ } catch (TimeoutException& e) {
+ return -1;
+ }
+ return -1;
}
/** @brief change the execution bound
{
xbt_assert(state_ == State::INITED || state_ == State::STARTING,
"Cannot change the bound of an exec after its start");
- kernel::actor::simcall_answered(
- [this, bound] { boost::static_pointer_cast<kernel::activity::ExecImpl>(pimpl_)->set_bound(bound); });
+ kernel::actor::simcall_object_access(pimpl_.get(), [this, bound] {
+ boost::static_pointer_cast<kernel::activity::ExecImpl>(pimpl_)->set_bound(bound);
+ });
return this;
}
{
xbt_assert(state_ == State::INITED || state_ == State::STARTING,
"Cannot change the priority of an exec after its start");
- kernel::actor::simcall_answered([this, priority] {
+ kernel::actor::simcall_object_access(pimpl_.get(), [this, priority] {
boost::static_pointer_cast<kernel::activity::ExecImpl>(pimpl_)->set_sharing_penalty(1. / priority);
});
return this;
{
xbt_assert(state_ == State::INITED || state_ == State::STARTING,
"Cannot change the flop_amount of an exec after its start");
- kernel::actor::simcall_answered([this, flops_amount] {
+ kernel::actor::simcall_object_access(pimpl_.get(), [this, flops_amount] {
boost::static_pointer_cast<kernel::activity::ExecImpl>(pimpl_)->set_flops_amount(flops_amount);
});
- Activity::set_remaining(flops_amount);
+ set_remaining(flops_amount);
return this;
}
{
xbt_assert(state_ == State::INITED || state_ == State::STARTING,
"Cannot change the flops_amounts of an exec after its start");
- kernel::actor::simcall_answered([this, flops_amounts] {
+ kernel::actor::simcall_object_access(pimpl_.get(), [this, flops_amounts] {
boost::static_pointer_cast<kernel::activity::ExecImpl>(pimpl_)->set_flops_amounts(flops_amounts);
});
parallel_ = true;
{
xbt_assert(state_ == State::INITED || state_ == State::STARTING,
"Cannot change the bytes_amounts of an exec after its start");
- kernel::actor::simcall_answered([this, bytes_amounts] {
+ kernel::actor::simcall_object_access(pimpl_.get(), [this, bytes_amounts] {
boost::static_pointer_cast<kernel::activity::ExecImpl>(pimpl_)->set_bytes_amounts(bytes_amounts);
});
parallel_ = true;
{
xbt_assert(state_ == State::INITED || state_ == State::STARTING,
"Cannot change the bytes_amounts of an exec after its start");
- kernel::actor::simcall_answered([this, thread_count] {
+ kernel::actor::simcall_object_access(pimpl_.get(), [this, thread_count] {
boost::static_pointer_cast<kernel::activity::ExecImpl>(pimpl_)->set_thread_count(thread_count);
});
return this;
return static_cast<kernel::activity::ExecImpl*>(pimpl_.get())->get_host_number();
}
+int Exec::get_thread_count() const
+{
+ return static_cast<kernel::activity::ExecImpl*>(pimpl_.get())->get_thread_count();
+}
+
/** @brief Change the host on which this activity takes place.
*
* The activity cannot be terminated already (but it may be started). */
if (state_ == State::STARTED)
boost::static_pointer_cast<kernel::activity::ExecImpl>(pimpl_)->migrate(host);
- kernel::actor::simcall_answered(
- [this, host] { boost::static_pointer_cast<kernel::activity::ExecImpl>(pimpl_)->set_host(host); });
+ kernel::actor::simcall_object_access(
+ pimpl_.get(), [this, host] { boost::static_pointer_cast<kernel::activity::ExecImpl>(pimpl_)->set_host(host); });
if (state_ == State::STARTING)
- // Setting the host may allow to start the activity, let's try
- vetoable_start();
+ // Setting the host may allow to start the activity, let's try
+ start();
return this;
}
xbt_assert(state_ == State::INITED || state_ == State::STARTING,
"Cannot change the hosts of an exec once it's done (state: %s)", to_c_str(state_));
- kernel::actor::simcall_answered(
- [this, hosts] { boost::static_pointer_cast<kernel::activity::ExecImpl>(pimpl_)->set_hosts(hosts); });
+ kernel::actor::simcall_object_access(pimpl_.get(), [this, hosts] {
+ boost::static_pointer_cast<kernel::activity::ExecImpl>(pimpl_)->set_hosts(hosts);
+ });
parallel_ = true;
// Setting the host may allow to start the activity, let's try
if (state_ == State::STARTING)
- vetoable_start();
+ start();
return this;
}
if (state_ == State::STARTED)
cancel();
- vetoable_start();
+ start();
return this;
}
double Exec::get_cost() const
{
- return (pimpl_->surf_action_ == nullptr) ? -1 : pimpl_->surf_action_->get_cost();
+ return (pimpl_->model_action_ == nullptr) ? -1 : pimpl_->model_action_->get_cost();
}
double Exec::get_remaining() const
{
return not boost::static_pointer_cast<kernel::activity::ExecImpl>(pimpl_)->get_hosts().empty();
}
-} // namespace s4u
-} // namespace simgrid
+} // namespace simgrid::s4u
/* **************************** Public C interface *************************** */
+int sg_exec_isinstance(sg_activity_t acti)
+{
+ return dynamic_cast<simgrid::s4u::Exec*>(acti) != nullptr;
+}
+
void sg_exec_set_bound(sg_exec_t exec, double bound)
{
exec->set_bound(bound);
void sg_exec_start(sg_exec_t exec)
{
- exec->vetoable_start();
+ exec->start();
}
void sg_exec_cancel(sg_exec_t exec)
return status;
}
-ssize_t sg_exec_wait_any(sg_exec_t* execs, size_t count)
+ssize_t sg_exec_wait_any(sg_exec_t* execs, size_t count) // XBT_ATTRIB_DEPRECATED_v339
{
- return sg_exec_wait_any_for(execs, count, -1.0);
+ std::vector<simgrid::s4u::ExecPtr> s4u_execs;
+ for (size_t i = 0; i < count; i++)
+ s4u_execs.emplace_back(execs[i], false);
+
+ ssize_t pos = simgrid::s4u::Exec::deprecated_wait_any_for(s4u_execs, -1.0);
+ for (size_t i = 0; i < count; i++) {
+ if (pos != -1 && static_cast<size_t>(pos) != i)
+ s4u_execs[i]->add_ref();
+ }
+ return pos;
}
-ssize_t 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) // XBT_ATTRIB_DEPRECATED_v339
{
std::vector<simgrid::s4u::ExecPtr> s4u_execs;
for (size_t i = 0; i < count; i++)
s4u_execs.emplace_back(execs[i], false);
- ssize_t pos = simgrid::s4u::Exec::wait_any_for(s4u_execs, timeout);
+ ssize_t pos = simgrid::s4u::Exec::deprecated_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();
