void check_disk_attachment()
{
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());
+ simgrid::kernel::routing::NetPoint* host_elm = sg_netpoint_by_name_or_null(s->get_impl()->getHost().c_str());
if (not host_elm)
surf_parse_error(std::string("Unable to attach storage ") + s->get_cname() + ": host " +
- s->getImpl()->getHost().c_str() + " does not exist.");
+ s->get_impl()->getHost().c_str() + " does not exist.");
else
- s->attached_to_ = sg_host_by_name(s->getImpl()->getHost().c_str());
+ s->set_host(sg_host_by_name(s->get_impl()->getHost().c_str()));
}
}
void surf_storage_model_init_default()
{
surf_storage_model = new simgrid::surf::StorageN11Model();
- all_existing_models->push_back(surf_storage_model);
}
namespace simgrid {
namespace surf {
+StorageN11Model::StorageN11Model()
+{
+ all_existing_models.push_back(this);
+}
+
StorageImpl* StorageN11Model::createStorage(std::string id, std::string type_id, std::string content_name,
std::string attach)
{
void StorageN11Model::update_actions_state(double /*now*/, double delta)
{
- for (auto it = std::begin(*get_running_action_set()); it != std::end(*get_running_action_set());) {
+ 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.get_variable()->get_value() * delta));
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);
}
}
}
void StorageN11Action::cancel()
{
- set_state(Action::State::failed);
+ set_state(Action::State::FAILED);
}
void StorageN11Action::suspend()