#include <memory>
#include <simgrid/Exception.hpp>
-#include <simgrid/s4u/Task.hpp>
#include <simgrid/s4u/Comm.hpp>
#include <simgrid/s4u/Exec.hpp>
#include <simgrid/s4u/Io.hpp>
+#include <simgrid/s4u/Task.hpp>
#include <simgrid/simix.hpp>
#include "src/simgrid/module.hpp"
namespace simgrid::s4u {
-xbt::signal<void(Task*)> Task::on_start;
-xbt::signal<void(Task*)> Task::on_end;
-
Task::Task(const std::string& name) : name_(name) {}
/**
*/
bool Task::ready_to_run() const
{
- return not working_ && queued_execs_ > 0;
+ return running_instances_ < parallelism_degree_ && queued_firings_ > 0;
}
/**
void Task::receive(Task* source)
{
XBT_DEBUG("Task %s received a token from %s", name_.c_str(), source->name_.c_str());
- auto source_count = predecessors_[source]++;
- if (tokens_received_.size() <= queued_execs_ + source_count)
- tokens_received_.push_back({});
- tokens_received_[queued_execs_ + source_count][source] = source->token_;
- bool enough_tokens = true;
+ auto source_count = predecessors_[source];
+ predecessors_[source]++;
+ if (tokens_received_.size() <= queued_firings_ + source_count)
+ tokens_received_.emplace_back();
+ tokens_received_[queued_firings_ + source_count][source] = source->token_;
+ bool enough_tokens = true;
for (auto const& [key, val] : predecessors_)
if (val < 1) {
enough_tokens = false;
if (enough_tokens) {
for (auto& [key, val] : predecessors_)
val--;
- enqueue_execs(1);
+ enqueue_firings(1);
}
}
*/
void Task::complete()
{
- xbt_assert(s4u::Actor::is_maestro());
- working_ = false;
+ xbt_assert(Actor::is_maestro());
+ running_instances_--;
count_++;
- on_this_end_(this);
- Task::on_end(this);
- if (current_activity_)
- previous_activity_ = std::move(current_activity_);
+ on_this_completion(this);
+ on_completion(this);
for (auto const& t : successors_)
t->receive(this);
if (ready_to_run())
fire();
}
-/** @param n The number of executions to enqueue.
- * @brief Enqueue executions.
- * @note Immediatly starts an execution if possible.
+/** @param n The new parallelism degree of the Task.
+ * @brief Set the parallelism degree of the Task.
+ * @note When increasing the degree the function starts new instances.
+ * When decreasing the degree the function does NOT stop running instances.
*/
-void Task::enqueue_execs(int n)
+void Task::set_parallelism_degree(int n)
{
+ xbt_assert(n > 0, "Parallelism degree of Tasks must be above 0.");
simgrid::kernel::actor::simcall_answered([this, n] {
- queued_execs_ += n;
- if (ready_to_run())
+ parallelism_degree_ = n;
+ while (ready_to_run())
fire();
});
}
+/** @param n The number of firings to enqueue.
+ * @brief Enqueue firing.
+ * @note Immediatly fire an activity if possible.
+ */
+void Task::enqueue_firings(int n)
+{
+ simgrid::kernel::actor::simcall_answered([this, n] {
+ queued_firings_ += n;
+ while (ready_to_run())
+ fire();
+ });
+}
+
+/** @param name The new name to set.
+ * @brief Set the name of the Task.
+ */
+void Task::set_name(std::string name)
+{
+ name_ = name;
+}
+
/** @param amount The amount to set.
* @brief Set the amout of work to do.
* @note Amount in flop for ExecTask and in bytes for CommTask.
return tokens_received_.front()[t];
}
+void Task::fire()
+{
+ if ((int)current_activities_.size() > parallelism_degree_) {
+ current_activities_.pop_front();
+ }
+ on_this_start(this);
+ on_start(this);
+ running_instances_++;
+ queued_firings_ = std::max(queued_firings_ - 1, 0);
+ if (not tokens_received_.empty())
+ tokens_received_.pop_front();
+}
+
/** @param successor The Task to add.
* @brief Add a successor to this Task.
* @note It also adds this as a predecessor of successor.
});
}
-/** @ingroup plugin_task
- * @param func The function to set.
- * @brief Set a function to be called before each execution.
- * @note The function is called before the underlying Activity starts.
- */
-void Task::on_this_start_cb(const std::function<void(Task*)>& func)
-{
- simgrid::kernel::actor::simcall_answered([this, &func] { on_this_start_.connect(func); });
-}
-
-/** @ingroup plugin_task
- * @param func The function to set.
- * @brief Set a function to be called after each execution.
- * @note The function is called after the underlying Activity ends, but before sending tokens to successors.
- */
-void Task::on_this_end_cb(const std::function<void(Task*)>& func)
-{
- simgrid::kernel::actor::simcall_answered([this, &func] { on_this_end_.connect(func); });
-}
-
-/** @ingroup plugin_task
- * @brief Return the number of completed executions.
- */
-int Task::get_count() const
-{
- return count_;
-}
-
/**
* @brief Default constructor.
*/
/** @ingroup plugin_task
* @brief Smart Constructor.
*/
-ExecTaskPtr ExecTask::init(const std::string& name, double flops, s4u::Host* host)
+ExecTaskPtr ExecTask::init(const std::string& name, double flops, Host* host)
{
return init(name)->set_flops(flops)->set_host(host);
}
/**
* @brief Do one execution of the Task.
- * @note Call the on_this_start() func. Set its working status as true.
+ * @note Call the on_this_start() func.
* Init and start the underlying Activity.
*/
void ExecTask::fire()
{
- on_this_start_(this);
- Task::on_start(this);
- working_ = true;
- queued_execs_ = std::max(queued_execs_ - 1, 0);
- if (tokens_received_.size() > 0)
- tokens_received_.pop_front();
- s4u::ExecPtr exec = s4u::Exec::init();
- exec->set_name(name_);
- exec->set_flops_amount(amount_);
- exec->set_host(host_);
+ Task::fire();
+ auto exec = Exec::init()->set_name(get_name())->set_flops_amount(get_amount())->set_host(host_);
exec->start();
- exec->on_this_completion_cb([this](Exec const& exec) { this->complete(); });
- current_activity_ = exec;
+ exec->on_this_completion_cb([this](Exec const&) { complete(); });
+ store_activity(exec);
}
/** @ingroup plugin_task
* @param host The host to set.
* @brief Set a new host.
*/
-ExecTaskPtr ExecTask::set_host(s4u::Host* host)
+ExecTaskPtr ExecTask::set_host(Host* host)
{
kernel::actor::simcall_answered([this, host] { host_ = host; });
return this;
*/
ExecTaskPtr ExecTask::set_flops(double flops)
{
- kernel::actor::simcall_answered([this, flops] { amount_ = flops; });
+ kernel::actor::simcall_answered([this, flops] { set_amount(flops); });
return this;
}
/** @ingroup plugin_task
* @brief Smart constructor.
*/
-CommTaskPtr CommTask::init(const std::string& name, double bytes, s4u::Host* source, s4u::Host* destination)
+CommTaskPtr CommTask::init(const std::string& name, double bytes, Host* source, Host* destination)
{
return init(name)->set_bytes(bytes)->set_source(source)->set_destination(destination);
}
/**
* @brief Do one execution of the Task.
- * @note Call the on_this_start() func. Set its working status as true.
+ * @note Call the on_this_start() func.
* Init and start the underlying Activity.
*/
void CommTask::fire()
{
- on_this_start_(this);
- Task::on_start(this);
- working_ = true;
- queued_execs_ = std::max(queued_execs_ - 1, 0);
- if (tokens_received_.size() > 0)
- tokens_received_.pop_front();
- s4u::CommPtr comm = s4u::Comm::sendto_init(source_, destination_);
- comm->set_name(name_);
- comm->set_payload_size(amount_);
+ Task::fire();
+ auto comm = Comm::sendto_init(source_, destination_)->set_name(get_name())->set_payload_size(get_amount());
comm->start();
- comm->on_this_completion_cb([this](Comm const& comm) { this->complete(); });
- current_activity_ = comm;
+ comm->on_this_completion_cb([this](Comm const&) { complete(); });
+ store_activity(comm);
}
/** @ingroup plugin_task
* @param source The host to set.
* @brief Set a new source host.
*/
-CommTaskPtr CommTask::set_source(s4u::Host* source)
+CommTaskPtr CommTask::set_source(Host* source)
{
kernel::actor::simcall_answered([this, source] { source_ = source; });
return this;
* @param destination The host to set.
* @brief Set a new destination host.
*/
-CommTaskPtr CommTask::set_destination(s4u::Host* destination)
+CommTaskPtr CommTask::set_destination(Host* destination)
{
kernel::actor::simcall_answered([this, destination] { destination_ = destination; });
return this;
*/
CommTaskPtr CommTask::set_bytes(double bytes)
{
- kernel::actor::simcall_answered([this, bytes] { amount_ = bytes; });
+ kernel::actor::simcall_answered([this, bytes] { set_amount(bytes); });
return this;
}
/** @ingroup plugin_task
* @brief Smart Constructor.
*/
-IoTaskPtr IoTask::init(const std::string& name, double bytes, s4u::Disk* disk, s4u::Io::OpType type)
+IoTaskPtr IoTask::init(const std::string& name, double bytes, Disk* disk, Io::OpType type)
{
return init(name)->set_bytes(bytes)->set_disk(disk)->set_op_type(type);
}
* @param disk The disk to set.
* @brief Set a new disk.
*/
-IoTaskPtr IoTask::set_disk(s4u::Disk* disk)
+IoTaskPtr IoTask::set_disk(Disk* disk)
{
kernel::actor::simcall_answered([this, disk] { disk_ = disk; });
return this;
*/
IoTaskPtr IoTask::set_bytes(double bytes)
{
- kernel::actor::simcall_answered([this, bytes] { amount_ = bytes; });
+ kernel::actor::simcall_answered([this, bytes] { set_amount(bytes); });
return this;
}
/** @ingroup plugin_task */
-IoTaskPtr IoTask::set_op_type(s4u::Io::OpType type)
+IoTaskPtr IoTask::set_op_type(Io::OpType type)
{
kernel::actor::simcall_answered([this, type] { type_ = type; });
return this;
void IoTask::fire()
{
- on_this_start_(this);
- Task::on_start(this);
- working_ = true;
- queued_execs_ = std::max(queued_execs_ - 1, 0);
- if (tokens_received_.size() > 0)
- tokens_received_.pop_front();
- s4u::IoPtr io = s4u::Io::init();
- io->set_name(name_);
- io->set_size(amount_);
- io->set_disk(disk_);
- io->set_op_type(type_);
+ Task::fire();
+ auto io = Io::init()->set_name(get_name())->set_size(get_amount())->set_disk(disk_)->set_op_type(type_);
io->start();
- io->on_this_completion_cb([this](Io const& io) { this->complete(); });
- current_activity_ = io;
+ io->on_this_completion_cb([this](Io const&) { complete(); });
+ store_activity(io);
}
} // namespace simgrid::s4u
