-/* Copyright (c) 2013-2019. 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 "src/surf/xml/platf.hpp"
#include "surf/surf.hpp"
-XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(disk_kernel);
+XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(res_disk);
/*********
* Model *
all_existing_models.push_back(this);
}
-DiskImpl* DiskS19Model::createDisk(const std::string& id, double read_bw, double write_bw)
+DiskImpl* DiskS19Model::create_disk()
{
- 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);
+ return new DiskS19();
}
-double DiskS19Model::next_occuring_event(double now)
+double DiskS19Model::next_occurring_event(double now)
{
- return DiskModel::next_occuring_event_full(now);
+ return DiskModel::next_occurring_event_full(now);
}
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_variable()->get_value() * 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);
-}
-
DiskAction* DiskS19::io_start(sg_size_t size, s4u::Io::OpType type)
{
- return new DiskS19Action(get_model(), size, not is_on(), this, type);
+ return new DiskS19Action(get_model(), static_cast<double>(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);
+ return new DiskS19Action(get_model(), static_cast<double>(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);
+ return new DiskS19Action(get_model(), static_cast<double>(size), not is_on(), this, s4u::Io::OpType::WRITE);
}
/**********
model->get_maxmin_system()->expand(disk->get_constraint(), get_variable(), 1.0);
switch (type) {
case s4u::Io::OpType::READ:
- model->get_maxmin_system()->expand(disk->constraint_read_, get_variable(), 1.0);
+ model->get_maxmin_system()->expand(disk->get_read_constraint(), get_variable(), 1.0);
break;
case s4u::Io::OpType::WRITE:
- model->get_maxmin_system()->expand(disk->constraint_write_, get_variable(), 1.0);
+ model->get_maxmin_system()->expand(disk->get_write_constraint(), get_variable(), 1.0);
break;
default:
THROW_UNIMPLEMENTED;