X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/c57842fe897f53b46f0be3da87f7c996674be7d6..d896265a56dbf34328e32566da1932835d840d27:/src/surf/surf_interface.cpp diff --git a/src/surf/surf_interface.cpp b/src/surf/surf_interface.cpp index a20ea1b0e6..3b34cc75ba 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 */ @@ -99,9 +99,7 @@ xbt_dict_t watched_hosts_lib; surf_callback(void, void) surfExitCallbacks; s_surf_model_description_t surf_plugin_description[] = { - {"Energy", - "Cpu energy consumption.", - sg_energy_plugin_init}, + {"Energy", "Cpu energy consumption.", sg_energy_plugin_init}, {NULL, NULL, NULL} /* this array must be NULL terminated */ }; @@ -117,6 +115,9 @@ s_surf_model_description_t surf_network_model_description[] = { {"SMPI", "Realistic network model specifically tailored for HPC settings (accurate modeling of slow start with correction factors on three intervals: < 1KiB, < 64 KiB, >= 64 KiB)", surf_network_model_init_SMPI}, + {"IB", + "Realistic network model specifically tailored for HPC settings, with Infiniband contention model", + surf_network_model_init_IB}, {"CM02", "Legacy network analytic model (Very similar to LV08, but without corrective factors. The timings of small messages are thus poorly modeled).", surf_network_model_init_CM02}, @@ -149,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 */ }; @@ -374,9 +375,9 @@ static XBT_INLINE void surf_link_free(void *r) delete static_cast(r); } -static XBT_INLINE void surf_workstation_free(void *r) +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) @@ -409,7 +410,7 @@ void surf_init(int *argc, char **argv) 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_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); @@ -421,10 +422,8 @@ void surf_init(int *argc, char **argv) if (!history) history = tmgr_history_new(); -#ifdef HAVE_TRACING TRACE_add_start_function(TRACE_surf_alloc); TRACE_add_end_function(TRACE_surf_release); -#endif sg_config_init(argc, argv); @@ -437,10 +436,8 @@ void surf_exit(void) unsigned int iter; ModelPtr model = NULL; -#ifdef HAVE_TRACING TRACE_end(); /* Just in case it was not called by the upper * layer (or there is no upper layer) */ -#endif sg_config_finalize(); @@ -583,8 +580,7 @@ double Model::shareResourcesLazy(double now) action->getMaxDuration()); if (min != -1) { - action->heapRemove(p_actionHeap); - action->heapInsert(p_actionHeap, min, max_dur_flag ? MAX_DURATION : NORMAL); + action->heapUpdate(p_actionHeap, min, max_dur_flag ? MAX_DURATION : NORMAL); XBT_DEBUG("Insert at heap action(%p) min %f now %f", action, min, now); } else DIE_IMPOSSIBLE; @@ -791,9 +787,7 @@ void Action::initialize(ModelPtr model, double cost, bool failed, Action::Action(ModelPtr model, double cost, bool failed) { initialize(model, cost, failed); - #ifdef HAVE_TRACING - p_category = NULL; - #endif + p_category = NULL; p_stateHookup.prev = 0; p_stateHookup.next = 0; if (failed) @@ -807,9 +801,7 @@ Action::Action(ModelPtr model, double cost, bool failed) Action::Action(ModelPtr model, double cost, bool failed, lmm_variable_t var) { initialize(model, cost, failed, var); - #ifdef HAVE_TRACING - p_category = NULL; - #endif + p_category = NULL; p_stateHookup.prev = 0; p_stateHookup.next = 0; if (failed) @@ -821,9 +813,7 @@ Action::Action(ModelPtr model, double cost, bool failed, lmm_variable_t var) } Action::~Action() { -#ifdef HAVE_TRACING xbt_free(p_category); -#endif } void Action::finish() { @@ -873,7 +863,7 @@ void Action::setBound(double bound) { XBT_IN("(%p,%g)", this, bound); if (p_variable) - lmm_update_variable_bound(getModel()->getMaxminSystem(), getVariable(), bound); + lmm_update_variable_bound(getModel()->getMaxminSystem(), p_variable, bound); if (getModel()->getUpdateMechanism() == UM_LAZY && getLastUpdate()!=surf_get_clock()) heapRemove(getModel()->getActionHeap()); @@ -896,14 +886,12 @@ void Action::setData(void* data) p_data = data; } -#ifdef HAVE_TRACING void Action::setCategory(const char *category) { XBT_IN("(%p,%s)", this, category); p_category = xbt_strdup(category); XBT_OUT(); } -#endif void Action::ref(){ m_refcount++; @@ -1008,6 +996,16 @@ void Action::heapRemove(xbt_heap_t heap) } } +void Action::heapUpdate(xbt_heap_t heap, double key, enum heap_action_type hat) +{ + m_hat = hat; + if (m_indexHeap >= 0) { + xbt_heap_update(heap, m_indexHeap, key); + }else{ + xbt_heap_push(heap, this, key); + } +} + /* added to manage the communication action's heap */ void surf_action_lmm_update_index_heap(void *action, int i) { ((ActionPtr)action)->updateIndexHeap(i); @@ -1058,12 +1056,10 @@ void Action::updateRemainingLazy(double now) XBT_DEBUG("Updating action(%p): remains was %f, last_update was: %f", this, m_remains, m_lastUpdate); double_update(&m_remains, m_lastValue * delta, sg_surf_precision*sg_maxmin_precision); -#ifdef HAVE_TRACING 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))); TRACE_surf_host_set_utilization(cpu->getName(), getCategory(), m_lastValue, m_lastUpdate, now - m_lastUpdate); } -#endif XBT_DEBUG("Updating action(%p): remains is now %f", this, m_remains); } @@ -1089,4 +1085,3 @@ void Action::updateRemainingLazy(double now) m_lastUpdate = now; m_lastValue = lmm_variable_getvalue(getVariable()); } -