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. */
}
/* returns whether #file_path is a absolute file path. Surprising, isn't it ? */
-static bool is_absolute_file_path(const char* file_path)
+static bool is_absolute_file_path(std::string file_path)
{
#ifdef _WIN32
WIN32_FIND_DATA wfd = {0};
- HANDLE hFile = FindFirstFile(file_path, &wfd);
+ HANDLE hFile = FindFirstFile(file_path.c_str(), &wfd);
if (INVALID_HANDLE_VALUE == hFile)
return false;
FindClose(hFile);
return true;
#else
- return (file_path[0] == '/');
+ return (file_path.c_str()[0] == '/');
#endif
}
xbt_assert(not name.empty());
std::ifstream* fs = new std::ifstream();
- if (is_absolute_file_path(name.c_str())) { /* don't mess with absolute file names */
+ if (is_absolute_file_path(name)) { /* don't mess with absolute file names */
fs->open(name.c_str(), std::ifstream::in);
}
return fs;
}
-FILE *surf_fopen(const char *name, const char *mode)
+FILE* surf_fopen(std::string name, const char* mode)
{
FILE *file = nullptr;
- xbt_assert(name);
-
if (is_absolute_file_path(name)) /* don't mess with absolute file names */
- return fopen(name, mode);
+ return fopen(name.c_str(), mode);
/* search relative files in the path */
for (auto const& path_elm : surf_path) {
USER_HOST_LEVEL = simgrid::s4u::Host::extension_create(nullptr);
xbt_init(argc, argv);
- if (not future_evt_set)
- future_evt_set = new simgrid::trace_mgr::future_evt_set();
sg_config_init(argc, argv);
xbt_free(surf_plugin_description);
- delete future_evt_set;
- future_evt_set = nullptr;
-
tmgr_finalize();
sg_platf_exit();