#include "storage_n11.hpp"
#include "simgrid/kernel/routing/NetPoint.hpp"
#include "simgrid/s4u/Engine.hpp"
-#include "simgrid/s4u/Host.hpp"
-#include "src/surf/xml/platf.hpp"
#include "src/kernel/lmm/maxmin.hpp"
-#include "xbt/utility.hpp"
-#include <cmath> /*ceil*/
+#include "src/surf/xml/platf.hpp"
+#include "surf/surf.hpp"
XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(surf_storage);
*************/
extern std::map<std::string, simgrid::surf::StorageType*> storage_types;
-static void check_disk_attachment()
+void check_disk_attachment()
{
- for (auto const& s : simgrid::s4u::Engine::getInstance()->getAllStorages()) {
+ for (auto const& s : simgrid::s4u::Engine::get_instance()->get_all_storages()) {
simgrid::kernel::routing::NetPoint* host_elm = sg_netpoint_by_name_or_null(s->getImpl()->getHost().c_str());
if (not host_elm)
- surf_parse_error(std::string("Unable to attach storage ") + s->getCname() + ": host " +
+ surf_parse_error(std::string("Unable to attach storage ") + s->get_cname() + ": host " +
s->getImpl()->getHost().c_str() + " does not exist.");
else
s->attached_to_ = sg_host_by_name(s->getImpl()->getHost().c_str());
}
}
-void storage_register_callbacks()
-{
- simgrid::s4u::onPlatformCreated.connect(check_disk_attachment);
- instr_routing_define_callbacks();
-}
-
/*********
* Model *
*********/
"property Bwrite, storage", type_id.c_str());
StorageImpl* storage =
- new StorageN11(this, id, maxmin_system_, Bread, Bwrite, type_id, content_name, storage_type->size, attach);
- storageCreatedCallbacks(storage);
+ new StorageN11(this, id, get_maxmin_system(), Bread, Bwrite, type_id, content_name, storage_type->size, attach);
XBT_DEBUG("SURF storage create resource\n\t\tid '%s'\n\t\ttype '%s'\n\t\tBread '%f'\n", id.c_str(), type_id.c_str(),
Bread);
return storage;
}
-double StorageN11Model::nextOccuringEvent(double now)
+double StorageN11Model::next_occuring_event(double now)
{
- return StorageModel::nextOccuringEventFull(now);
+ return StorageModel::next_occuring_event_full(now);
}
-void StorageN11Model::updateActionsState(double /*now*/, double delta)
+void StorageN11Model::update_actions_state(double /*now*/, double delta)
{
- for (auto it = std::begin(*getRunningActionSet()); it != std::end(*getRunningActionSet());) {
+ for (auto it = std::begin(*get_started_action_set()); it != std::end(*get_started_action_set());) {
StorageAction& action = static_cast<StorageAction&>(*it);
++it; // increment iterator here since the following calls to action.finish() may invalidate it
- action.update_remains(lrint(action.getVariable()->get_value() * delta));
+ action.update_remains(lrint(action.get_variable()->get_value() * delta));
if (action.get_max_duration() > NO_MAX_DURATION)
action.update_max_duration(delta);
- if (((action.get_remains_no_update() <= 0) && (action.getVariable()->get_weight() > 0)) ||
+ if (((action.get_remains_no_update() <= 0) && (action.get_variable()->get_weight() > 0)) ||
((action.get_max_duration() > NO_MAX_DURATION) && (action.get_max_duration() <= 0))) {
- action.finish(kernel::resource::Action::State::done);
+ action.finish(kernel::resource::Action::State::FINISHED);
}
}
}
: StorageImpl(model, name, maxminSystem, bread, bwrite, type_id, content_name, size, attach)
{
XBT_DEBUG("Create resource with Bread '%f' Bwrite '%f' and Size '%llu'", bread, bwrite, size);
- simgrid::s4u::Storage::onCreation(this->piface_);
+ simgrid::s4u::Storage::on_creation(this->piface_);
}
StorageAction* StorageN11::read(sg_size_t size)
{
- return new StorageN11Action(model(), size, isOff(), this, READ);
+ return new StorageN11Action(get_model(), size, is_off(), this, READ);
}
StorageAction* StorageN11::write(sg_size_t size)
{
- return new StorageN11Action(model(), size, isOff(), this, WRITE);
+ return new StorageN11Action(get_model(), size, is_off(), this, WRITE);
}
/**********
StorageN11Action::StorageN11Action(kernel::resource::Model* model, double cost, bool failed, StorageImpl* storage,
e_surf_action_storage_type_t type)
- : StorageAction(model, cost, failed, model->getMaxminSystem()->variable_new(this, 1.0, -1.0, 3), storage, type)
+ : StorageAction(model, cost, failed, model->get_maxmin_system()->variable_new(this, 1.0, -1.0, 3), storage, type)
{
- XBT_IN("(%s,%g", storage->getCname(), cost);
+ XBT_IN("(%s,%g", storage->get_cname(), cost);
// Must be less than the max bandwidth for all actions
- model->getMaxminSystem()->expand(storage->constraint(), getVariable(), 1.0);
+ model->get_maxmin_system()->expand(storage->get_constraint(), get_variable(), 1.0);
switch(type) {
case READ:
- model->getMaxminSystem()->expand(storage->constraintRead_, getVariable(), 1.0);
+ model->get_maxmin_system()->expand(storage->constraintRead_, get_variable(), 1.0);
break;
case WRITE:
- model->getMaxminSystem()->expand(storage->constraintWrite_, getVariable(), 1.0);
+ model->get_maxmin_system()->expand(storage->constraintWrite_, get_variable(), 1.0);
break;
default:
THROW_UNIMPLEMENTED;
XBT_OUT();
}
-int StorageN11Action::unref()
-{
- refcount_--;
- if (not refcount_) {
- if (state_set_hook_.is_linked())
- simgrid::xbt::intrusive_erase(*state_set_, *this);
- if (getVariable())
- get_model()->getMaxminSystem()->variable_free(getVariable());
- xbt_free(get_category());
- delete this;
- return 1;
- }
- return 0;
-}
-
void StorageN11Action::cancel()
{
- set_state(Action::State::failed);
+ set_state(Action::State::FAILED);
}
void StorageN11Action::suspend()
{
XBT_IN("(%p)", this);
if (suspended_ != Action::SuspendStates::sleeping) {
- get_model()->getMaxminSystem()->update_variable_weight(getVariable(), 0.0);
+ get_model()->get_maxmin_system()->update_variable_weight(get_variable(), 0.0);
suspended_ = Action::SuspendStates::suspended;
}
XBT_OUT();
THROW_UNIMPLEMENTED;
}
-bool StorageN11Action::isSuspended()
-{
- return suspended_ == Action::SuspendStates::suspended;
-}
-
void StorageN11Action::set_max_duration(double /*duration*/)
{
THROW_UNIMPLEMENTED;
{
THROW_UNIMPLEMENTED;
}
-void StorageN11Action::updateRemainingLazy(double /*now*/)
+void StorageN11Action::update_remains_lazy(double /*now*/)
{
THROW_IMPOSSIBLE;
}
