X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/aa5a7febd33d50d8457f71c35f11c39bef0b64e4..b35d70d6818026204833410d2e3917252fa35127:/src/surf/surf_interface.cpp diff --git a/src/surf/surf_interface.cpp b/src/surf/surf_interface.cpp index b10a5042cc..fe54219dcf 100644 --- a/src/surf/surf_interface.cpp +++ b/src/surf/surf_interface.cpp @@ -35,7 +35,13 @@ xbt_dynar_t surf_path = NULL; xbt_dynar_t host_that_restart = NULL; xbt_dict_t watched_hosts_lib; -surf_callback(void, void) surfExitCallbacks; +namespace simgrid { +namespace surf { + +simgrid::surf::signal surfExitCallbacks; + +} +} s_surf_model_description_t surf_plugin_description[] = { {"Energy", "Cpu energy consumption.", sg_energy_plugin_init}, @@ -263,14 +269,9 @@ 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); + delete static_cast(r); } void sg_version_check(int lib_version_major,int lib_version_minor,int lib_version_patch) { @@ -300,7 +301,9 @@ 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) { + delete static_cast(p); + }); as_router_lib = xbt_lib_new(); storage_lib = xbt_lib_new(); storage_type_lib = xbt_lib_new(); @@ -313,14 +316,14 @@ 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); if (!all_existing_models) - all_existing_models = xbt_dynar_new(sizeof(Model*), NULL); + all_existing_models = xbt_dynar_new(sizeof(simgrid::surf::Model*), NULL); if (!model_list_invoke) - model_list_invoke = xbt_dynar_new(sizeof(Model*), NULL); + model_list_invoke = xbt_dynar_new(sizeof(simgrid::surf::Model*), NULL); if (!history) history = tmgr_history_new(); @@ -336,7 +339,7 @@ void surf_init(int *argc, char **argv) void surf_exit(void) { unsigned int iter; - Model *model = NULL; + simgrid::surf::Model *model = NULL; TRACE_end(); /* Just in case it was not called by the upper * layer (or there is no upper layer) */ @@ -346,7 +349,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(); @@ -360,7 +363,7 @@ void surf_exit(void) xbt_dynar_free(&model_list_invoke); routing_exit(); - surf_callback_emit(surfExitCallbacks); + simgrid::surf::surfExitCallbacks(); if (maxmin_system) { lmm_system_free(maxmin_system); @@ -386,6 +389,9 @@ void surf_exit(void) * Model * *********/ +namespace simgrid { +namespace surf { + Model::Model() : p_maxminSystem(NULL) { @@ -574,37 +580,43 @@ void Model::updateActionsStateFull(double /*now*/, double /*delta*/) THROW_UNIMPLEMENTED; } +} +} + /************ * Resource * ************/ +namespace simgrid { +namespace surf { + Resource::Resource() -: p_name(NULL), p_properties(NULL), p_model(NULL) +: p_name(NULL), p_model(NULL) {} -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) + : Resource(model, name, 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, SURF_RESOURCE_ON) {} Resource::Resource( - Model *model, const char *name, xbt_dict_t props, + Model *model, const char *name, lmm_constraint_t constraint, e_surf_resource_state_t stateInit) - : p_name(xbt_strdup(name)), p_properties(props), p_model(model) + : p_name(xbt_strdup(name)), p_model(model) , m_running(true), m_stateCurrent(stateInit), 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) +Resource::Resource(Model *model, const char *name, e_surf_resource_state_t stateInit) + : p_name(xbt_strdup(name)), p_model(model) , m_running(true), m_stateCurrent(stateInit) {} + Resource::~Resource() { xbt_free((void*)p_name); - xbt_dict_free(&p_properties); } e_surf_resource_state_t Resource::getState() @@ -644,16 +656,13 @@ 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; } +} +} + /********** * Action * **********/ @@ -667,26 +676,22 @@ const char *surf_action_state_names[6] = { "SURF_ACTION_NOT_IN_THE_SYSTEM" }; -void Action::initialize(Model *model, double cost, bool failed, +/* added to manage the communication action's heap */ +void surf_action_lmm_update_index_heap(void *action, int i) { + static_cast(action)->updateIndexHeap(i); +} + +namespace simgrid { +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 @@ -695,12 +700,12 @@ void Action::initialize(Model *model, double cost, bool failed, p_stateSet->push_back(*this); } -Action::Action(Model *model, double cost, bool failed) +Action::Action(simgrid::surf::Model *model, double cost, bool failed) { initialize(model, cost, failed); } -Action::Action(Model *model, double cost, bool failed, lmm_variable_t var) +Action::Action(simgrid::surf::Model *model, double cost, bool failed, lmm_variable_t var) { initialize(model, cost, failed, var); } @@ -899,11 +904,6 @@ void Action::heapUpdate(xbt_heap_t heap, double key, enum heap_action_type hat) } } -/* added to manage the communication action's heap */ -void surf_action_lmm_update_index_heap(void *action, int i) { - static_cast(action)->updateIndexHeap(i); -} - void Action::updateIndexHeap(int i) { m_indexHeap = i; } @@ -950,7 +950,8 @@ void Action::updateRemainingLazy(double now) double_update(&m_remains, m_lastValue * delta, sg_surf_precision*sg_maxmin_precision); if (getModel() == surf_cpu_model_pm && TRACE_is_enabled()) { - Resource *cpu = static_cast(lmm_constraint_id(lmm_get_cnst_from_var(getModel()->getMaxminSystem(), getVariable(), 0))); + simgrid::surf::Resource *cpu = static_cast( + lmm_constraint_id(lmm_get_cnst_from_var(getModel()->getMaxminSystem(), getVariable(), 0))); TRACE_surf_host_set_utilization(cpu->getName(), getCategory(), m_lastValue, m_lastUpdate, now - m_lastUpdate); } XBT_DEBUG("Updating action(%p): remains is now %f", this, m_remains); @@ -978,3 +979,6 @@ void Action::updateRemainingLazy(double now) m_lastUpdate = now; m_lastValue = lmm_variable_getvalue(getVariable()); } + +} +}