#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 "simgrid/sg_config.hpp"
#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 "src/kernel/routing/NetPoint.hpp"
#include "src/surf/HostImpl.hpp"
+#include "src/surf/xml/platf.hpp"
#include "xbt/utility.hpp"
#include <fstream>
* Utils *
*********/
-std::vector<surf_model_t> * all_existing_models = nullptr; /* to destroy models correctly */
+std::vector<simgrid::kernel::resource::Model*>* all_existing_models = nullptr; /* to destroy models correctly */
simgrid::trace_mgr::future_evt_set *future_evt_set = nullptr;
std::vector<std::string> surf_path;
return NOW;
}
-#ifdef _WIN32
-# define FILE_DELIM "\\"
-#else
-# define FILE_DELIM "/" /* FIXME: move to better location */
-#endif
-
std::ifstream* surf_ifsopen(std::string name)
{
std::ifstream* fs = new std::ifstream();
/* 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()) {
/* 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)
xbt_init(argc, argv);
if (not all_existing_models)
- all_existing_models = new std::vector<simgrid::surf::Model*>();
+ 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();
delete stype->model_properties;
delete stype;
}
- for (auto const& s : *simgrid::surf::StorageImpl::storagesMap())
- delete s.second;
- delete simgrid::surf::StorageImpl::storagesMap();
for (auto const& model : *all_existing_models)
delete model;