From 23ac05d30d07e710783f95be8c5f15f1b5a6180f Mon Sep 17 00:00:00 2001 From: Martin Quinson Date: Sat, 14 Jul 2018 15:47:55 +0200 Subject: [PATCH 1/1] stringify xbt::config and plugins --- include/xbt/config.hpp | 20 ++++----- src/plugins/host_dvfs.cpp | 4 +- src/plugins/vm/VirtualMachineImpl.cpp | 10 ++--- src/plugins/vm/VmHostExt.cpp | 3 +- src/plugins/vm/s4u_VirtualMachine.cpp | 6 +-- src/xbt/config.cpp | 60 +++++++++++++-------------- 6 files changed, 51 insertions(+), 52 deletions(-) diff --git a/include/xbt/config.hpp b/include/xbt/config.hpp index c8888e639a..d9c3de9f87 100644 --- a/include/xbt/config.hpp +++ b/include/xbt/config.hpp @@ -69,12 +69,12 @@ XBT_PUBLIC void set_parse(std::string options); // Get config -template XBT_PUBLIC T const& get_value(const char* name); +template XBT_PUBLIC T const& get_value(std::string name); -extern template XBT_PUBLIC int const& get_value(const char* name); -extern template XBT_PUBLIC double const& get_value(const char* name); -extern template XBT_PUBLIC bool const& get_value(const char* name); -extern template XBT_PUBLIC std::string const& get_value(const char* name); +extern template XBT_PUBLIC int const& get_value(std::string name); +extern template XBT_PUBLIC double const& get_value(std::string name); +extern template XBT_PUBLIC bool const& get_value(std::string name); +extern template XBT_PUBLIC std::string const& get_value(std::string name); // Register: @@ -86,16 +86,16 @@ extern template XBT_PUBLIC std::string const& get_value(const char* * @param callback called with the option value */ template -XBT_PUBLIC void declare_flag(const char* name, const char* description, T value, +XBT_PUBLIC void declare_flag(std::string name, std::string description, T value, std::function callback = std::function()); -extern template XBT_PUBLIC void declare_flag(const char* name, const char* description, int value, +extern template XBT_PUBLIC void declare_flag(std::string name, std::string description, int value, std::function callback); -extern template XBT_PUBLIC void declare_flag(const char* name, const char* description, double value, +extern template XBT_PUBLIC void declare_flag(std::string name, std::string description, double value, std::function callback); -extern template XBT_PUBLIC void declare_flag(const char* name, const char* description, bool value, +extern template XBT_PUBLIC void declare_flag(std::string name, std::string description, bool value, std::function callback); -extern template XBT_PUBLIC void declare_flag(const char* name, const char* description, std::string value, +extern template XBT_PUBLIC void declare_flag(std::string name, std::string description, std::string value, std::function callback); // ***** alias ***** diff --git a/src/plugins/host_dvfs.cpp b/src/plugins/host_dvfs.cpp index 202442686e..2cb3ffa8a5 100644 --- a/src/plugins/host_dvfs.cpp +++ b/src/plugins/host_dvfs.cpp @@ -20,8 +20,8 @@ SIMGRID_REGISTER_PLUGIN(host_dvfs, "Dvfs support", &sg_host_dvfs_plugin_init) XBT_LOG_NEW_DEFAULT_SUBCATEGORY(surf_plugin_dvfs, surf, "Logging specific to the SURF HostDvfs plugin"); -static const char* property_sampling_rate = "plugin/dvfs/sampling_rate"; -static const char* property_governor = "plugin/dvfs/governor"; +static std::string property_sampling_rate = "plugin/dvfs/sampling_rate"; +static std::string property_governor = "plugin/dvfs/governor"; namespace simgrid { namespace plugin { diff --git a/src/plugins/vm/VirtualMachineImpl.cpp b/src/plugins/vm/VirtualMachineImpl.cpp index 3f32d02a9c..3c25ade5a2 100644 --- a/src/plugins/vm/VirtualMachineImpl.cpp +++ b/src/plugins/vm/VirtualMachineImpl.cpp @@ -224,9 +224,9 @@ void VirtualMachineImpl::shutdown(smx_actor_t issuer) */ void VirtualMachineImpl::set_physical_host(s4u::Host* destination) { - const char* vm_name = piface_->get_cname(); - const char* pm_name_src = physical_host_->get_cname(); - const char* pm_name_dst = destination->get_cname(); + std::string vm_name = piface_->get_name(); + std::string pm_name_src = physical_host_->get_name(); + std::string pm_name_dst = destination->get_name(); /* update net_elm with that of the destination physical host */ piface_->pimpl_netpoint = destination->pimpl_netpoint; @@ -244,7 +244,7 @@ void VirtualMachineImpl::set_physical_host(s4u::Host* destination) /* keep the bound value of the cpu action of the VM. */ double old_bound = action_->get_bound(); if (old_bound > 0) { - XBT_DEBUG("migrate VM(%s): set bound (%f) at %s", vm_name, old_bound, pm_name_dst); + XBT_DEBUG("migrate VM(%s): set bound (%f) at %s", vm_name.c_str(), old_bound, pm_name_dst.c_str()); new_cpu_action->set_bound(old_bound); } @@ -253,7 +253,7 @@ void VirtualMachineImpl::set_physical_host(s4u::Host* destination) action_ = new_cpu_action; - XBT_DEBUG("migrate VM(%s): change PM (%s to %s)", vm_name, pm_name_src, pm_name_dst); + XBT_DEBUG("migrate VM(%s): change PM (%s to %s)", vm_name.c_str(), pm_name_src.c_str(), pm_name_dst.c_str()); } void VirtualMachineImpl::set_bound(double bound) diff --git a/src/plugins/vm/VmHostExt.cpp b/src/plugins/vm/VmHostExt.cpp index f85143a986..613199fa96 100644 --- a/src/plugins/vm/VmHostExt.cpp +++ b/src/plugins/vm/VmHostExt.cpp @@ -5,8 +5,7 @@ #include "src/plugins/vm/VmHostExt.hpp" -XBT_LOG_EXTERNAL_CATEGORY(surf_vm); -XBT_LOG_DEFAULT_CATEGORY(surf_vm); +XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(surf_vm); namespace simgrid { namespace vm { diff --git a/src/plugins/vm/s4u_VirtualMachine.cpp b/src/plugins/vm/s4u_VirtualMachine.cpp index bb23fed423..2e3a673c1b 100644 --- a/src/plugins/vm/s4u_VirtualMachine.cpp +++ b/src/plugins/vm/s4u_VirtualMachine.cpp @@ -32,6 +32,9 @@ VirtualMachine::VirtualMachine(std::string name, s4u::Host* physical_host, int c VirtualMachine::VirtualMachine(std::string name, s4u::Host* physical_host, int core_amount, size_t ramsize) : Host(name), pimpl_vm_(new vm::VirtualMachineImpl(this, physical_host, core_amount, ramsize)) { + // xbt_assert(s4u::Host::by_name(name) == nullptr, + // "Cannot create a VM named %s: this name is already used by an host or a VM", name.c_str()); + XBT_DEBUG("Create VM %s", name.c_str()); /* Currently, a VM uses the network resource of its physical host */ @@ -194,9 +197,6 @@ sg_vm_t sg_vm_create_core(sg_host_t pm, const char* name) */ sg_vm_t sg_vm_create_multicore(sg_host_t pm, const char* name, int coreAmount) { - xbt_assert(sg_host_by_name(name) == nullptr, - "Cannot create a VM named %s: this name is already used by an host or a VM", name); - return new simgrid::s4u::VirtualMachine(name, pm, coreAmount); } diff --git a/src/xbt/config.cpp b/src/xbt/config.cpp index 4c3b69eba1..3d12053515 100644 --- a/src/xbt/config.cpp +++ b/src/xbt/config.cpp @@ -143,9 +143,8 @@ public: /* Callback */ xbt_cfg_cb_t old_callback = nullptr; - ConfigurationElement(const char* key, const char* desc) : key(key ? key : ""), desc(desc ? desc : "") {} - ConfigurationElement(const char* key, const char* desc, xbt_cfg_cb_t cb) - : key(key ? key : ""), desc(desc ? desc : ""), old_callback(cb) {} + ConfigurationElement(std::string key, std::string desc) : key(key), desc(desc) {} + ConfigurationElement(std::string key, std::string desc, xbt_cfg_cb_t cb) : key(key), desc(desc), old_callback(cb) {} virtual ~ConfigurationElement() = default; @@ -182,13 +181,13 @@ private: std::function callback; public: - TypedConfigurationElement(const char* key, const char* desc, T value = T()) - : ConfigurationElement(key, desc), content(std::move(value)) + TypedConfigurationElement(std::string key, std::string desc, T value = T()) + : ConfigurationElement(key, desc), content(std::move(value)) {} - TypedConfigurationElement(const char* key, const char* desc, T value, xbt_cfg_cb_t cb) + TypedConfigurationElement(std::string key, std::string desc, T value, xbt_cfg_cb_t cb) : ConfigurationElement(key, desc, cb), content(std::move(value)) {} - TypedConfigurationElement(const char* key, const char* desc, T value, std::function callback) + TypedConfigurationElement(std::string key, std::string desc, T value, std::function callback) : ConfigurationElement(key, desc), content(std::move(value)), callback(std::move(callback)) {} ~TypedConfigurationElement() = default; @@ -263,15 +262,16 @@ public: Config(Config const&) = delete; Config& operator=(Config const&) = delete; - ConfigurationElement& operator[](const char* name); - void alias(const char* realname, const char* aliasname); + ConfigurationElement& operator[](std::string name); + void alias(std::string realname, std::string aliasname); template - simgrid::config::TypedConfigurationElement* register_option(const char* name, A&&... a) + simgrid::config::TypedConfigurationElement* register_option(std::string name, A&&... a) { - xbt_assert(options.find(name) == options.end(), "Refusing to register the config element '%s' twice.", name); + xbt_assert(options.find(name) == options.end(), "Refusing to register the config element '%s' twice.", + name.c_str()); TypedConfigurationElement* variable = new TypedConfigurationElement(name, std::forward(a)...); - XBT_DEBUG("Register cfg elm %s (%s) of type %s @%p in set %p)", name, variable->get_description().c_str(), + XBT_DEBUG("Register cfg elm %s (%s) of type %s @%p in set %p)", name.c_str(), variable->get_description().c_str(), variable->get_type_name(), variable, this); options.insert({name, variable}); variable->update(); @@ -284,7 +284,7 @@ public: void help(); protected: - ConfigurationElement* get_dict_element(const char* name); + ConfigurationElement* get_dict_element(std::string name); }; Config::Config() @@ -298,7 +298,7 @@ Config::~Config() delete elm.second; } -inline ConfigurationElement* Config::get_dict_element(const char* name) +inline ConfigurationElement* Config::get_dict_element(std::string name) { auto opt = options.find(name); if (opt != options.end()) { @@ -308,24 +308,24 @@ inline ConfigurationElement* Config::get_dict_element(const char* name) if (als != aliases.end()) { ConfigurationElement* res = als->second; if (warn_for_aliases) - XBT_INFO("Option %s has been renamed to %s. Consider switching.", name, res->get_key().c_str()); + XBT_INFO("Option %s has been renamed to %s. Consider switching.", name.c_str(), res->get_key().c_str()); return res; } else { - THROWF(not_found_error, 0, "Bad config key: %s", name); + THROWF(not_found_error, 0, "Bad config key: %s", name.c_str()); } } } -inline ConfigurationElement& Config::operator[](const char* name) +inline ConfigurationElement& Config::operator[](std::string name) { return *(get_dict_element(name)); } -void Config::alias(const char* realname, const char* aliasname) +void Config::alias(std::string realname, std::string aliasname) { - xbt_assert(aliases.find(aliasname) == aliases.end(), "Alias '%s' already.", aliasname); + xbt_assert(aliases.find(aliasname) == aliases.end(), "Alias '%s' already.", aliasname.c_str()); ConfigurationElement* element = this->get_dict_element(realname); - xbt_assert(element, "Cannot define an alias to the non-existing option '%s'.", realname); + xbt_assert(element, "Cannot define an alias to the non-existing option '%s'.", realname.c_str()); this->aliases.insert({aliasname, element}); } @@ -435,15 +435,15 @@ void set_parse(std::string options) // ***** get_value ***** -template XBT_PUBLIC T const& get_value(const char* name) +template XBT_PUBLIC T const& get_value(std::string name) { return (*simgrid_config)[name].get_value(); } -template XBT_PUBLIC int const& get_value(const char* name); -template XBT_PUBLIC double const& get_value(const char* name); -template XBT_PUBLIC bool const& get_value(const char* name); -template XBT_PUBLIC std::string const& get_value(const char* name); +template XBT_PUBLIC int const& get_value(std::string name); +template XBT_PUBLIC double const& get_value(std::string name); +template XBT_PUBLIC bool const& get_value(std::string name); +template XBT_PUBLIC std::string const& get_value(std::string name); // ***** alias ***** @@ -456,20 +456,20 @@ void alias(const char* realname, std::initializer_list aliases) // ***** declare_flag ***** template -XBT_PUBLIC void declare_flag(const char* name, const char* description, T value, std::function callback) +XBT_PUBLIC void declare_flag(std::string name, std::string description, T value, std::function callback) { if (simgrid_config == nullptr) simgrid_config = new simgrid::config::Config(); simgrid_config->register_option(name, description, std::move(value), std::move(callback)); } -template XBT_PUBLIC void declare_flag(const char* name, const char* description, int value, +template XBT_PUBLIC void declare_flag(std::string name, std::string description, int value, std::function callback); -template XBT_PUBLIC void declare_flag(const char* name, const char* description, double value, +template XBT_PUBLIC void declare_flag(std::string name, std::string description, double value, std::function callback); -template XBT_PUBLIC void declare_flag(const char* name, const char* description, bool value, +template XBT_PUBLIC void declare_flag(std::string name, std::string description, bool value, std::function callback); -template XBT_PUBLIC void declare_flag(const char* name, const char* description, std::string value, +template XBT_PUBLIC void declare_flag(std::string name, std::string description, std::string value, std::function callback); void finalize() -- 2.20.1