#include "src/simix/smx_host_private.h"
#include "src/surf/HostImpl.hpp"
#include "surf_private.h"
+#include <fstream>
#include <vector>
XBT_LOG_NEW_CATEGORY(surf, "All SURF categories");
std::vector<surf_model_t> * all_existing_models = nullptr; /* to destroy models correctly */
simgrid::trace_mgr::future_evt_set *future_evt_set = nullptr;
-xbt_dynar_t surf_path = nullptr;
+std::vector<std::string> surf_path;
std::vector<simgrid::s4u::Host*> host_that_restart;
xbt_dict_t watched_hosts_lib;
}
#include <simgrid/plugins/energy.h> // FIXME: this plugin should not be linked to the core
+#include <simgrid/plugins/load.h> // FIXME: this plugin should not be linked to the core
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 */
};
# define FILE_DELIM "/" /* FIXME: move to better location */
#endif
+std::ifstream* surf_ifsopen(const char* name)
+{
+ std::ifstream* fs = new std::ifstream();
+ xbt_assert(name);
+ if (__surf_is_absolute_file_path(name)) { /* don't mess with absolute file names */
+ fs->open(name, std::ifstream::in);
+ }
+ /* search relative files in the path */
+ for (auto path_elm : surf_path) {
+ std::string buff = path_elm + FILE_DELIM + name;
+ fs->open(buff.c_str(), std::ifstream::in);
+
+ if (!fs->fail()) {
+ XBT_DEBUG("Found file at %s", buff.c_str());
+ return fs;
+ }
+ }
+
+ return fs;
+}
FILE *surf_fopen(const char *name, const char *mode)
{
- unsigned int cpt;
- char *path_elm = nullptr;
char *buff;
FILE *file = nullptr;
return fopen(name, mode);
/* search relative files in the path */
- xbt_dynar_foreach(surf_path, cpt, path_elm) {
- buff = bprintf("%s" FILE_DELIM "%s", path_elm, name);
+ for (auto path_elm : surf_path) {
+ buff = bprintf("%s" FILE_DELIM "%s", path_elm.c_str(), name);
file = fopen(buff, mode);
free(buff);
{
TRACE_end(); /* Just in case it was not called by the upper layer (or there is no upper layer) */
- xbt_dynar_free(&surf_path);
-
sg_host_exit();
xbt_lib_free(&storage_lib);
sg_link_exit();