#include "surf_interface.hpp"
#include "mc/mc.h"
-#include "simgrid/kernel/routing/NetPoint.hpp"
#include "simgrid/s4u/Engine.hpp"
-#include "simgrid/sg_config.h"
-#include "src/instr/instr_private.hpp" // TRACE_is_enabled(). FIXME: remove by subscribing tracing to the surf signals
-#include "src/kernel/lmm/maxmin.hpp" // Constraint
+#include "simgrid/sg_config.hpp"
+#include "src/internal_config.h"
#include "src/surf/HostImpl.hpp"
-#include "xbt/utility.hpp"
+#include "src/surf/xml/platf.hpp"
+#include "surf/surf.hpp"
+#include "xbt/module.h"
#include <fstream>
-#include <set>
#include <string>
-#include <vector>
#ifdef _WIN32
#include <windows.h>
* Utils *
*********/
-std::vector<simgrid::kernel::resource::Model*>* all_existing_models = nullptr; /* to destroy models correctly */
+std::vector<simgrid::kernel::resource::Model*> all_existing_models; /* to destroy models correctly */
-simgrid::trace_mgr::future_evt_set *future_evt_set = nullptr;
+simgrid::trace_mgr::future_evt_set future_evt_set;
std::vector<std::string> surf_path;
std::vector<simgrid::s4u::Host*> host_that_restart;
/** set of hosts for which one want to be notified if they ever restart. */
std::set<std::string> watched_hosts;
extern std::map<std::string, simgrid::surf::StorageType*> storage_types;
-namespace simgrid {
-namespace surf {
+s_surf_model_description_t* 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;
-simgrid::xbt::signal<void()> surfExitCallbacks;
-}
-}
+ /* no need to check for plugin name conflict: the compiler already ensures that the generated
+ * simgrid_##id##_plugin_register() is unique */
-#include <simgrid/plugins/energy.h> // FIXME: this plug-in should not be linked to the core
-#include <simgrid/plugins/load.h> // FIXME: this plug-in should not be linked to the core
+ plugin_amount++;
+ surf_plugin_description = static_cast<s_surf_model_description_t*>(
+ xbt_realloc(surf_plugin_description, sizeof(s_surf_model_description_t) * (plugin_amount + 2)));
-s_surf_model_description_t surf_plugin_description[] = {
- {"Energy", "Cpu energy consumption.", &sg_host_energy_plugin_init},
- {"Load", "Cpu load.", &sg_host_load_plugin_init},
- {nullptr, nullptr, nullptr} /* this array must be nullptr terminated */
-};
+ surf_plugin_description[plugin_amount - 1] = {name, description, init_fun};
+ surf_plugin_description[plugin_amount] = {nullptr, nullptr, nullptr}; // this array must be null terminated
+}
/* Don't forget to update the option description in smx_config when you change this */
s_surf_model_description_t surf_network_model_description[] = {
return NOW;
}
+/* returns whether #file_path is a absolute file path. Surprising, isn't it ? */
+static bool is_absolute_file_path(const char* file_path)
+{
#ifdef _WIN32
-# define FILE_DELIM "\\"
+ WIN32_FIND_DATA wfd = {0};
+ HANDLE hFile = FindFirstFile(file_path, &wfd);
+
+ if (INVALID_HANDLE_VALUE == hFile)
+ return false;
+
+ FindClose(hFile);
+ return true;
#else
-# define FILE_DELIM "/" /* FIXME: move to better location */
+ return (file_path[0] == '/');
#endif
+}
std::ifstream* surf_ifsopen(std::string name)
{
- std::ifstream* fs = new std::ifstream();
xbt_assert(not name.empty());
- if (__surf_is_absolute_file_path(name.c_str())) { /* don't mess with absolute file names */
+
+ std::ifstream* fs = new std::ifstream();
+ if (is_absolute_file_path(name.c_str())) { /* don't mess with absolute file names */
fs->open(name.c_str(), std::ifstream::in);
}
/* search relative files in the path */
for (auto const& path_elm : surf_path) {
- std::string buff = path_elm + FILE_DELIM + name;
+ std::string buff = path_elm + "/" + name;
fs->open(buff.c_str(), std::ifstream::in);
if (not fs->fail()) {
xbt_assert(name);
- if (__surf_is_absolute_file_path(name)) /* don't mess with absolute file names */
+ if (is_absolute_file_path(name)) /* don't mess with absolute file names */
return fopen(name, mode);
/* search relative files in the path */
for (auto const& path_elm : surf_path) {
- std::string buff = path_elm + FILE_DELIM + name;
+ std::string buff = path_elm + "/" + name;
file = fopen(buff.c_str(), mode);
if (file)
return nullptr;
}
-/* The __surf_is_absolute_file_path() returns 1 if
- * file_path is a absolute file path, in the other
- * case the function returns 0.
- */
-int __surf_is_absolute_file_path(const char *file_path)
-{
-#ifdef _WIN32
- WIN32_FIND_DATA wfd = { 0 };
- HANDLE hFile = FindFirstFile(file_path, &wfd);
-
- if (INVALID_HANDLE_VALUE == hFile)
- return 0;
-
- FindClose(hFile);
- return 1;
-#else
- return (file_path[0] == '/');
-#endif
-}
-
/** Displays the long description of all registered models, and quit */
void model_help(const char *category, s_surf_model_description_t * table)
{
USER_HOST_LEVEL = simgrid::s4u::Host::extension_create(nullptr);
xbt_init(argc, argv);
- if (not all_existing_models)
- all_existing_models = new std::vector<simgrid::kernel::resource::Model*>();
- if (not future_evt_set)
- future_evt_set = new simgrid::trace_mgr::future_evt_set();
sg_config_init(argc, argv);
void surf_exit()
{
- TRACE_end(); /* Just in case it was not called by the upper layer (or there is no upper layer) */
-
simgrid::s4u::Engine::shutdown();
- sg_link_exit();
for (auto const& e : storage_types) {
simgrid::surf::StorageType* stype = e.second;
delete stype->properties;
delete stype;
}
- for (auto const& model : *all_existing_models)
+ for (auto const& model : all_existing_models)
delete model;
- delete all_existing_models;
-
- if (future_evt_set) {
- delete future_evt_set;
- future_evt_set = nullptr;
- }
+ xbt_free(surf_plugin_description);
tmgr_finalize();
sg_platf_exit();
