#include "src/kernel/resource/profile/Profile.hpp"
#include "src/surf/HostImpl.hpp"
#include "src/surf/xml/platf.hpp"
-#include "src/xbt_modinter.h" /* whether initialization was already done */
#include "surf/surf.hpp"
#include "xbt/module.h"
+#include "xbt/xbt_modinter.h" /* whether initialization was already done */
#include <fstream>
#include <string>
* Utils *
*********/
-std::vector<simgrid::kernel::resource::Model*> all_existing_models; /* to destroy models correctly */
-
simgrid::kernel::profile::FutureEvtSet future_evt_set;
std::vector<std::string> surf_path;
-/** set of hosts for which one want to be notified if they ever restart */
-std::set<std::string, std::less<>>& watched_hosts() // avoid static initialization order fiasco
-{
- static std::set<std::string, std::less<>> value;
- return value;
-}
-
-extern std::map<std::string, simgrid::kernel::resource::StorageType*, std::less<>> storage_types;
-
-std::vector<surf_model_description_t>* surf_plugin_description = nullptr;
-
-static void XBT_ATTRIB_DESTRUCTOR(800) simgrid_free_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)
-{
- if (not surf_plugin_description)
- surf_plugin_description = new std::vector<surf_model_description_t>();
- 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 */
const std::vector<surf_model_description_t> surf_network_model_description = {
{"LV08",
&surf_network_model_init_NS3},
};
-#if ! HAVE_SMPI
-void surf_network_model_init_SMPI() {
+#if !HAVE_SMPI
+void surf_network_model_init_SMPI()
+{
xbt_die("Please activate SMPI support in cmake to use the SMPI network model.");
}
-void surf_network_model_init_IB() {
+void surf_network_model_init_IB()
+{
xbt_die("Please activate SMPI support in cmake to use the IB network model.");
}
#endif
#if !SIMGRID_HAVE_NS3
-void surf_network_model_init_NS3() {
+void surf_network_model_init_NS3()
+{
xbt_die("Please activate ns-3 support in cmake and install the dependencies to use the NS3 network model.");
}
#endif
const std::vector<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).",
+ {"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},
};
{"default", "Simplistic disk model.", &surf_disk_model_init_default},
};
-const std::vector<surf_model_description_t> surf_storage_model_description = {
- {"default", "Simplistic storage model.", &surf_storage_model_init_default},
-};
-
double NOW = 0;
double surf_get_clock()
FILE* surf_fopen(const std::string& name, const char* mode)
{
- FILE *file = nullptr;
+ FILE* file = nullptr;
if (is_absolute_file_path(name)) /* don't mess with absolute file names */
return fopen(name.c_str(), mode);
XBT_HELP(" %s: %s", item.name, item.description);
}
-int find_model_description(const std::vector<surf_model_description_t>& table, const std::string& name)
+const surf_model_description_t* find_model_description(const std::vector<surf_model_description_t>& table,
+ const std::string& name)
{
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 static_cast<int>(std::distance(table.begin(), pos));
-
- if (table.empty())
- xbt_die("No model is valid! This is a bug.");
+ return &*pos;
std::string sep;
std::string name_list;
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;
}
-
-void surf_init(int *argc, char **argv)
+void surf_init(int* argc, char** argv)
{
if (xbt_initialized > 0)
return;
sg_config_init(argc, 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;
-
- tmgr_finalize();
- sg_platf_exit();
-
- NOW = 0; /* Just in case the user plans to restart the simulation afterward */
-}
