/* model_list_invoke contains only surf_host and surf_vm.
* The callback functions of cpu_model and network_model will be called from those of these host models. */
-xbt_dynar_t all_existing_models = nullptr; /* to destroy models correctly */
+std::vector<surf_model_t> * all_existing_models = nullptr; /* to destroy models correctly */
xbt_dynar_t model_list_invoke = nullptr; /* to invoke callbacks */
simgrid::trace_mgr::future_evt_set *future_evt_set = nullptr;
double NOW = 0;
-double surf_get_clock(void)
+double surf_get_clock()
{
return NOW;
}
* directory on Unix/Linux platforms.
*/
-const char *__surf_get_initial_path(void)
+const char *__surf_get_initial_path()
{
#ifdef _WIN32
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",
xbt_init(argc, argv);
if (!all_existing_models)
- all_existing_models = xbt_dynar_new(sizeof(simgrid::surf::Model*), nullptr);
+ all_existing_models = new std::vector<simgrid::surf::Model*>();
if (!model_list_invoke)
model_list_invoke = xbt_dynar_new(sizeof(simgrid::surf::Model*), nullptr);
if (!future_evt_set)
MC_memory_init();
}
-void surf_exit(void)
+void surf_exit()
{
- unsigned int iter;
- simgrid::surf::Model *model = nullptr;
-
- TRACE_end(); /* Just in case it was not called by the upper
- * layer (or there is no upper layer) */
+ TRACE_end(); /* Just in case it was not called by the upper layer (or there is no upper layer) */
sg_config_finalize();
xbt_lib_free(&file_lib);
xbt_dict_free(&watched_hosts_lib);
- xbt_dynar_foreach(all_existing_models, iter, model)
+ for (auto model : *all_existing_models)
delete model;
- xbt_dynar_free(&all_existing_models);
+ delete all_existing_models;
xbt_dynar_free(&model_list_invoke);
routing_exit();