From 5d42245e230395eb181277793042a38cc65c7d88 Mon Sep 17 00:00:00 2001 From: Frederic Suter Date: Tue, 2 Feb 2021 21:36:59 +0100 Subject: [PATCH] Storage-kill: clean surf of storage --- src/surf/HostImpl.cpp | 16 -------- src/surf/HostImpl.hpp | 1 - src/surf/host_clm03.cpp | 7 +--- src/surf/sg_platf.cpp | 79 ------------------------------------ src/surf/surf_c_bindings.cpp | 2 +- src/surf/surf_interface.cpp | 12 ------ 6 files changed, 3 insertions(+), 114 deletions(-) diff --git a/src/surf/HostImpl.cpp b/src/surf/HostImpl.cpp index ff03d144f8..fc804315c0 100644 --- a/src/surf/HostImpl.cpp +++ b/src/surf/HostImpl.cpp @@ -135,21 +135,5 @@ void HostImpl::remove_disk(const std::string& disk_name) } } -std::vector HostImpl::get_attached_storages() -{ - std::vector storages; - for (auto const& s : storage_) - if (s.second->get_host() == piface_->get_cname()) - storages.push_back(s.second->get_iface()->get_cname()); - return storages; -} -std::unordered_map* HostImpl::get_mounted_storages() -{ - auto* mounts = new std::unordered_map(); - for (auto const& m : storage_) { - mounts->insert({m.first, m.second->get_iface()}); - } - return mounts; -} } // namespace surf } // namespace simgrid diff --git a/src/surf/HostImpl.hpp b/src/surf/HostImpl.hpp index 87f511931d..d46f374074 100644 --- a/src/surf/HostImpl.hpp +++ b/src/surf/HostImpl.hpp @@ -8,7 +8,6 @@ #include "src/kernel/actor/ActorImpl.hpp" #include "src/kernel/resource/DiskImpl.hpp" -#include "src/surf/StorageImpl.hpp" #include "src/surf/cpu_interface.hpp" #include "src/surf/network_interface.hpp" #include diff --git a/src/surf/host_clm03.cpp b/src/surf/host_clm03.cpp index 97d9a72309..0e232e68c5 100644 --- a/src/surf/host_clm03.cpp +++ b/src/surf/host_clm03.cpp @@ -36,18 +36,15 @@ double HostCLM03Model::next_occurring_event(double now) double min_by_cpu = surf_cpu_model_pm->next_occurring_event(now); double min_by_net = surf_network_model->next_occurring_event_is_idempotent() ? surf_network_model->next_occurring_event(now) : -1; - double min_by_sto = surf_storage_model->next_occurring_event(now); double min_by_dsk = surf_disk_model->next_occurring_event(now); - XBT_DEBUG("model %p, %s min_by_cpu %f, %s min_by_net %f, %s min_by_sto %f, %s min_by_dsk %f", this, + XBT_DEBUG("model %p, %s min_by_cpu %f, %s min_by_net %f, %s min_by_dsk %f", this, typeid(surf_cpu_model_pm).name(), min_by_cpu, typeid(surf_network_model).name(), min_by_net, - typeid(surf_storage_model).name(), min_by_sto, typeid(surf_disk_model).name(), min_by_dsk); + typeid(surf_disk_model).name(), min_by_dsk); double res = min_by_cpu; if (res < 0 || (min_by_net >= 0.0 && min_by_net < res)) res = min_by_net; - if (res < 0 || (min_by_sto >= 0.0 && min_by_sto < res)) - res = min_by_sto; if (res < 0 || (min_by_dsk >= 0.0 && min_by_dsk < res)) res = min_by_dsk; return res; diff --git a/src/surf/sg_platf.cpp b/src/surf/sg_platf.cpp index f492d69413..a7e0f42e31 100644 --- a/src/surf/sg_platf.cpp +++ b/src/surf/sg_platf.cpp @@ -30,9 +30,6 @@ XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(surf_parse); -XBT_PRIVATE std::map> mount_list; -XBT_PRIVATE std::vector known_storages; - namespace simgrid { namespace kernel { namespace routing { @@ -42,7 +39,6 @@ xbt::signal on_cluster_creation; } // namespace simgrid static int surf_parse_models_setup_already_called = 0; -std::map> storage_types; /** The current AS in the parsing */ static simgrid::kernel::routing::NetZoneImpl* current_routing = nullptr; @@ -80,9 +76,6 @@ void sg_platf_new_host(const simgrid::kernel::routing::HostCreationArgs* args) simgrid::s4u::Host* host = routing_get_current()->create_host(args->id, args->speed_per_pstate, args->core_amount, &props); - host->pimpl_->set_storages(mount_list); - mount_list.clear(); - host->pimpl_->set_disks(args->disks, host); /* Change from the defaults */ @@ -344,73 +337,6 @@ simgrid::kernel::resource::DiskImpl* sg_platf_new_disk(const simgrid::kernel::ro return d; } -void sg_platf_new_storage(simgrid::kernel::routing::StorageCreationArgs* storage) -{ - xbt_assert(std::find(known_storages.begin(), known_storages.end(), storage->id) == known_storages.end(), - "Refusing to add a second storage named \"%s\"", storage->id.c_str()); - - const simgrid::kernel::resource::StorageType* stype; - auto st = storage_types.find(storage->type_id); - if (st != storage_types.end()) { - stype = st->second; - } else { - xbt_die("No storage type '%s'", storage->type_id.c_str()); - } - - XBT_DEBUG("ROUTING Create a storage name '%s' with type_id '%s' and content '%s'", storage->id.c_str(), - storage->type_id.c_str(), storage->content.c_str()); - - known_storages.push_back(storage->id); - - // if storage content is not specified use the content of storage_type if any - if (storage->content.empty() && not stype->content.empty()) { - storage->content = stype->content; - XBT_DEBUG("For disk '%s' content is empty, inherit the content (of type %s)", storage->id.c_str(), - stype->id.c_str()); - } - - XBT_DEBUG("SURF storage create resource\n\t\tid '%s'\n\t\ttype '%s' " - "\n\t\tmodel '%s' \n\t\tcontent '%s' " - "\n\t\tproperties '%p''\n", - storage->id.c_str(), stype->model.c_str(), stype->id.c_str(), storage->content.c_str(), - storage->properties); - - auto s = surf_storage_model->createStorage(storage->filename, storage->lineno, storage->id, stype->id, - storage->content, storage->attach); - - if (storage->properties) { - s->set_properties(*storage->properties); - delete storage->properties; - } -} - -void sg_platf_new_storage_type(const simgrid::kernel::routing::StorageTypeCreationArgs* storage_type) -{ - xbt_assert(storage_types.find(storage_type->id) == storage_types.end(), - "Reading a storage type, processing unit \"%s\" already exists", storage_type->id.c_str()); - - auto* stype = new simgrid::kernel::resource::StorageType(storage_type->id, storage_type->model, storage_type->content, - storage_type->properties, storage_type->model_properties, - storage_type->size); - - XBT_DEBUG("Create a storage type id '%s' with model '%s', content '%s'", storage_type->id.c_str(), - storage_type->model.c_str(), storage_type->content.c_str()); - - storage_types[storage_type->id] = stype; -} - -void sg_platf_new_mount(simgrid::kernel::routing::MountCreationArgs* mount) -{ - xbt_assert(std::find(known_storages.begin(), known_storages.end(), mount->storageId) != known_storages.end(), - "Cannot mount non-existent disk \"%s\"", mount->storageId.c_str()); - - XBT_DEBUG("Mount '%s' on '%s'", mount->storageId.c_str(), mount->name.c_str()); - - if (mount_list.empty()) - XBT_DEBUG("Create a Mount list for %s", A_surfxml_host_id); - mount_list.insert({mount->name, simgrid::s4u::Engine::get_instance()->storage_by_name(mount->storageId)->get_impl()}); -} - void sg_platf_new_route(simgrid::kernel::routing::RouteCreationArgs* route) { routing_get_current()->add_route(route->src, route->dst, route->gw_src, route->gw_dst, route->link_list, @@ -517,7 +443,6 @@ static void surf_config_models_setup() std::string network_model_name = simgrid::config::get_value("network/model"); std::string cpu_model_name = simgrid::config::get_value("cpu/model"); std::string disk_model_name = simgrid::config::get_value("disk/model"); - std::string storage_model_name = simgrid::config::get_value("storage/model"); /* The compound host model is needed when using non-default net/cpu models */ if ((not simgrid::config::is_default("network/model") || not simgrid::config::is_default("cpu/model")) && @@ -548,10 +473,6 @@ static void surf_config_models_setup() XBT_DEBUG("Call disk_model_init"); int disk_id = find_model_description(surf_disk_model_description, disk_model_name); surf_disk_model_description[disk_id].model_init_preparse(); - - XBT_DEBUG("Call storage_model_init"); - int storage_id = find_model_description(surf_storage_model_description, storage_model_name); - surf_storage_model_description[storage_id].model_init_preparse(); } /** diff --git a/src/surf/surf_c_bindings.cpp b/src/surf/surf_c_bindings.cpp index b8d33ea0c3..66144a77a7 100644 --- a/src/surf/surf_c_bindings.cpp +++ b/src/surf/surf_c_bindings.cpp @@ -70,7 +70,7 @@ double surf_solve(double max_date) for (auto const& model : all_existing_models) { if (model != surf_host_model && model != surf_vm_model && model != surf_network_model && - model != surf_storage_model && model != surf_disk_model) { + model != surf_disk_model) { double next_event_model = model->next_occurring_event(NOW); if ((time_delta < 0.0 || next_event_model < time_delta) && next_event_model >= 0.0) time_delta = next_event_model; diff --git a/src/surf/surf_interface.cpp b/src/surf/surf_interface.cpp index 2f74981b97..2ff3eb33c1 100644 --- a/src/surf/surf_interface.cpp +++ b/src/surf/surf_interface.cpp @@ -34,8 +34,6 @@ std::vector all_existing_models; /* to destro simgrid::kernel::profile::FutureEvtSet future_evt_set; std::vector surf_path; -extern std::map> storage_types; - std::vector* surf_plugin_description = nullptr; static void XBT_ATTRIB_DESTRUCTOR(800) simgrid_free_plugin_description() @@ -114,10 +112,6 @@ const std::vector surf_disk_model_description = { {"default", "Simplistic disk model.", &surf_disk_model_init_default}, }; -const std::vector surf_storage_model_description = { - {"default", "Simplistic storage model.", &surf_storage_model_init_default}, -}; - double NOW = 0; double surf_get_clock() @@ -226,12 +220,6 @@ void surf_init(int *argc, char **argv) void surf_exit() { simgrid::s4u::Engine::shutdown(); - for (auto const& e : storage_types) { - const simgrid::kernel::resource::StorageType* stype = e.second; - delete stype->properties; - delete stype->model_properties; - delete stype; - } for (auto const& model : all_existing_models) delete model; -- 2.20.1