X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/74ddd092a29a7f29f0c90d503ec2a3b1c5dc984c..e3361464769385862476e0154a92370db824a607:/src/surf/surf_interface.cpp diff --git a/src/surf/surf_interface.cpp b/src/surf/surf_interface.cpp index 7ef46e5423..4bbbdfbb6f 100644 --- a/src/surf/surf_interface.cpp +++ b/src/surf/surf_interface.cpp @@ -32,8 +32,7 @@ extern std::map storage_types; namespace simgrid { namespace surf { -simgrid::xbt::signal surfExitCallbacks; - +simgrid::xbt::signal surfExitCallbacks; } } @@ -137,7 +136,7 @@ std::ifstream* surf_ifsopen(const char* name) std::string buff = path_elm + FILE_DELIM + name; fs->open(buff.c_str(), std::ifstream::in); - if (!fs->fail()) { + if (not fs->fail()) { XBT_DEBUG("Found file at %s", buff.c_str()); return fs; } @@ -147,7 +146,6 @@ std::ifstream* surf_ifsopen(const char* name) } FILE *surf_fopen(const char *name, const char *mode) { - char *buff; FILE *file = nullptr; xbt_assert(name); @@ -157,7 +155,7 @@ FILE *surf_fopen(const char *name, const char *mode) /* search relative files in the path */ for (auto path_elm : surf_path) { - buff = bprintf("%s" FILE_DELIM "%s", path_elm.c_str(), name); + char* buff = bprintf("%s" FILE_DELIM "%s", path_elm.c_str(), name); file = fopen(buff, mode); free(buff); @@ -192,7 +190,7 @@ const char *__surf_get_initial_path() unsigned int len = GetCurrentDirectory(MAX_PATH + 1, current_directory); char root[4] = { 0 }; - if (!len) + if (not len) return nullptr; strncpy(root, current_directory, 3); @@ -243,10 +241,10 @@ int find_model_description(s_surf_model_description_t * table, char *name_list = nullptr; for (i = 0; table[i].name; i++) - if (!strcmp(name, table[i].name)) { + if (not strcmp(name, table[i].name)) { return i; } - if (!table[0].name) + if (not table[0].name) xbt_die("No model is valid! This is a bug."); name_list = xbt_strdup(table[0].name); for (i = 1; table[i].name; i++) { @@ -258,36 +256,31 @@ int find_model_description(s_surf_model_description_t * table, return -1; } -static inline void surf_storage_free(void *r) +void sg_version_check(int lib_version_major, int lib_version_minor, int lib_version_patch) { - delete static_cast(r); -} - -void sg_version_check(int lib_version_major,int lib_version_minor,int lib_version_patch) { - if ((lib_version_major != SIMGRID_VERSION_MAJOR) || (lib_version_minor != SIMGRID_VERSION_MINOR)) { - fprintf(stderr, + if ((lib_version_major != SIMGRID_VERSION_MAJOR) || (lib_version_minor != SIMGRID_VERSION_MINOR)) { + fprintf(stderr, "FATAL ERROR: Your program was compiled with SimGrid version %d.%d.%d, " + "and then linked against SimGrid %d.%d.%d. Please fix this.\n", + lib_version_major, lib_version_minor, lib_version_patch, SIMGRID_VERSION_MAJOR, SIMGRID_VERSION_MINOR, + SIMGRID_VERSION_PATCH); + abort(); + } + if (lib_version_patch != SIMGRID_VERSION_PATCH) { + if (SIMGRID_VERSION_PATCH >= 90 || lib_version_patch >= 90) { + fprintf( + stderr, "FATAL ERROR: Your program was compiled with SimGrid version %d.%d.%d, " - "and then linked against SimGrid %d.%d.%d. Please fix this.\n", - lib_version_major,lib_version_minor,lib_version_patch, - SIMGRID_VERSION_MAJOR,SIMGRID_VERSION_MINOR,SIMGRID_VERSION_PATCH); + "and then linked against SimGrid %d.%d.%d. \n" + "One of them is a development version, and should not be mixed with the stable release. Please fix this.\n", + lib_version_major, lib_version_minor, lib_version_patch, SIMGRID_VERSION_MAJOR, SIMGRID_VERSION_MINOR, + SIMGRID_VERSION_PATCH); abort(); } - if (lib_version_patch != SIMGRID_VERSION_PATCH) { - if(SIMGRID_VERSION_PATCH >= 90 || lib_version_patch >=90){ - fprintf(stderr, - "FATAL ERROR: Your program was compiled with SimGrid version %d.%d.%d, " - "and then linked against SimGrid %d.%d.%d. \n" - "One of them is a development version, and should not be mixed with the stable release. Please fix this.\n", - lib_version_major,lib_version_minor,lib_version_patch, - SIMGRID_VERSION_MAJOR,SIMGRID_VERSION_MINOR,SIMGRID_VERSION_PATCH); - abort(); - } - fprintf(stderr, - "Warning: Your program was compiled with SimGrid version %d.%d.%d, " - "and then linked against SimGrid %d.%d.%d. Proceeding anyway.\n", - lib_version_major,lib_version_minor,lib_version_patch, - SIMGRID_VERSION_MAJOR,SIMGRID_VERSION_MINOR,SIMGRID_VERSION_PATCH); - } + fprintf(stderr, "Warning: Your program was compiled with SimGrid version %d.%d.%d, " + "and then linked against SimGrid %d.%d.%d. Proceeding anyway.\n", + lib_version_major, lib_version_minor, lib_version_patch, SIMGRID_VERSION_MAJOR, SIMGRID_VERSION_MINOR, + SIMGRID_VERSION_PATCH); + } } void sg_version_get(int* ver_major, int* ver_minor, int* ver_patch) @@ -347,16 +340,12 @@ void surf_init(int *argc, char **argv) XBT_DEBUG("Create all Libs"); USER_HOST_LEVEL = simgrid::s4u::Host::extension_create(nullptr); - storage_lib = xbt_lib_new(); watched_hosts_lib = xbt_dict_new_homogeneous(nullptr); - XBT_DEBUG("Add SURF levels"); - SURF_STORAGE_LEVEL = xbt_lib_add_level(storage_lib,surf_storage_free); - xbt_init(argc, argv); - if (!all_existing_models) + if (not all_existing_models) all_existing_models = new std::vector(); - if (!future_evt_set) + if (not future_evt_set) future_evt_set = new simgrid::trace_mgr::future_evt_set(); TRACE_surf_alloc(); @@ -373,7 +362,6 @@ void surf_exit() TRACE_end(); /* Just in case it was not called by the upper layer (or there is no upper layer) */ sg_host_exit(); - xbt_lib_free(&storage_lib); sg_link_exit(); xbt_dict_free(&watched_hosts_lib); for (auto e : storage_types) { @@ -381,11 +369,13 @@ void surf_exit() free(stype->model); free(stype->type_id); free(stype->content); - free(stype->content_type); xbt_dict_free(&(stype->properties)); delete stype->model_properties; free(stype); } + for (auto s : *simgrid::surf::StorageImpl::storages) + delete s.second; + delete simgrid::surf::StorageImpl::storages; for (auto model : *all_existing_models) delete model; @@ -454,7 +444,7 @@ double Model::nextOccuringEventLazy(double now) lmm_solve(maxminSystem_); XBT_DEBUG("After share resources, The size of modified actions set is %zd", modifiedSet_->size()); - while(!modifiedSet_->empty()) { + while (not modifiedSet_->empty()) { Action *action = &(modifiedSet_->front()); modifiedSet_->pop_front(); bool max_dur_flag = false; @@ -579,7 +569,7 @@ bool Resource::isOn() const { return isOn_; } bool Resource::isOff() const { - return ! isOn_; + return not isOn_; } void Resource::turnOn() @@ -767,7 +757,7 @@ void Action::cancel(){ int Action::unref(){ refcount_--; - if (!refcount_) { + if (not refcount_) { if (action_hook.is_linked()) stateSet_->erase(stateSet_->iterator_to(*this)); if (getVariable())