X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/6c12a132ca10eefd1d566e489e837e459db4d979..2b7c35f960b49627c315a0bcfb43bc92566b17da:/src/surf/surf_interface.cpp diff --git a/src/surf/surf_interface.cpp b/src/surf/surf_interface.cpp index 71e9355bf3..f49641e416 100644 --- a/src/surf/surf_interface.cpp +++ b/src/surf/surf_interface.cpp @@ -8,12 +8,12 @@ #include "surf_interface.hpp" #include "network_interface.hpp" #include "cpu_interface.hpp" -#include "workstation_interface.hpp" -#include "vm_workstation_interface.hpp" +#include "host_interface.hpp" #include "simix/smx_host_private.h" #include "surf_routing.hpp" #include "simgrid/sg_config.h" #include "mc/mc.h" +#include "vm_interface.hpp" XBT_LOG_NEW_CATEGORY(surf, "All SURF categories"); XBT_LOG_NEW_DEFAULT_SUBCATEGORY(surf_kernel, surf, @@ -84,9 +84,9 @@ XBT_LOG_NEW_DEFAULT_SUBCATEGORY(surf_kernel, surf, xbt_dynar_free(&hosts); }*/ -/* model_list_invoke contains only surf_workstation and surf_vm_workstation. +/* 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 workstation models. */ + * those of these host models. */ xbt_dynar_t model_list = NULL; /* for destroying all models correctly */ xbt_dynar_t model_list_invoke = NULL; /* for invoking callbacks */ @@ -150,22 +150,22 @@ s_surf_model_description_t surf_cpu_model_description[] = { {NULL, NULL, NULL} /* this array must be NULL terminated */ }; -s_surf_model_description_t surf_workstation_model_description[] = { +s_surf_model_description_t surf_host_model_description[] = { {"default", - "Default workstation model. Currently, CPU:Cas01 and network:LV08 (with cross traffic enabled)", - surf_workstation_model_init_current_default}, + "Default host model. Currently, CPU:Cas01 and network:LV08 (with cross traffic enabled)", + surf_host_model_init_current_default}, {"compound", - "Workstation model that is automatically chosen if you change the network and CPU models", - surf_workstation_model_init_compound}, - {"ptask_L07", "Workstation model somehow similar to Cas01+CM02 but allowing parallel tasks", - surf_workstation_model_init_ptask_L07}, + "Host model that is automatically chosen if you change the network and CPU models", + surf_host_model_init_compound}, + {"ptask_L07", "Host model somehow similar to Cas01+CM02 but allowing parallel tasks", + surf_host_model_init_ptask_L07}, {NULL, NULL, NULL} /* this array must be NULL terminated */ }; -s_surf_model_description_t surf_vm_workstation_model_description[] = { +s_surf_model_description_t surf_vm_model_description[] = { {"default", - "Default vm workstation model.", - surf_vm_workstation_model_init_HL13}, + "Default vm model.", + surf_vm_model_init_HL13}, {NULL, NULL, NULL} /* this array must be NULL terminated */ }; @@ -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,35 +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); + //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_cpu_free(void *r) +static XBT_INLINE void surf_host_free(void *r) { - delete static_cast(r); -} - -static XBT_INLINE void surf_link_free(void *r) -{ - delete static_cast(r); -} - -static XBT_INLINE void surf_workstation_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); } @@ -396,29 +350,26 @@ 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(); file_lib = xbt_lib_new(); watched_hosts_lib = xbt_dict_new_homogeneous(NULL); + 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_CPU_LEVEL = xbt_lib_add_level(host_lib,surf_cpu_free); - SURF_WKS_LEVEL = xbt_lib_add_level(host_lib,surf_workstation_free); - SURF_LINK_LEVEL = xbt_lib_add_level(link_lib,surf_link_free); + SURF_HOST_LEVEL = xbt_lib_add_level(host_lib,surf_host_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(); @@ -434,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) */ @@ -445,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); @@ -473,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(); @@ -487,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(); @@ -522,7 +469,7 @@ double Model::shareResources(double now) double Model::shareResourcesLazy(double now) { - ActionPtr action = NULL; + Action *action = NULL; double min = -1; double share; @@ -601,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; @@ -684,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) {} @@ -733,7 +680,7 @@ void Resource::turnOff() } } -ModelPtr Resource::getModel() { +Model *Resource::getModel() { return p_model; } @@ -764,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; @@ -772,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; @@ -782,11 +728,6 @@ void Action::initialize(ModelPtr model, double cost, bool failed, m_lastUpdate = 0; m_suspended = false; m_hat = NOTSET; -} - -Action::Action(ModelPtr model, double cost, bool failed) -{ - initialize(model, cost, failed); p_category = NULL; p_stateHookup.prev = 0; p_stateHookup.next = 0; @@ -798,18 +739,14 @@ 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) { - initialize(model, cost, failed, var); - p_category = NULL; - p_stateHookup.prev = 0; - p_stateHookup.next = 0; - if (failed) - p_stateSet = getModel()->getFailedActionSet(); - else - p_stateSet = getModel()->getRunningActionSet(); + initialize(model, cost, failed); +} - p_stateSet->push_back(*this); +Action::Action(Model *model, double cost, bool failed, lmm_variable_t var) +{ + initialize(model, cost, failed, var); } Action::~Action() { @@ -1008,7 +945,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) { @@ -1057,7 +994,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);