-/* Copyright (c) 2013-2019. The SimGrid Team. All rights reserved. */
+/* Copyright (c) 2013-2022. 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/s4u/Engine.hpp"
-#include "simgrid/s4u/Host.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/surf/xml/platf.hpp"
-#include "surf/surf.hpp"
+#include "src/kernel/resource/profile/Event.hpp"
+#include "src/surf/disk_s19.hpp"
-XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(disk_kernel);
+XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(res_disk);
/*********
* Model *
void surf_disk_model_init_default()
{
- surf_disk_model = new simgrid::kernel::resource::DiskS19Model();
+ auto disk_model = std::make_shared<simgrid::kernel::resource::DiskS19Model>("Disk");
+ auto* engine = simgrid::kernel::EngineImpl::get_instance();
+ engine->add_model(disk_model);
+ engine->get_netzone_root()->set_disk_model(disk_model);
}
namespace simgrid {
namespace kernel {
namespace resource {
-DiskS19Model::DiskS19Model()
-{
- all_existing_models.push_back(this);
-}
-
-DiskImpl* DiskS19Model::createDisk(const std::string& id, double read_bw, double write_bw)
+DiskImpl* DiskS19Model::create_disk(const std::string& name, double read_bandwidth, double write_bandwidth)
{
- 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_occuring_event(double now)
-{
- return DiskModel::next_occuring_event_full(now);
+ return (new DiskS19(name, read_bandwidth, write_bandwidth))->set_model(this);
}
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(lrint(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)) ||
}
}
-/************
- * 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)
-{
- XBT_DEBUG("Create resource with read_bw '%f' write_bw '%f'", read_bw, write_bw);
- // FIXME s4u::Storage::on_creation(this->piface_);
-}
-
-DiskAction* DiskS19::io_start(sg_size_t size, s4u::Io::OpType type)
+DiskAction* DiskS19Model::io_start(const DiskImpl* disk, sg_size_t size, s4u::Io::OpType type)
{
- return new DiskS19Action(get_model(), size, not is_on(), this, type);
-}
-
-DiskAction* DiskS19::read(sg_size_t size)
-{
- return new DiskS19Action(get_model(), size, not is_on(), this, s4u::Io::OpType::READ);
-}
-
-DiskAction* DiskS19::write(sg_size_t size)
-{
- return new DiskS19Action(get_model(), 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<double>(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->constraint_read_, 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->constraint_write_, get_variable(), 1.0);
+ get_maxmin_system()->expand(disk->get_write_constraint(), action->get_variable(), 1.0);
break;
default:
THROW_UNIMPLEMENTED;
}
- XBT_OUT();
+ if (const auto& factor_cb = disk->get_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);
+ DiskImpl::set_read_bandwidth(value);
+ if (get_read_constraint()) {
+ get_model()->get_maxmin_system()->update_constraint_bound(get_read_constraint(), get_read_bandwidth());
+ }
}
-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);
+ DiskImpl::set_write_bandwidth(value);
+ if (get_write_constraint()) {
+ get_model()->get_maxmin_system()->update_constraint_bound(get_write_constraint(), get_write_bandwidth());
}
- XBT_OUT();
}
-void DiskS19Action::resume()
+void DiskS19::set_readwrite_bandwidth(double value)
{
- THROW_UNIMPLEMENTED;
+ DiskImpl::set_readwrite_bandwidth(value);
+ if (get_constraint()) {
+ get_model()->get_maxmin_system()->update_constraint_bound(get_constraint(), get_readwrite_bandwidth());
+ }
}
-void DiskS19Action::set_max_duration(double /*duration*/)
-{
- THROW_UNIMPLEMENTED;
+void DiskS19::apply_event(kernel::profile::Event* triggered, double value)
+{
+ /* Find out which of my iterators was triggered, and react accordingly */
+ if (triggered == get_read_event()) {
+ set_read_bandwidth(value);
+ unref_read_event();
+ } else if (triggered == get_write_event()) {
+ set_write_bandwidth(value);
+ unref_write_event();
+ } else if (triggered == get_state_event()) {
+ if (value > 0)
+ turn_on();
+ else
+ turn_off();
+ 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;
