X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/afb806d0615c22ac119575596b71691f4e2bc9d1..4740be30808ce9367af87084c8bf989883b1f2a0:/src/surf/surf_interface.cpp?ds=sidebyside diff --git a/src/surf/surf_interface.cpp b/src/surf/surf_interface.cpp index a69aac5714..a2624dd729 100644 --- a/src/surf/surf_interface.cpp +++ b/src/surf/surf_interface.cpp @@ -27,18 +27,17 @@ XBT_LOG_NEW_DEFAULT_SUBCATEGORY(surf_kernel, surf, * The callback functions of cpu_model and network_model will be called from * those of these host models. */ xbt_dynar_t all_existing_models = NULL; /* to destroy models correctly */ -xbt_dynar_t model_list_invoke = NULL; /* for invoking callbacks */ +xbt_dynar_t model_list_invoke = NULL; /* to invoke callbacks */ -tmgr_history_t history = NULL; -lmm_system_t maxmin_system = NULL; +simgrid::trace_mgr::future_evt_set *future_evt_set = nullptr; xbt_dynar_t surf_path = NULL; -xbt_dynar_t host_that_restart = NULL; +xbt_dynar_t host_that_restart = xbt_dynar_new(sizeof(char*), NULL); xbt_dict_t watched_hosts_lib; namespace simgrid { namespace surf { -simgrid::surf::signal surfExitCallbacks; +simgrid::xbt::signal surfExitCallbacks; } } @@ -131,7 +130,7 @@ s_surf_model_description_t surf_storage_model_description[] = { {NULL, NULL, NULL} /* this array must be NULL terminated */ }; -#ifdef CONTEXT_THREADS +#ifdef HAVE_THREAD_CONTEXTS static xbt_parmap_t surf_parmap = NULL; /* parallel map on models */ #endif @@ -279,18 +278,18 @@ static XBT_INLINE void surf_storage_free(void *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, - "FATAL ERROR: Your program was compiled with SimGrid version %d.%d.%d, " - "and then linked against SimGrid %d.%d.%d. Please fix this.\n", + "FATAL ERROR: Your program was compiled with SimGrid version %d.%d.%d, " + "and then linked against SimGrid %d.%d.%d. Please fix this.\n", SIMGRID_VERSION_MAJOR,SIMGRID_VERSION_MINOR,SIMGRID_VERSION_PATCH, - lib_version_major,lib_version_minor,lib_version_patch); + lib_version_major,lib_version_minor,lib_version_patch); abort(); } if (lib_version_patch != 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", + "Warning: Your program was compiled with SimGrid version %d.%d.%d, " + "and then linked against SimGrid %d.%d.%d. Proceeding anyway.\n", SIMGRID_VERSION_MAJOR,SIMGRID_VERSION_MINOR,SIMGRID_VERSION_PATCH, - lib_version_major,lib_version_minor,lib_version_patch); + lib_version_major,lib_version_minor,lib_version_patch); } } @@ -304,7 +303,9 @@ void surf_init(int *argc, char **argv) { XBT_DEBUG("Create all Libs"); host_list = xbt_dict_new_homogeneous([](void*p) { - delete static_cast(p); + simgrid::s4u::Host* host = static_cast(p); + simgrid::s4u::Host::onDestruction(*host); + delete host; }); as_router_lib = xbt_lib_new(); storage_lib = xbt_lib_new(); @@ -318,6 +319,7 @@ void surf_init(int *argc, char **argv) ROUTING_PROP_ASR_LEVEL = xbt_lib_add_level(as_router_lib,routing_asr_prop_free); XBT_DEBUG("Add SURF levels"); + simgrid::surf::Host::classInit(); SURF_STORAGE_LEVEL = xbt_lib_add_level(storage_lib,surf_storage_free); xbt_init(argc, argv); @@ -325,8 +327,8 @@ void surf_init(int *argc, char **argv) all_existing_models = xbt_dynar_new(sizeof(simgrid::surf::Model*), NULL); if (!model_list_invoke) model_list_invoke = xbt_dynar_new(sizeof(simgrid::surf::Model*), NULL); - if (!history) - history = tmgr_history_new(); + if (!future_evt_set) + future_evt_set = new simgrid::trace_mgr::future_evt_set(); TRACE_add_start_function(TRACE_surf_alloc); TRACE_add_end_function(TRACE_surf_release); @@ -366,22 +368,17 @@ void surf_exit(void) simgrid::surf::surfExitCallbacks(); - if (maxmin_system) { - lmm_system_free(maxmin_system); - maxmin_system = NULL; - } - if (history) { - tmgr_history_free(history); - history = NULL; + if (future_evt_set) { + delete future_evt_set; + future_evt_set = nullptr; } -#ifdef CONTEXT_THREADS +#ifdef HAVE_THREAD_CONTEXTS xbt_parmap_destroy(surf_parmap); #endif tmgr_finalize(); - surf_parse_lex_destroy(); - surf_parse_free_callbacks(); + sg_platf_exit(); NOW = 0; /* Just in case the user plans to restart the simulation afterward */ } @@ -414,18 +411,18 @@ Model::~Model(){ delete p_doneActionSet; } -double Model::shareResources(double now) +double Model::next_occuring_event(double now) { //FIXME: set the good function once and for all if (p_updateMechanism == UM_LAZY) - return shareResourcesLazy(now); + return next_occuring_event_lazy(now); else if (p_updateMechanism == UM_FULL) - return shareResourcesFull(now); + return next_occuring_event_full(now); else xbt_die("Invalid cpu update mechanism!"); } -double Model::shareResourcesLazy(double now) +double Model::next_occuring_event_lazy(double now) { Action *action = NULL; double min = -1; @@ -502,7 +499,7 @@ double Model::shareResourcesLazy(double now) return min; } -double Model::shareResourcesFull(double /*now*/) { +double Model::next_occuring_event_full(double /*now*/) { THROW_UNIMPLEMENTED; } @@ -539,7 +536,7 @@ double Model::shareResourcesMaxMin(ActionList *running_actions, for (++it; it != itend; ++it) { - action = &*it; + action = &*it; value = lmm_variable_getvalue(action->getVariable()); if (value > 0) { if (action->getRemains() > 0) @@ -564,11 +561,11 @@ double Model::shareResourcesMaxMin(ActionList *running_actions, void Model::updateActionsState(double now, double delta) { if (p_updateMechanism == UM_FULL) - updateActionsStateFull(now, delta); + updateActionsStateFull(now, delta); else if (p_updateMechanism == UM_LAZY) - updateActionsStateLazy(now, delta); + updateActionsStateLazy(now, delta); else - xbt_die("Invalid cpu update mechanism!"); + xbt_die("Invalid cpu update mechanism!"); } void Model::updateActionsStateLazy(double /*now*/, double /*delta*/) @@ -803,7 +800,7 @@ void Action::setPriority(double priority) lmm_update_variable_weight(getModel()->getMaxminSystem(), getVariable(), priority); if (getModel()->getUpdateMechanism() == UM_LAZY) - heapRemove(getModel()->getActionHeap()); + heapRemove(getModel()->getActionHeap()); XBT_OUT(); }