X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/13e64de335db45c87e2d7c8668ce8b16b7cb2139..bf715fe2cc9ef8b2bcb7805a72eef25a87b87aaa:/src/surf/disk_s19.cpp diff --git a/src/surf/disk_s19.cpp b/src/surf/disk_s19.cpp index 0f3f4b7423..16860851c7 100644 --- a/src/surf/disk_s19.cpp +++ b/src/surf/disk_s19.cpp @@ -1,17 +1,20 @@ -/* Copyright (c) 2013-2020. The SimGrid Team. All rights reserved. */ +/* Copyright (c) 2013-2021. 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 "disk_s19.hpp" #include "simgrid/kernel/routing/NetPoint.hpp" +#include "simgrid/kernel/routing/NetZoneImpl.hpp" #include "simgrid/s4u/Engine.hpp" #include "simgrid/s4u/Host.hpp" +#include "src/kernel/EngineImpl.hpp" #include "src/kernel/lmm/maxmin.hpp" +#include "src/kernel/resource/profile/Event.hpp" #include "src/surf/xml/platf.hpp" #include "surf/surf.hpp" -XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(disk_kernel); +XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(res_disk); /********* * Model * @@ -19,28 +22,18 @@ XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(disk_kernel); void surf_disk_model_init_default() { - surf_disk_model = new simgrid::kernel::resource::DiskS19Model(); + auto disk_model = std::make_shared("Disk"); + simgrid::kernel::EngineImpl::get_instance()->add_model(disk_model); + simgrid::s4u::Engine::get_instance()->get_netzone_root()->get_impl()->set_disk_model(disk_model); } namespace simgrid { namespace kernel { namespace resource { -DiskS19Model::DiskS19Model() +DiskImpl* DiskS19Model::create_disk(const std::string& name, double read_bandwidth, double write_bandwidth) { - all_existing_models.push_back(this); -} - -DiskImpl* DiskS19Model::createDisk(const std::string& id, double read_bw, double write_bw) -{ - XBT_DEBUG("SURF disk create resource\n\t\tid '%s'\n\t\tread_bw '%f'\n", id.c_str(), read_bw); - - return new DiskS19(this, id, get_maxmin_system(), read_bw, write_bw); -} - -double DiskS19Model::next_occurring_event(double now) -{ - return DiskModel::next_occurring_event_full(now); + return (new DiskS19(name, read_bandwidth, write_bandwidth))->set_model(this); } void DiskS19Model::update_actions_state(double /*now*/, double delta) @@ -48,7 +41,7 @@ void DiskS19Model::update_actions_state(double /*now*/, double delta) for (auto it = std::begin(*get_started_action_set()); it != std::end(*get_started_action_set());) { auto& action = *it; ++it; // increment iterator here since the following calls to action.finish() may invalidate it - action.update_remains(rint(action.get_variable()->get_value() * delta)); + action.update_remains(rint(action.get_rate() * delta)); action.update_max_duration(delta); if (((action.get_remains_no_update() <= 0) && (action.get_variable()->get_penalty() > 0)) || @@ -58,84 +51,90 @@ void DiskS19Model::update_actions_state(double /*now*/, double delta) } } -/************ - * Resource * - ************/ - -DiskS19::DiskS19(DiskModel* model, const std::string& name, lmm::System* maxminSystem, double read_bw, double write_bw) - : DiskImpl(model, name, maxminSystem, read_bw, write_bw) +DiskAction* DiskS19Model::io_start(const DiskImpl* disk, sg_size_t size, s4u::Io::OpType type) { - XBT_DEBUG("Create resource with read_bw '%f' write_bw '%f'", read_bw, write_bw); -} - -DiskAction* DiskS19::io_start(sg_size_t size, s4u::Io::OpType type) -{ - return new DiskS19Action(get_model(), static_cast(size), not is_on(), this, type); -} - -DiskAction* DiskS19::read(sg_size_t size) -{ - return new DiskS19Action(get_model(), static_cast(size), not is_on(), this, s4u::Io::OpType::READ); -} - -DiskAction* DiskS19::write(sg_size_t size) -{ - return new DiskS19Action(get_model(), static_cast(size), not is_on(), this, s4u::Io::OpType::WRITE); -} - -/********** - * Action * - **********/ - -DiskS19Action::DiskS19Action(Model* model, double cost, bool failed, DiskImpl* disk, s4u::Io::OpType type) - : DiskAction(model, cost, failed, model->get_maxmin_system()->variable_new(this, 1.0, -1.0, 3), disk, type) -{ - XBT_IN("(%s,%g", disk->get_cname(), cost); - - // Must be less than the max bandwidth for all actions - model->get_maxmin_system()->expand(disk->get_constraint(), get_variable(), 1.0); + auto* action = new DiskS19Action(this, static_cast(size), not disk->is_on()); + get_maxmin_system()->expand(disk->get_constraint(), action->get_variable(), 1.0); switch (type) { case s4u::Io::OpType::READ: - model->get_maxmin_system()->expand(disk->get_read_constraint(), get_variable(), 1.0); + get_maxmin_system()->expand(disk->get_read_constraint(), action->get_variable(), 1.0); break; case s4u::Io::OpType::WRITE: - model->get_maxmin_system()->expand(disk->get_write_constraint(), get_variable(), 1.0); + get_maxmin_system()->expand(disk->get_write_constraint(), action->get_variable(), 1.0); break; default: THROW_UNIMPLEMENTED; } - XBT_OUT(); + const auto& factor_cb = disk->get_factor_cb(); + if (factor_cb) { // handling disk variability + action->set_rate_factor(factor_cb(size, type)); + } + return action; } -void DiskS19Action::cancel() +/************ + * Resource * + ************/ +void DiskS19::set_read_bandwidth(double value) { - set_state(Action::State::FAILED); + read_bw_.peak = value; + + if (get_read_constraint()) { + get_model()->get_maxmin_system()->update_constraint_bound(get_read_constraint(), read_bw_.peak * read_bw_.scale); + } } -void DiskS19Action::suspend() +void DiskS19::set_write_bandwidth(double value) { - XBT_IN("(%p)", this); - if (is_running()) { - get_model()->get_maxmin_system()->update_variable_penalty(get_variable(), 0.0); - set_suspend_state(Action::SuspendStates::SUSPENDED); + write_bw_.peak = value; + + if (get_write_constraint()) { + get_model()->get_maxmin_system()->update_constraint_bound(get_write_constraint(), write_bw_.peak * write_bw_.scale); } - XBT_OUT(); } -void DiskS19Action::resume() +void DiskS19::set_readwrite_bandwidth(double value) { - THROW_UNIMPLEMENTED; + readwrite_bw_ = value; + if (get_constraint()) { + get_model()->get_maxmin_system()->update_constraint_bound(get_constraint(), readwrite_bw_); + } } -void DiskS19Action::set_max_duration(double /*duration*/) +void DiskS19::apply_event(kernel::profile::Event* triggered, double value) { - THROW_UNIMPLEMENTED; + /* Find out which of my iterators was triggered, and react accordingly */ + if (triggered == read_bw_.event) { + set_read_bandwidth(value); + tmgr_trace_event_unref(&read_bw_.event); + + } else if (triggered == write_bw_.event) { + set_write_bandwidth(value); + tmgr_trace_event_unref(&write_bw_.event); + + } else if (triggered == state_event_) { + if (value > 0) + turn_on(); + else + turn_off(); + tmgr_trace_event_unref(&state_event_); + } else { + xbt_die("Unknown event!\n"); + } + + XBT_DEBUG("There was a resource state event, need to update actions related to the constraint (%p)", + get_constraint()); } -void DiskS19Action::set_sharing_penalty(double) +/********** + * Action * + **********/ + +DiskS19Action::DiskS19Action(Model* model, double cost, bool failed) + : DiskAction(model, cost, failed, model->get_maxmin_system()->variable_new(this, 1.0, -1.0, 3)) { - THROW_UNIMPLEMENTED; } + void DiskS19Action::update_remains_lazy(double /*now*/) { THROW_IMPOSSIBLE;