X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/91bb77753278264baf1acecdfe389ff7e2fcd270..e36ab8605881c80995e3df732c33bd44bd4eda86:/src/surf/surf_interface.cpp diff --git a/src/surf/surf_interface.cpp b/src/surf/surf_interface.cpp index cbb2f02a6a..e6fdd84087 100644 --- a/src/surf/surf_interface.cpp +++ b/src/surf/surf_interface.cpp @@ -194,9 +194,6 @@ static xbt_parmap_t surf_parmap = NULL; /* parallel map on models */ #endif double NOW = 0; -double *surf_mins = NULL; /* return value of share_resources for each model */ -int surf_min_index; /* current index in surf_mins */ -double surf_min; /* duration determined by surf_solve */ double surf_get_clock(void) { @@ -233,40 +230,12 @@ FILE *surf_fopen(const char *name, const char *mode) return NULL; } - -#ifndef MAX_DRIVE -#define MAX_DRIVE 26 -#endif - #ifdef _XBT_WIN32 #include +#define MAX_DRIVE 26 static const char *disk_drives_letter_table[MAX_DRIVE] = { - "A:\\", - "B:\\", - "C:\\", - "D:\\", - "E:\\", - "F:\\", - "G:\\", - "H:\\", - "I:\\", - "J:\\", - "K:\\", - "L:\\", - "M:\\", - "N:\\", - "O:\\", - "P:\\", - "Q:\\", - "R:\\", - "S:\\", - "T:\\", - "U:\\", - "V:\\", - "W:\\", - "X:\\", - "Y:\\", - "Z:\\" + "A:\\","B:\\","C:\\","D:\\","E:\\","F:\\","G:\\","H:\\","I:\\","J:\\","K:\\","L:\\","M:\\", + "N:\\","O:\\","P:\\","Q:\\","R:\\","S:\\","T:\\","U:\\","V:\\","W:\\","X:\\","Y:\\","Z:\\" }; #endif @@ -354,30 +323,20 @@ int find_model_description(s_surf_model_description_t * table, return -1; } -static XBT_INLINE void routing_asr_host_free(void *p) -{ - delete ((RoutingEdgePtr) p); -} - static XBT_INLINE void routing_asr_prop_free(void *p) { - xbt_dict_t elm = (xbt_dict_t) p; - xbt_dict_free(&elm); -} - -static XBT_INLINE void surf_link_free(void *r) -{ - delete static_cast(r); + //xbt_dict_t elm = (xbt_dict_t) 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); + delete static_cast(r); } static XBT_INLINE void surf_storage_free(void *r) { - delete static_cast(r); + delete static_cast(r); } @@ -391,7 +350,6 @@ void surf_init(int *argc, char **argv) { XBT_DEBUG("Create all Libs"); host_lib = xbt_lib_new(); - link_lib = xbt_lib_new(); as_router_lib = xbt_lib_new(); storage_lib = xbt_lib_new(); storage_type_lib = xbt_lib_new(); @@ -401,20 +359,17 @@ void surf_init(int *argc, char **argv) sg_host_init(); XBT_DEBUG("Add routing levels"); - ROUTING_HOST_LEVEL = xbt_lib_add_level(host_lib,routing_asr_host_free); - ROUTING_ASR_LEVEL = xbt_lib_add_level(as_router_lib,routing_asr_host_free); 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); - SURF_LINK_LEVEL = xbt_lib_add_level(link_lib,surf_link_free); SURF_STORAGE_LEVEL = xbt_lib_add_level(storage_lib,surf_storage_free); xbt_init(argc, argv); if (!model_list) - model_list = xbt_dynar_new(sizeof(ModelPtr), NULL); + model_list = xbt_dynar_new(sizeof(Model*), NULL); if (!model_list_invoke) - model_list_invoke = xbt_dynar_new(sizeof(ModelPtr), NULL); + model_list_invoke = xbt_dynar_new(sizeof(Model*), NULL); if (!history) history = tmgr_history_new(); @@ -430,7 +385,7 @@ void surf_init(int *argc, char **argv) void surf_exit(void) { unsigned int iter; - ModelPtr model = NULL; + Model *model = NULL; TRACE_end(); /* Just in case it was not called by the upper * layer (or there is no upper layer) */ @@ -441,9 +396,9 @@ void surf_exit(void) xbt_dynar_free(&surf_path); xbt_lib_free(&host_lib); - xbt_lib_free(&link_lib); xbt_lib_free(&as_router_lib); xbt_lib_free(&storage_lib); + sg_link_exit(); xbt_lib_free(&storage_type_lib); xbt_lib_free(&file_lib); xbt_dict_free(&watched_hosts_lib); @@ -469,9 +424,6 @@ void surf_exit(void) xbt_parmap_destroy(surf_parmap); #endif - xbt_free(surf_mins); - surf_mins = NULL; - tmgr_finalize(); surf_parse_lex_destroy(); surf_parse_free_callbacks(); @@ -483,9 +435,8 @@ void surf_exit(void) * Model * *********/ -Model::Model(const char *name) +Model::Model() : p_maxminSystem(NULL) - , p_name(name) { p_readyActionSet = new ActionList(); p_runningActionSet = new ActionList(); @@ -518,7 +469,7 @@ double Model::shareResources(double now) double Model::shareResourcesLazy(double now) { - ActionPtr action = NULL; + Action *action = NULL; double min = -1; double share; @@ -597,11 +548,11 @@ double Model::shareResourcesFull(double /*now*/) { THROW_UNIMPLEMENTED; } -double Model::shareResourcesMaxMin(ActionListPtr running_actions, +double Model::shareResourcesMaxMin(ActionList *running_actions, lmm_system_t sys, void (*solve) (lmm_system_t)) { - ActionPtr action = NULL; + Action *action = NULL; double min = -1; double value = -1; @@ -680,17 +631,17 @@ Resource::Resource() : p_name(NULL), p_properties(NULL), p_model(NULL) {} -Resource::Resource(ModelPtr model, const char *name, xbt_dict_t props) +Resource::Resource(Model *model, const char *name, xbt_dict_t props) : p_name(xbt_strdup(name)), p_properties(props), p_model(model) , m_running(true), m_stateCurrent(SURF_RESOURCE_ON) {} -Resource::Resource(ModelPtr model, const char *name, xbt_dict_t props, lmm_constraint_t constraint) +Resource::Resource(Model *model, const char *name, xbt_dict_t props, lmm_constraint_t constraint) : p_name(xbt_strdup(name)), p_properties(props), p_model(model) , m_running(true), m_stateCurrent(SURF_RESOURCE_ON), p_constraint(constraint) {} -Resource::Resource(ModelPtr model, const char *name, xbt_dict_t props, e_surf_resource_state_t stateInit) +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) {} @@ -729,7 +680,7 @@ void Resource::turnOff() } } -ModelPtr Resource::getModel() { +Model *Resource::getModel() { return p_model; } @@ -760,7 +711,7 @@ const char *surf_action_state_names[6] = { "SURF_ACTION_NOT_IN_THE_SYSTEM" }; -void Action::initialize(ModelPtr model, double cost, bool failed, +void Action::initialize(Model *model, double cost, bool failed, lmm_variable_t var) { m_priority = 1.0; @@ -768,7 +719,6 @@ void Action::initialize(ModelPtr model, double cost, bool failed, m_remains = cost; m_maxDuration = NO_MAX_DURATION; m_finish = -1.0; - m_failed = failed; m_start = surf_get_clock(); m_cost = cost; p_model = model; @@ -780,7 +730,7 @@ void Action::initialize(ModelPtr model, double cost, bool failed, m_hat = NOTSET; } -Action::Action(ModelPtr model, double cost, bool failed) +Action::Action(Model *model, double cost, bool failed) { initialize(model, cost, failed); p_category = NULL; @@ -794,7 +744,7 @@ Action::Action(ModelPtr model, double cost, bool failed) p_stateSet->push_back(*this); } -Action::Action(ModelPtr model, double cost, bool failed, lmm_variable_t var) +Action::Action(Model *model, double cost, bool failed, lmm_variable_t var) { initialize(model, cost, failed, var); p_category = NULL; @@ -1004,7 +954,7 @@ 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) { - ((ActionPtr)action)->updateIndexHeap(i); + static_cast(action)->updateIndexHeap(i); } void Action::updateIndexHeap(int i) { @@ -1053,7 +1003,7 @@ 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()) { - ResourcePtr cpu = static_cast(lmm_constraint_id(lmm_get_cnst_from_var(getModel()->getMaxminSystem(), getVariable(), 0))); + 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);