-/* Copyright (c) 2013-2021. 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/kernel/routing/NetZoneImpl.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/kernel/resource/profile/Event.hpp"
-#include "src/surf/xml/platf.hpp"
-#include "surf/surf.hpp"
+#include "src/surf/disk_s19.hpp"
XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(res_disk);
void surf_disk_model_init_default()
{
auto disk_model = std::make_shared<simgrid::kernel::resource::DiskS19Model>("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);
+ auto* engine = simgrid::kernel::EngineImpl::get_instance();
+ engine->add_model(disk_model);
+ engine->get_netzone_root()->set_disk_model(disk_model);
}
namespace simgrid {
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)) ||
default:
THROW_UNIMPLEMENTED;
}
+ 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 DiskS19::set_read_bandwidth(double value)
{
- read_bw_.peak = value;
-
- get_model()->get_maxmin_system()->update_constraint_bound(get_constraint(),
- sg_bandwidth_factor * (read_bw_.peak * read_bw_.scale));
-
- double delta = 1.0 / value - 1.0 / (read_bw_.peak * read_bw_.scale);
-
- const kernel::lmm::Element* elem = nullptr;
- const kernel::lmm::Element* nextelem = nullptr;
- int numelem = 0;
- while (const auto* var = get_constraint()->get_variable_safe(&elem, &nextelem, &numelem)) {
- auto* action = static_cast<DiskS19Action*>(var->get_id());
- action->sharing_penalty_ += delta;
- if (not action->is_suspended())
- get_model()->get_maxmin_system()->update_variable_penalty(action->get_variable(), action->sharing_penalty_);
+ DiskImpl::set_read_bandwidth(value);
+ if (get_read_constraint()) {
+ get_model()->get_maxmin_system()->update_constraint_bound(get_read_constraint(), get_read_bandwidth());
}
}
void DiskS19::set_write_bandwidth(double value)
{
- write_bw_.peak = value;
-
- get_model()->get_maxmin_system()->update_constraint_bound(get_constraint(),
- sg_bandwidth_factor * (write_bw_.peak * write_bw_.scale));
-
- double delta = 1.0 / value - 1.0 / (write_bw_.peak * write_bw_.scale);
+ DiskImpl::set_write_bandwidth(value);
+ if (get_write_constraint()) {
+ get_model()->get_maxmin_system()->update_constraint_bound(get_write_constraint(), get_write_bandwidth());
+ }
+}
- const kernel::lmm::Element* elem = nullptr;
- const kernel::lmm::Element* nextelem = nullptr;
- int numelem = 0;
- while (const auto* var = get_constraint()->get_variable_safe(&elem, &nextelem, &numelem)) {
- auto* action = static_cast<DiskS19Action*>(var->get_id());
- action->sharing_penalty_ += delta;
- if (not action->is_suspended())
- get_model()->get_maxmin_system()->update_variable_penalty(action->get_variable(), action->sharing_penalty_);
+void DiskS19::set_readwrite_bandwidth(double value)
+{
+ DiskImpl::set_readwrite_bandwidth(value);
+ if (get_constraint()) {
+ get_model()->get_maxmin_system()->update_constraint_bound(get_constraint(), get_readwrite_bandwidth());
}
}
void DiskS19::apply_event(kernel::profile::Event* triggered, double value)
{
/* Find out which of my iterators was triggered, and react accordingly */
- if (triggered == read_bw_.event) {
+ if (triggered == get_read_event()) {
set_read_bandwidth(value);
- tmgr_trace_event_unref(&read_bw_.event);
-
- } else if (triggered == write_bw_.event) {
+ unref_read_event();
+ } else if (triggered == get_write_event()) {
set_write_bandwidth(value);
- tmgr_trace_event_unref(&write_bw_.event);
-
- } else if (triggered == state_event_) {
+ unref_write_event();
+ } else if (triggered == get_state_event()) {
if (value > 0)
turn_on();
else
turn_off();
- tmgr_trace_event_unref(&state_event_);
+ unref_state_event();
} else {
xbt_die("Unknown event!\n");
}