From bfd4a01db7f2f21e67c9ce03d32eb47a9601f759 Mon Sep 17 00:00:00 2001 From: Adrien Gougeon Date: Mon, 25 Sep 2023 12:04:10 +0200 Subject: [PATCH] add possibility to dispatch tasks (work in progress) --- MANIFEST.in | 2 + examples/cpp/CMakeLists.txt | 2 +- .../cpp/task-dispatch/s4u-task-dispatch.cpp | 103 ++++++ .../cpp/task-dispatch/s4u-task-dispatch.tesh | 82 +++++ include/simgrid/s4u/Task.hpp | 68 ++-- src/s4u/s4u_Task.cpp | 319 +++++++++++++----- 6 files changed, 469 insertions(+), 107 deletions(-) create mode 100644 examples/cpp/task-dispatch/s4u-task-dispatch.cpp create mode 100644 examples/cpp/task-dispatch/s4u-task-dispatch.tesh diff --git a/MANIFEST.in b/MANIFEST.in index 2e42447676..761218854b 100644 --- a/MANIFEST.in +++ b/MANIFEST.in @@ -394,6 +394,8 @@ include examples/cpp/synchro-mutex/s4u-synchro-mutex.tesh include examples/cpp/synchro-semaphore/s4u-mc-synchro-semaphore.tesh include examples/cpp/synchro-semaphore/s4u-synchro-semaphore.cpp include examples/cpp/synchro-semaphore/s4u-synchro-semaphore.tesh +include examples/cpp/task-dispatch/s4u-task-dispatch.cpp +include examples/cpp/task-dispatch/s4u-task-dispatch.tesh include examples/cpp/task-io/s4u-task-io.cpp include examples/cpp/task-io/s4u-task-io.tesh include examples/cpp/task-microservice/s4u-task-microservice.cpp diff --git a/examples/cpp/CMakeLists.txt b/examples/cpp/CMakeLists.txt index f46d58b147..c2e2b144fa 100644 --- a/examples/cpp/CMakeLists.txt +++ b/examples/cpp/CMakeLists.txt @@ -172,7 +172,7 @@ foreach (example activityset-testany activityset-waitany activityset-waitall act mc-bugged1 mc-bugged1-liveness mc-bugged2 mc-bugged2-liveness mc-centralized-mutex mc-electric-fence mc-failing-assert network-ns3 network-ns3-wifi network-wifi io-async io-priority io-degradation io-file-system io-file-remote io-disk-raw io-dependent - task-io task-microservice task-parallelism task-simple task-storm task-switch-host task-variable-load + task-dispatch task-io task-microservice task-parallelism task-simple task-storm task-switch-host task-variable-load photovoltaic-simple platform-comm-serialize platform-failures platform-profile platform-properties plugin-host-load plugin-jbod plugin-link-load plugin-prodcons diff --git a/examples/cpp/task-dispatch/s4u-task-dispatch.cpp b/examples/cpp/task-dispatch/s4u-task-dispatch.cpp new file mode 100644 index 0000000000..10bd0d2364 --- /dev/null +++ b/examples/cpp/task-dispatch/s4u-task-dispatch.cpp @@ -0,0 +1,103 @@ +/* Copyright (c) 2017-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/s4u.hpp" + +XBT_LOG_NEW_DEFAULT_CATEGORY(task_dispatch, "Messages specific for this s4u example"); +namespace sg4 = simgrid::s4u; + +static void manager(sg4::ExecTaskPtr t) +{ + auto PM0 = sg4::Engine::get_instance()->host_by_name("PM0"); + auto PM1 = sg4::Engine::get_instance()->host_by_name("PM1"); + + XBT_INFO("Test set_flops"); + t->enqueue_firings(2); + sg4::this_actor::sleep_for(50); + XBT_INFO("Set instance_0 flops to 50."); + t->set_flops(50 * PM0->get_speed()); + sg4::this_actor::sleep_for(250); + t->set_flops(100 * PM0->get_speed()); + + XBT_INFO("Test set_parallelism degree"); + t->enqueue_firings(3); + sg4::this_actor::sleep_for(50); + XBT_INFO("Set Task parallelism degree to 2."); + t->set_parallelism_degree(2); + sg4::this_actor::sleep_for(250); + t->set_parallelism_degree(1); + + XBT_INFO("Test set_host dispatcher"); + t->enqueue_firings(2); + sg4::this_actor::sleep_for(50); + XBT_INFO("Move dispatcher to PM1"); + t->set_host(PM1, "dispatcher"); + t->set_internal_bytes(1e6, "dispatcher"); + sg4::this_actor::sleep_for(250); + t->set_host(PM0, "dispatcher"); + + XBT_INFO("Test set_host instance_0"); + t->enqueue_firings(2); + sg4::this_actor::sleep_for(50); + XBT_INFO("Move instance_0 to PM1"); + t->set_host(PM1, "instance_0"); + t->set_flops(100 * PM1->get_speed()); + t->set_internal_bytes(1e6, "instance_0"); + sg4::this_actor::sleep_for(250); + t->set_host(PM0, "instance_0"); + t->set_flops(100 * PM0->get_speed()); + + XBT_INFO("Test set_host collector"); + t->enqueue_firings(2); + sg4::this_actor::sleep_for(50); + XBT_INFO("Move collector to PM1"); + t->set_host(PM1, "collector"); + sg4::this_actor::sleep_for(250); + t->set_host(PM0, "collector"); + + XBT_INFO("Test add_instances"); + t->enqueue_firings(1); + sg4::this_actor::sleep_for(50); + XBT_INFO("Add 1 instance and update load balancing function"); + t->add_instances(1); + t->set_load_balancing_function([]() { + static int round_robin_counter = 0; + int ret = round_robin_counter; + round_robin_counter = round_robin_counter == 1 ? 0 : round_robin_counter + 1; + return "instance_" + std::to_string(ret); + }); + t->enqueue_firings(2); + sg4::this_actor::sleep_for(250); + + XBT_INFO("Test remove_instances"); + XBT_INFO("Remove 1 instance and update load balancing function"); + t->remove_instances(1); + t->set_load_balancing_function([]() { return "instance_0"; }); + t->enqueue_firings(2); + sg4::this_actor::sleep_for(300); +} + +int main(int argc, char* argv[]) +{ + sg4::Engine e(&argc, argv); + e.load_platform(argv[1]); + auto PM0 = e.host_by_name("PM0"); + auto PM1 = sg4::Engine::get_instance()->host_by_name("PM1"); + + auto a = sg4::ExecTask::init("A", 100 * PM0->get_speed(), PM0); + auto b = sg4::ExecTask::init("B", 50 * PM0->get_speed(), PM0); + auto c = sg4::CommTask::init("C", 1e6, PM1, PM0); + + a->add_successor(b); + + sg4::Task::on_completion_cb( + [](const sg4::Task* t) { XBT_INFO("Task %s finished (%d)", t->get_name().c_str(), t->get_count()); }); + sg4::Task::on_start_cb([](const sg4::Task* t) { XBT_INFO("Task %s start", t->get_name().c_str()); }); + + sg4::Actor::create("manager", PM0, manager, a); + + e.run(); + return 0; +} diff --git a/examples/cpp/task-dispatch/s4u-task-dispatch.tesh b/examples/cpp/task-dispatch/s4u-task-dispatch.tesh new file mode 100644 index 0000000000..a4ace5478a --- /dev/null +++ b/examples/cpp/task-dispatch/s4u-task-dispatch.tesh @@ -0,0 +1,82 @@ +#!/usr/bin/env tesh + +> > $ ${bindir:=.}/s4u-task-parallelism ${platfdir}/three_multicore_hosts.xml +> [PM0:manager:(1) 0.000000] [task_dispatch/INFO] Test set_flops +> [0.000000] [task_dispatch/INFO] Task A start +> [0.000000] [task_dispatch/INFO] Task A start +> [PM0:manager:(1) 50.000000] [task_dispatch/INFO] Set instance_0 flops to 50. +> [100.000000] [task_dispatch/INFO] Task A finished (1) +> [100.000000] [task_dispatch/INFO] Task B start +> [150.000000] [task_dispatch/INFO] Task A finished (2) +> [150.000000] [task_dispatch/INFO] Task B start +> [150.000000] [task_dispatch/INFO] Task B finished (1) +> [200.000000] [task_dispatch/INFO] Task B finished (2) +> [PM0:manager:(1) 300.000000] [task_dispatch/INFO] Test set_parallelism degree +> [300.000000] [task_dispatch/INFO] Task A start +> [300.000000] [task_dispatch/INFO] Task A start +> [300.000000] [task_dispatch/INFO] Task A start +> [PM0:manager:(1) 350.000000] [task_dispatch/INFO] Set Task parallelism degree to 2. +> [400.000000] [task_dispatch/INFO] Task A finished (3) +> [400.000000] [task_dispatch/INFO] Task B start +> [450.000000] [task_dispatch/INFO] Task A finished (4) +> [450.000000] [task_dispatch/INFO] Task B start +> [450.000000] [task_dispatch/INFO] Task B finished (3) +> [500.000000] [task_dispatch/INFO] Task A finished (5) +> [500.000000] [task_dispatch/INFO] Task B start +> [500.000000] [task_dispatch/INFO] Task B finished (4) +> [550.000000] [task_dispatch/INFO] Task B finished (5) +> [PM0:manager:(1) 600.000000] [task_dispatch/INFO] Test set_host dispatcher +> [600.000000] [task_dispatch/INFO] Task A start +> [600.000000] [task_dispatch/INFO] Task A start +> [PM0:manager:(1) 650.000000] [task_dispatch/INFO] Move dispatcher to PM1 +> [700.000000] [task_dispatch/INFO] Task A finished (6) +> [700.000000] [task_dispatch/INFO] Task B start +> [750.000000] [task_dispatch/INFO] Task B finished (6) +> [800.009961] [task_dispatch/INFO] Task A finished (7) +> [800.009961] [task_dispatch/INFO] Task B start +> [850.009961] [task_dispatch/INFO] Task B finished (7) +> [PM0:manager:(1) 900.000000] [task_dispatch/INFO] Test set_host instance_0 +> [900.000000] [task_dispatch/INFO] Task A start +> [900.000000] [task_dispatch/INFO] Task A start +> [PM0:manager:(1) 950.000000] [task_dispatch/INFO] Move instance_0 to PM1 +> [1000.000000] [task_dispatch/INFO] Task A finished (8) +> [1000.000000] [task_dispatch/INFO] Task B start +> [1050.000000] [task_dispatch/INFO] Task B finished (8) +> [1100.019922] [task_dispatch/INFO] Task A finished (9) +> [1100.019922] [task_dispatch/INFO] Task B start +> [1150.019922] [task_dispatch/INFO] Task B finished (9) +> [PM0:manager:(1) 1200.000000] [task_dispatch/INFO] Test set_host collector +> [1200.000000] [task_dispatch/INFO] Task A start +> [1200.000000] [task_dispatch/INFO] Task A start +> [PM0:manager:(1) 1250.000000] [task_dispatch/INFO] Move collector to PM1 +> [1300.000000] [task_dispatch/INFO] Task A finished (10) +> [1300.000000] [task_dispatch/INFO] Task B start +> [1350.000000] [task_dispatch/INFO] Task B finished (10) +> [1400.009961] [task_dispatch/INFO] Task A finished (11) +> [1400.009961] [task_dispatch/INFO] Task B start +> [1450.009961] [task_dispatch/INFO] Task B finished (11) +> [PM0:manager:(1) 1500.000000] [task_dispatch/INFO] Test add_instances +> [1500.000000] [task_dispatch/INFO] Task A start +> [PM0:manager:(1) 1550.000000] [task_dispatch/INFO] Add 1 instance and update load balancing function +> [1550.000000] [task_dispatch/INFO] Task A start +> [1550.000000] [task_dispatch/INFO] Task A start +> [1600.000000] [task_dispatch/INFO] Task A finished (12) +> [1600.000000] [task_dispatch/INFO] Task B start +> [1650.000000] [task_dispatch/INFO] Task A finished (13) +> [1650.000000] [task_dispatch/INFO] Task B start +> [1650.000000] [task_dispatch/INFO] Task B finished (12) +> [1700.000000] [task_dispatch/INFO] Task A finished (14) +> [1700.000000] [task_dispatch/INFO] Task B start +> [1700.000000] [task_dispatch/INFO] Task B finished (13) +> [1750.000000] [task_dispatch/INFO] Task B finished (14) +> [PM0:manager:(1) 1800.000000] [task_dispatch/INFO] Test remove_instances +> [PM0:manager:(1) 1800.000000] [task_dispatch/INFO] Remove 1 instance and update load balancing function +> [1800.000000] [task_dispatch/INFO] Task A start +> [1800.000000] [task_dispatch/INFO] Task A start +> [1900.000000] [task_dispatch/INFO] Task A finished (15) +> [1900.000000] [task_dispatch/INFO] Task B start +> [1950.000000] [task_dispatch/INFO] Task B finished (15) +> [2000.000000] [task_dispatch/INFO] Task A finished (16) +> [2000.000000] [task_dispatch/INFO] Task B start +> [2050.000000] [task_dispatch/INFO] Task B finished (16) +> \ No newline at end of file diff --git a/include/simgrid/s4u/Task.hpp b/include/simgrid/s4u/Task.hpp index 36e6e0dbd2..ea144e239d 100644 --- a/include/simgrid/s4u/Task.hpp +++ b/include/simgrid/s4u/Task.hpp @@ -10,6 +10,7 @@ #include #include #include +#include namespace simgrid::s4u { @@ -27,23 +28,29 @@ using IoTaskPtr = boost::intrusive_ptr; class XBT_PUBLIC Token : public xbt::Extendable {}; class Task { + std::string name_; - double amount_; - int queued_firings_ = 0; - int count_ = 0; - int running_instances_ = 0; - int parallelism_degree_ = 1; + + std::map amount_ = {{"instance_0", 0}, {"dispatcher", 0}, {"collector", 0}}; + std::map queued_firings_ = {{"instance_0", 0}, {"dispatcher", 0}, {"collector", 0}}; + std::map running_instances_ = {{"instance_0", 0}, {"dispatcher", 0}, {"collector", 0}}; + std::map count_ = {{"instance_0", 0}, {"dispatcher", 0}, {"collector", 0}}; + std::map parallelism_degree_ = {{"instance_0", 1}, {"dispatcher", 1}, {"collector", 1}}; + std::map internal_bytes_to_send_ = {{"instance_0", 0}, {"dispatcher", 0}}; + + std::function load_balancing_function_; std::set successors_ = {}; std::map predecessors_ = {}; std::atomic_int_fast32_t refcount_{0}; - bool ready_to_run() const; + bool ready_to_run(std::string instance); void receive(Task* source); std::shared_ptr token_ = nullptr; std::deque>> tokens_received_; - std::deque current_activities_; + std::map> current_activities_ = { + {"instance_0", {}}, {"dispatcher", {}}, {"collector", {}}}; inline static xbt::signal on_start; xbt::signal on_this_start; @@ -54,23 +61,29 @@ protected: explicit Task(const std::string& name); virtual ~Task() = default; - virtual void fire(); - void complete(); + virtual void fire(std::string instance); + void complete(std::string instance); - void store_activity(ActivityPtr a) { current_activities_.push_back(a); } + void store_activity(ActivityPtr a, std::string instance) { current_activities_[instance].push_back(a); } + + virtual void add_instances(int n); + virtual void remove_instances(int n); public: void set_name(std::string name); const std::string& get_name() const { return name_; } const char* get_cname() const { return name_.c_str(); } - void set_amount(double amount); - double get_amount() const { return amount_; } - int get_count() const { return count_; } - void set_parallelism_degree(int n); - int get_parallelism_degree() { return parallelism_degree_; } + void set_amount(double amount, std::string instance = "instance_0"); + double get_amount(std::string instance = "instance_0") const { return amount_.at(instance); } + int get_count(std::string instance = "collector") const { return count_.at(instance); } + void set_parallelism_degree(int n, std::string instance = "all"); + int get_parallelism_degree(std::string instance = "instance_0") const { return parallelism_degree_.at(instance); } + void set_internal_bytes(int bytes, std::string instance = "instance_0"); + double get_internal_bytes(std::string instance = "instance_0") const { return internal_bytes_to_send_.at(instance); } + void set_load_balancing_function(std::function func); void set_token(std::shared_ptr token); - std::shared_ptr get_next_token_from(TaskPtr t); + std::shared_ptr get_next_token_from(TaskPtr t) const { return tokens_received_.front().at(t); } void add_successor(TaskPtr t); void remove_successor(TaskPtr t); @@ -107,7 +120,7 @@ class CommTask : public Task { Host* destination_; explicit CommTask(const std::string& name); - void fire() override; + void fire(std::string instance) override; public: static CommTaskPtr init(const std::string& name); @@ -118,30 +131,33 @@ public: CommTaskPtr set_destination(Host* destination); Host* get_destination() const { return destination_; } CommTaskPtr set_bytes(double bytes); - double get_bytes() const { return get_amount(); } + double get_bytes() const { return get_amount("instance_0"); } }; class ExecTask : public Task { - Host* host_; + std::map host_ = {{"instance_0", nullptr}, {"dispatcher", nullptr}, {"collector", nullptr}}; explicit ExecTask(const std::string& name); - void fire() override; + void fire(std::string instance) override; public: static ExecTaskPtr init(const std::string& name); static ExecTaskPtr init(const std::string& name, double flops, Host* host); - ExecTaskPtr set_host(Host* host); - Host* get_host() const { return host_; } - ExecTaskPtr set_flops(double flops); - double get_flops() const { return get_amount(); } + ExecTaskPtr set_host(Host* host, std::string instance = "all"); + Host* get_host(std::string instance = "instance_0") const { return host_.at(instance); } + ExecTaskPtr set_flops(double flops, std::string instance = "instance_0"); + double get_flops(std::string instance = "instance_0") const { return get_amount(instance); } + + void add_instances(int n) override; + void remove_instances(int n) override; }; class IoTask : public Task { Disk* disk_; Io::OpType type_; explicit IoTask(const std::string& name); - void fire() override; + void fire(std::string instance) override; public: static IoTaskPtr init(const std::string& name); @@ -150,7 +166,7 @@ public: IoTaskPtr set_disk(Disk* disk); Disk* get_disk() const { return disk_; } IoTaskPtr set_bytes(double bytes); - double get_bytes() const { return get_amount(); } + double get_bytes() const { return get_amount("instance_0"); } IoTaskPtr set_op_type(Io::OpType type); Io::OpType get_op_type() const { return type_; } }; diff --git a/src/s4u/s4u_Task.cpp b/src/s4u/s4u_Task.cpp index d84357fa89..e6dbe06914 100644 --- a/src/s4u/s4u_Task.cpp +++ b/src/s4u/s4u_Task.cpp @@ -1,10 +1,14 @@ #include #include +#include #include +#include #include #include #include #include +#include +#include #include "src/simgrid/module.hpp" @@ -31,9 +35,9 @@ Task::Task(const std::string& name) : name_(name) {} * @brief Return True if the Task can start a new Activity. * @note The Task is ready if not already doing something and there is at least one execution waiting in queue. */ -bool Task::ready_to_run() const +bool Task::ready_to_run(std::string instance) { - return running_instances_ < parallelism_degree_ && queued_firings_ > 0; + return running_instances_[instance] < parallelism_degree_[instance] && queued_firings_[instance] > 0; } /** @@ -47,10 +51,10 @@ 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]; predecessors_[source]++; - if (tokens_received_.size() <= queued_firings_ + source_count) + if (tokens_received_.size() <= queued_firings_["dispatcher"] + source_count) tokens_received_.emplace_back(); - tokens_received_[queued_firings_ + source_count][source] = source->token_; - bool enough_tokens = true; + tokens_received_[queued_firings_["dispatcher"] + source_count][source] = source->token_; + bool enough_tokens = true; for (auto const& [key, val] : predecessors_) if (val < 1) { enough_tokens = false; @@ -72,35 +76,65 @@ void Task::receive(Task* source) * Send a token to each of its successors. * Start a new execution if possible. */ -void Task::complete() +void Task::complete(std::string instance) { xbt_assert(Actor::is_maestro()); - running_instances_--; - count_++; - on_this_completion(this); - on_completion(this); - for (auto const& t : successors_) - t->receive(this); - if (ready_to_run()) - fire(); + running_instances_[instance] = running_instances_[instance] - 1; + count_[instance] = count_[instance] + 1; + if (instance == "collector") { + on_this_completion(this); + on_completion(this); + for (auto const& t : successors_) + t->receive(this); + } else if (instance == "dispatcher") { + auto next_instance = load_balancing_function_(); + xbt_assert(next_instance != "dispatcher" and next_instance != "collector", "Invalid instance selected: %s", + next_instance.c_str()); + queued_firings_[next_instance] = queued_firings_.at(next_instance) + 1; + while (ready_to_run(next_instance)) + fire(next_instance); + } else { + queued_firings_["collector"] = queued_firings_["collector"] + 1; + while (ready_to_run("collector")) + fire("collector"); + } + if (ready_to_run(instance)) + fire(instance); } /** @param n The new parallelism degree of the Task. * @brief Set the parallelism degree of the Task to inscrease or decrease horizontal scaling. * @note When increasing the degree the function starts new instances if there is queued firings. * When decreasing the degree the function does NOT stop running instances. - */ -void Task::set_parallelism_degree(int n) +void Task::set_parallelism_degree(int n, std::string instance) { - xbt_assert(n > 0, "Parallelism degree of Tasks must be above 0."); - simgrid::kernel::actor::simcall_answered([this, n] { - parallelism_degree_ = n; - while (ready_to_run()) - fire(); + xbt_assert(n > 0, "Parallelism degree must be above 0."); + simgrid::kernel::actor::simcall_answered([this, n, &instance] { + if (instance == "all") { + for (auto& [key, value] : parallelism_degree_) { + parallelism_degree_[key] = n; + while (ready_to_run(key)) + fire(key); + } + } else { + parallelism_degree_[instance] = n; + while (ready_to_run(instance)) + fire(instance); + } }); } +void Task::set_internal_bytes(int bytes, std::string instance) +{ + simgrid::kernel::actor::simcall_answered([this, bytes, &instance] { internal_bytes_to_send_[instance] = bytes; }); +} + +void Task::set_load_balancing_function(std::function func) +{ + simgrid::kernel::actor::simcall_answered([this, func] { load_balancing_function_ = func; }); +} + /** @param n The number of firings to enqueue. * @brief Enqueue firing. * @note Immediatly fire an activity if possible. @@ -108,9 +142,9 @@ void Task::set_parallelism_degree(int n) void Task::enqueue_firings(int n) { simgrid::kernel::actor::simcall_answered([this, n] { - queued_firings_ += n; - while (ready_to_run()) - fire(); + queued_firings_["dispatcher"] += n; + while (ready_to_run("dispatcher")) + fire("dispatcher"); }); } @@ -126,9 +160,9 @@ void Task::set_name(std::string name) * @brief Set the amout of work to do. * @note Amount in flop for ExecTask and in bytes for CommTask. */ -void Task::set_amount(double amount) +void Task::set_amount(double amount, std::string instance) { - simgrid::kernel::actor::simcall_answered([this, amount] { amount_ = amount; }); + simgrid::kernel::actor::simcall_answered([this, amount, &instance] { amount_[instance] = amount; }); } /** @param token The token to set. @@ -140,23 +174,17 @@ void Task::set_token(std::shared_ptr token) simgrid::kernel::actor::simcall_answered([this, token] { token_ = token; }); } -/** @return Map of tokens received for the next execution. - * @note If there is no queued execution for this task the map might not exist or be partially empty. - */ -std::shared_ptr Task::get_next_token_from(TaskPtr t) -{ - return tokens_received_.front()[t]; -} - -void Task::fire() +void Task::fire(std::string instance) { - if ((int)current_activities_.size() > parallelism_degree_) { - current_activities_.pop_front(); + if ((int)current_activities_[instance].size() > parallelism_degree_[instance]) { + current_activities_[instance].pop_front(); } - on_this_start(this); - on_start(this); - running_instances_++; - queued_firings_ = std::max(queued_firings_ - 1, 0); + if (instance == "dispatcher") { + on_this_start(this); + on_start(this); + } + running_instances_[instance]++; + queued_firings_[instance] = std::max(queued_firings_[instance] - 1, 0); if (not tokens_received_.empty()) tokens_received_.pop_front(); } @@ -185,6 +213,9 @@ void Task::remove_successor(TaskPtr successor) }); } +/** + * @brief TODO + */ void Task::remove_all_successors() { simgrid::kernel::actor::simcall_answered([this] { @@ -196,12 +227,56 @@ void Task::remove_all_successors() }); } +/** + * @brief TODO + */ +void Task::add_instances(int n) +{ + xbt_assert(n >= 0, "Cannot add a negative number of instances (provided: %d)", n); + int instance_count = (int)amount_.size() - 2; + for (int i = instance_count; i < n + instance_count; i++) { + amount_["instance_" + std::to_string(i)] = amount_.at("instance_0"); + queued_firings_["instance_" + std::to_string(i)] = 0; + running_instances_["instance_" + std::to_string(i)] = 0; + count_["instance_" + std::to_string(i)] = 0; + parallelism_degree_["instance_" + std::to_string(i)] = parallelism_degree_.at("instance_0"); + current_activities_["instance_" + std::to_string(i)] = {}; + internal_bytes_to_send_["instance_" + std::to_string(i)] = internal_bytes_to_send_.at("instance_0"); + ; + } +} + +/** + * @brief TODO + */ +void Task::remove_instances(int n) +{ + int instance_count = (int)amount_.size() - 2; + xbt_assert(n >= 0, "Cannot remove a negative number of instances (provided: %d)", n); + xbt_assert(instance_count - n > 0, "The number of instances must be above 0 (instances: %d, provided: %d)", + instance_count, n); + for (int i = instance_count - 1; i >= instance_count - n; i--) + xbt_assert(running_instances_.at("instance_" + std::to_string(i)) == 0, + "Cannot remove a running instance (instances: %d)", i); + for (int i = instance_count - 1; i >= instance_count - n; i--) { + amount_.erase("instance_" + std::to_string(i)); + queued_firings_.erase("instance_" + std::to_string(i)); + running_instances_.erase("instance_" + std::to_string(i)); + count_.erase("instance_" + std::to_string(i)); + parallelism_degree_.erase("instance_" + std::to_string(i)); + current_activities_.erase("instance_" + std::to_string(i)); + } +} + /** * @brief Default constructor. */ -ExecTask::ExecTask(const std::string& name) : Task(name) {} +ExecTask::ExecTask(const std::string& name) : Task(name) +{ + set_load_balancing_function([]() { return "instance_0"; }); +} -/** @ingroup plugin_task +/** * @brief Smart Constructor. */ ExecTaskPtr ExecTask::init(const std::string& name) @@ -209,7 +284,7 @@ ExecTaskPtr ExecTask::init(const std::string& name) return ExecTaskPtr(new ExecTask(name)); } -/** @ingroup plugin_task +/** * @brief Smart Constructor. */ ExecTaskPtr ExecTask::init(const std::string& name, double flops, Host* host) @@ -222,40 +297,101 @@ ExecTaskPtr ExecTask::init(const std::string& name, double flops, Host* host) * @note Call the on_this_start() func. * Init and start the underlying Activity. */ -void ExecTask::fire() +void ExecTask::fire(std::string instance) { - 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&) { complete(); }); - store_activity(exec); + Task::fire(instance); + if (instance == "dispatcher" or instance == "collector") { + auto exec = Exec::init() + ->set_name(get_name() + "_" + instance) + ->set_flops_amount(get_amount(instance)) + ->set_host(host_[instance]); + exec->start(); + exec->on_this_completion_cb([this, instance](Exec const&) { complete(instance); }); + store_activity(exec, instance); + } else { + auto exec = Exec::init()->set_name(get_name())->set_flops_amount(get_amount())->set_host(host_[instance]); + if (host_["dispatcher"] == host_[instance]) { + exec->start(); + store_activity(exec, instance); + } else { + auto comm = Comm::sendto_init(host_["dispatcher"], host_[instance]) + ->set_name(get_name() + "_dispatcher_to_" + instance) + ->set_payload_size(get_internal_bytes("dispatcher")); + comm->add_successor(exec); + comm->start(); + store_activity(comm, instance); + } + if (host_[instance] == host_["collector"]) { + exec->on_this_completion_cb([this, instance](Exec const&) { complete(instance); }); + if (host_["dispatcher"] != host_[instance]) + store_activity(exec, instance); + } else { + auto comm = Comm::sendto_init(host_[instance], host_["collector"]) + ->set_name(get_name() + instance + "_to_collector") + ->set_payload_size(get_internal_bytes(instance)); + exec->add_successor(comm); + comm->on_this_completion_cb([this, instance](Comm const&) { complete(instance); }); + comm.detach(); + } + } } -/** @ingroup plugin_task +/** * @param host The host to set. * @brief Set a new host. */ -ExecTaskPtr ExecTask::set_host(Host* host) +ExecTaskPtr ExecTask::set_host(Host* host, std::string instance) { - kernel::actor::simcall_answered([this, host] { host_ = host; }); + kernel::actor::simcall_answered([this, host, &instance] { + if (instance == "all") + for (auto& [key, value] : host_) + host_[key] = host; + else + host_[instance] = host; + }); return this; } -/** @ingroup plugin_task +/** * @param flops The amount of flops to set. */ -ExecTaskPtr ExecTask::set_flops(double flops) +ExecTaskPtr ExecTask::set_flops(double flops, std::string instance) { - kernel::actor::simcall_answered([this, flops] { set_amount(flops); }); + kernel::actor::simcall_answered([this, flops, &instance] { set_amount(flops, instance); }); return this; } +/** + * @brief TODO + */ +void ExecTask::add_instances(int n) +{ + Task::add_instances(n); + int instance_count = (int)host_.size() - 2; + for (int i = instance_count; i < n + instance_count; i++) + host_["instance_" + std::to_string(i)] = host_.at("instance_0"); +} + +/** + * @brief TODO + */ +void ExecTask::remove_instances(int n) +{ + Task::remove_instances(n); + int instance_count = (int)host_.size() - 2; + for (int i = instance_count - 1; i >= instance_count - n; i--) + host_.erase("instance_" + std::to_string(i)); +} + /** * @brief Default constructor. */ -CommTask::CommTask(const std::string& name) : Task(name) {} +CommTask::CommTask(const std::string& name) : Task(name) +{ + set_load_balancing_function([]() { return "instance_0"; }); +} -/** @ingroup plugin_task +/** * @brief Smart constructor. */ CommTaskPtr CommTask::init(const std::string& name) @@ -263,7 +399,7 @@ CommTaskPtr CommTask::init(const std::string& name) return CommTaskPtr(new CommTask(name)); } -/** @ingroup plugin_task +/** * @brief Smart constructor. */ CommTaskPtr CommTask::init(const std::string& name, double bytes, Host* source, Host* destination) @@ -276,16 +412,26 @@ CommTaskPtr CommTask::init(const std::string& name, double bytes, Host* source, * @note Call the on_this_start() func. * Init and start the underlying Activity. */ -void CommTask::fire() +void CommTask::fire(std::string instance) { - 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&) { complete(); }); - store_activity(comm); + Task::fire(instance); + if (instance == "dispatcher" or instance == "collector") { + auto exec = Exec::init() + ->set_name(get_name() + "_" + instance) + ->set_flops_amount(get_amount(instance)) + ->set_host(instance == "dispatcher" ? source_ : destination_); + exec->start(); + exec->on_this_completion_cb([this, instance](Exec const&) { complete(instance); }); + store_activity(exec, instance); + } else { + auto comm = Comm::sendto_init(source_, destination_)->set_name(get_name())->set_payload_size(get_amount()); + comm->start(); + comm->on_this_completion_cb([this, instance](Comm const&) { complete(instance); }); + store_activity(comm, instance); + } } -/** @ingroup plugin_task +/** * @param source The host to set. * @brief Set a new source host. */ @@ -295,7 +441,7 @@ CommTaskPtr CommTask::set_source(Host* source) return this; } -/** @ingroup plugin_task +/** * @param destination The host to set. * @brief Set a new destination host. */ @@ -305,7 +451,7 @@ CommTaskPtr CommTask::set_destination(Host* destination) return this; } -/** @ingroup plugin_task +/** * @param bytes The amount of bytes to set. */ CommTaskPtr CommTask::set_bytes(double bytes) @@ -317,9 +463,12 @@ CommTaskPtr CommTask::set_bytes(double bytes) /** * @brief Default constructor. */ -IoTask::IoTask(const std::string& name) : Task(name) {} +IoTask::IoTask(const std::string& name) : Task(name) +{ + set_load_balancing_function([]() { return "instance_0"; }); +} -/** @ingroup plugin_task +/** * @brief Smart Constructor. */ IoTaskPtr IoTask::init(const std::string& name) @@ -327,7 +476,7 @@ IoTaskPtr IoTask::init(const std::string& name) return IoTaskPtr(new IoTask(name)); } -/** @ingroup plugin_task +/** * @brief Smart Constructor. */ IoTaskPtr IoTask::init(const std::string& name, double bytes, Disk* disk, Io::OpType type) @@ -335,7 +484,7 @@ IoTaskPtr IoTask::init(const std::string& name, double bytes, Disk* disk, Io::Op return init(name)->set_bytes(bytes)->set_disk(disk)->set_op_type(type); } -/** @ingroup plugin_task +/** * @param disk The disk to set. * @brief Set a new disk. */ @@ -345,7 +494,7 @@ IoTaskPtr IoTask::set_disk(Disk* disk) return this; } -/** @ingroup plugin_task +/** * @param bytes The amount of bytes to set. */ IoTaskPtr IoTask::set_bytes(double bytes) @@ -354,20 +503,30 @@ IoTaskPtr IoTask::set_bytes(double bytes) return this; } -/** @ingroup plugin_task */ +/** */ IoTaskPtr IoTask::set_op_type(Io::OpType type) { kernel::actor::simcall_answered([this, type] { type_ = type; }); return this; } -void IoTask::fire() +void IoTask::fire(std::string instance) { - 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&) { complete(); }); - store_activity(io); + Task::fire(instance); + if (instance == "dispatcher" or instance == "collector") { + auto exec = Exec::init() + ->set_name(get_name() + "_" + instance) + ->set_flops_amount(get_amount(instance)) + ->set_host(disk_->get_host()); + exec->start(); + exec->on_this_completion_cb([this, instance](Exec const&) { complete(instance); }); + store_activity(exec, instance); + } else { + 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, instance](Io const&) { complete(instance); }); + store_activity(io, instance); + } } } // namespace simgrid::s4u -- 2.20.1