X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/b04ec34987223102af0771562fb0876994420ea0..d50a590cfb08f9f45bab9fd355eed8dbdcf765ea:/src/surf/surf_interface.cpp diff --git a/src/surf/surf_interface.cpp b/src/surf/surf_interface.cpp index d2f6966f03..21b718bcd8 100644 --- a/src/surf/surf_interface.cpp +++ b/src/surf/surf_interface.cpp @@ -36,29 +36,23 @@ std::vector surf_path; std::set watched_hosts; extern std::map storage_types; -s_surf_model_description_t* surf_plugin_description = nullptr; +std::vector* surf_plugin_description = nullptr; + static void XBT_ATTRIB_DESTRUCTOR(800) simgrid_free_plugin_description() { - xbt_free(surf_plugin_description); + delete surf_plugin_description; + surf_plugin_description = nullptr; } XBT_PUBLIC void simgrid_add_plugin_description(const char* name, const char* description, void_f_void_t init_fun) { - static int plugin_amount = 0; - - /* no need to check for plugin name conflict: the compiler already ensures that the generated - * simgrid_##id##_plugin_register() is unique */ - - plugin_amount++; - surf_plugin_description = static_cast( - xbt_realloc(surf_plugin_description, sizeof(s_surf_model_description_t) * (plugin_amount + 2))); - - surf_plugin_description[plugin_amount - 1] = {name, description, init_fun}; - surf_plugin_description[plugin_amount] = {nullptr, nullptr, nullptr}; // this array must be null terminated + if (not surf_plugin_description) + surf_plugin_description = new std::vector; + surf_plugin_description->emplace_back(surf_model_description_t{name, description, init_fun}); } /* Don't forget to update the option description in smx_config when you change this */ -s_surf_model_description_t surf_network_model_description[] = { +const std::vector surf_network_model_description = { {"LV08", "Realistic network analytic model (slow-start modeled by multiplying latency by 13.01, bandwidth by .97; " "bottleneck sharing uses a payload of S=20537 for evaluating RTT). ", &surf_network_model_init_LegrandVelho}, @@ -83,7 +77,6 @@ s_surf_model_description_t surf_network_model_description[] = { {"Vegas", "Model from Steven H. Low using lagrange_solve instead of lmm_solve (experts only; check the code for more info).", &surf_network_model_init_Vegas}, - {nullptr, nullptr, nullptr} /* this array must be nullptr terminated */ }; #if ! HAVE_SMPI @@ -100,28 +93,29 @@ void surf_network_model_init_NS3() { } #endif -s_surf_model_description_t surf_cpu_model_description[] = { - {"Cas01", "Simplistic CPU model (time=size/power).", &surf_cpu_model_init_Cas01}, - {nullptr, nullptr, nullptr} /* this array must be nullptr terminated */ +const std::vector surf_cpu_model_description = { + {"Cas01", "Simplistic CPU model (time=size/power).", &surf_cpu_model_init_Cas01}, }; -s_surf_model_description_t surf_host_model_description[] = { - {"default", "Default host model. Currently, CPU:Cas01 and network:LV08 (with cross traffic enabled)", &surf_host_model_init_current_default}, - {"compound", "Host model that is automatically chosen if you change the network and CPU models", &surf_host_model_init_compound}, - {"ptask_L07", "Host model somehow similar to Cas01+CM02 but allowing parallel tasks", &surf_host_model_init_ptask_L07}, - {nullptr, nullptr, nullptr} /* this array must be nullptr terminated */ +const std::vector surf_host_model_description = { + {"default", "Default host model. Currently, CPU:Cas01 and network:LV08 (with cross traffic enabled)", + &surf_host_model_init_current_default}, + {"compound", "Host model that is automatically chosen if you change the network and CPU models", + &surf_host_model_init_compound}, + {"ptask_L07", "Host model somehow similar to Cas01+CM02 but allowing parallel tasks", + &surf_host_model_init_ptask_L07}, }; -s_surf_model_description_t surf_optimization_mode_description[] = { - {"Lazy", "Lazy action management (partial invalidation in lmm + heap in action remaining).", nullptr}, - {"TI", "Trace integration. Highly optimized mode when using availability traces (only available for the Cas01 CPU model for now).", nullptr}, - {"Full", "Full update of remaining and variables. Slow but may be useful when debugging.", nullptr}, - {nullptr, nullptr, nullptr} /* this array must be nullptr terminated */ +const std::vector surf_optimization_mode_description = { + {"Lazy", "Lazy action management (partial invalidation in lmm + heap in action remaining).", nullptr}, + {"TI", "Trace integration. Highly optimized mode when using availability traces (only available for the Cas01 CPU " + "model for now).", + nullptr}, + {"Full", "Full update of remaining and variables. Slow but may be useful when debugging.", nullptr}, }; -s_surf_model_description_t surf_storage_model_description[] = { - {"default", "Simplistic storage model.", &surf_storage_model_init_default}, - {nullptr, nullptr, nullptr} /* this array must be nullptr terminated */ +const std::vector surf_storage_model_description = { + {"default", "Simplistic storage model.", &surf_storage_model_init_default}, }; double NOW = 0; @@ -190,25 +184,29 @@ FILE* surf_fopen(const std::string& name, const char* mode) } /** Displays the long description of all registered models, and quit */ -void model_help(const char *category, s_surf_model_description_t * table) +void model_help(const char* category, const std::vector& table) { printf("Long description of the %s models accepted by this simulator:\n", category); - for (int i = 0; table[i].name; i++) - printf(" %s: %s\n", table[i].name, table[i].description); + for (auto const& item : table) + printf(" %s: %s\n", item.name, item.description); } -int find_model_description(s_surf_model_description_t* table, const std::string& name) +int find_model_description(const std::vector& table, const std::string& name) { - for (int i = 0; table[i].name; i++) - if (name == table[i].name) - return i; + auto pos = std::find_if(table.begin(), table.end(), + [&name](const surf_model_description_t& item) { return item.name == name; }); + if (pos != table.end()) + return std::distance(table.begin(), pos); - if (not table[0].name) + if (table.empty()) xbt_die("No model is valid! This is a bug."); - std::string name_list = std::string(table[0].name); - for (int i = 1; table[i].name; i++) - name_list = name_list + ", " + table[i].name; + std::string sep; + std::string name_list; + for (auto const& item : table) { + name_list += sep + item.name; + sep = ", "; + } xbt_die("Model '%s' is invalid! Valid models are: %s.", name.c_str(), name_list.c_str()); return -1;