X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/7f4f03348bd07609e258eb3b545bdafc2c881847..8d777265e12b0b9c5f13fecfc719474cdd214e9e:/src/surf/surf_interface.cpp diff --git a/src/surf/surf_interface.cpp b/src/surf/surf_interface.cpp index adf270b04d..a6a183127a 100644 --- a/src/surf/surf_interface.cpp +++ b/src/surf/surf_interface.cpp @@ -27,10 +27,9 @@ 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; +sg_future_evt_set_t future_evt_set = nullptr; xbt_dynar_t surf_path = NULL; xbt_dynar_t host_that_restart = NULL; xbt_dict_t watched_hosts_lib; @@ -38,11 +37,13 @@ xbt_dict_t watched_hosts_lib; namespace simgrid { namespace surf { -surf_callback(void, void) surfExitCallbacks; +simgrid::xbt::signal surfExitCallbacks; } } +#include // FIXME: this plugin should not be linked to the core + s_surf_model_description_t surf_plugin_description[] = { {"Energy", "Cpu energy consumption.", sg_energy_plugin_init}, {NULL, NULL, NULL} /* this array must be NULL terminated */ @@ -269,11 +270,6 @@ static XBT_INLINE void routing_asr_prop_free(void *p) //xbt_dict_free(&elm); FIXME: leaking in some case? That's a sometimes double-free with AsCluster::~AsCluster } -static XBT_INLINE void surf_host_free(void *r) -{ - delete static_cast(r); -} - static XBT_INLINE void surf_storage_free(void *r) { delete static_cast(r); @@ -306,7 +302,11 @@ void sg_version(int *ver_major,int *ver_minor,int *ver_patch) { void surf_init(int *argc, char **argv) { XBT_DEBUG("Create all Libs"); - host_lib = xbt_lib_new(); + host_list = xbt_dict_new_homogeneous([](void*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(); storage_type_lib = xbt_lib_new(); @@ -319,7 +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"); - SURF_HOST_LEVEL = xbt_lib_add_level(host_lib,surf_host_free); + simgrid::surf::Host::classInit(); SURF_STORAGE_LEVEL = xbt_lib_add_level(storage_lib,surf_storage_free); xbt_init(argc, argv); @@ -327,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); @@ -352,7 +352,7 @@ void surf_exit(void) xbt_dynar_free(&host_that_restart); xbt_dynar_free(&surf_path); - xbt_lib_free(&host_lib); + xbt_dict_free(&host_list); xbt_lib_free(&as_router_lib); xbt_lib_free(&storage_lib); sg_link_exit(); @@ -366,15 +366,11 @@ void surf_exit(void) xbt_dynar_free(&model_list_invoke); routing_exit(); - surf_callback_emit(simgrid::surf::surfExitCallbacks); + 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 @@ -593,61 +589,50 @@ void Model::updateActionsStateFull(double /*now*/, double /*delta*/) namespace simgrid { namespace surf { -Resource::Resource() -: p_name(NULL), p_properties(NULL), p_model(NULL) +Resource::Resource(Model *model, const char *name) + : Resource(model, name, 1/*ON*/) {} -Resource::Resource(Model *model, const char *name, xbt_dict_t props) - : Resource(model, name, props, SURF_RESOURCE_ON) -{} - -Resource::Resource(Model *model, const char *name, xbt_dict_t props, lmm_constraint_t constraint) - : Resource(model, name, props, constraint, SURF_RESOURCE_ON) +Resource::Resource(Model *model, const char *name, lmm_constraint_t constraint) + : Resource(model, name, constraint, 1/*ON*/) {} -Resource::Resource( - Model *model, const char *name, xbt_dict_t props, - lmm_constraint_t constraint, e_surf_resource_state_t stateInit) - : p_name(xbt_strdup(name)), p_properties(props), p_model(model) - , m_running(true), m_stateCurrent(stateInit), p_constraint(constraint) +Resource::Resource(Model *model, const char *name, lmm_constraint_t constraint, int initiallyOn) + : p_name(xbt_strdup(name)) + , p_model(model) + , m_isOn(initiallyOn) + , p_constraint(constraint) {} -Resource::Resource(Model *model, const char *name, xbt_dict_t props, e_surf_resource_state_t stateInit) - : p_name(xbt_strdup(name)), p_properties(props), p_model(model) - , m_running(true), m_stateCurrent(stateInit) +Resource::Resource(Model *model, const char *name, int initiallyOn) + : p_name(xbt_strdup(name)) + , p_model(model) + , m_isOn(initiallyOn) {} + Resource::~Resource() { xbt_free((void*)p_name); - xbt_dict_free(&p_properties); -} - -e_surf_resource_state_t Resource::getState() -{ - return m_stateCurrent; } -void Resource::setState(e_surf_resource_state_t state) -{ - m_stateCurrent = state; +bool Resource::isOn() { + return m_isOn; } - -bool Resource::isOn() -{ - return m_running; +bool Resource::isOff() { + return ! m_isOn; } void Resource::turnOn() { - if (!m_running) { - m_running = true; + if (!m_isOn) { + m_isOn = true; } } void Resource::turnOff() { - if (m_running) { - m_running = false; + if (m_isOn) { + m_isOn = false; } } @@ -659,12 +644,6 @@ const char *Resource::getName() { return p_name; } -xbt_dict_t Resource::getProperties() { - if (p_properties==NULL) - p_properties = xbt_dict_new(); - return p_properties; -} - lmm_constraint_t Resource::getConstraint() { return p_constraint; } @@ -696,23 +675,11 @@ namespace surf { void Action::initialize(simgrid::surf::Model *model, double cost, bool failed, lmm_variable_t var) { - m_priority = 1.0; - m_refcount = 1; m_remains = cost; - m_maxDuration = NO_MAX_DURATION; - m_finish = -1.0; m_start = surf_get_clock(); m_cost = cost; p_model = model; - p_data = NULL; p_variable = var; - m_lastValue = 0; - m_lastUpdate = 0; - m_suspended = false; - m_hat = NOTSET; - p_category = NULL; - p_stateHookup.prev = 0; - p_stateHookup.next = 0; if (failed) p_stateSet = getModel()->getFailedActionSet(); else @@ -834,7 +801,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(); }