X-Git-Url: http://bilbo.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/91436b33a0051d683daf3301a84132b93348d171..9687670d5440f10286a0dbc5aab95bb4eb9b6138:/src/surf/network_cm02.cpp diff --git a/src/surf/network_cm02.cpp b/src/surf/network_cm02.cpp index 637a243f08..d49e20b064 100644 --- a/src/surf/network_cm02.cpp +++ b/src/surf/network_cm02.cpp @@ -138,7 +138,7 @@ void surf_network_model_init_Reno2(void) xbt_cfg_setdefault_double(_sg_cfg_set, "network/latency_factor", 10.4); xbt_cfg_setdefault_double(_sg_cfg_set, "network/bandwidth_factor", 0.92); - xbt_cfg_setdefault_double(_sg_cfg_set, "network/weight_S_parameter", + xbt_cfg_setdefault_double(_sg_cfg_set, "network/weight_S", 8775); } @@ -185,11 +185,10 @@ void NetworkCm02Model::initialize() if (!p_maxminSystem) p_maxminSystem = lmm_system_new(m_selectiveUpdate); - const char* lb_name = "__loopback__"; - routing_model_create(createNetworkLink(lb_name, - 498000000, NULL, 0.000015, NULL, - SURF_RESOURCE_ON, NULL, - SURF_LINK_FATPIPE, NULL)); + routing_model_create(createLink("__loopback__", + 498000000, NULL, 0.000015, NULL, + SURF_RESOURCE_ON, NULL, + SURF_LINK_FATPIPE, NULL)); if (p_updateMechanism == UM_LAZY) { p_actionHeap = xbt_heap_new(8, NULL); @@ -201,7 +200,7 @@ void NetworkCm02Model::initialize() m_haveGap = false; } -NetworkLinkPtr NetworkCm02Model::createNetworkLink(const char *name, +Link* NetworkCm02Model::createLink(const char *name, double bw_initial, tmgr_trace_t bw_trace, double lat_initial, @@ -211,19 +210,12 @@ NetworkLinkPtr NetworkCm02Model::createNetworkLink(const char *name, e_surf_link_sharing_policy_t policy, xbt_dict_t properties) { - xbt_assert(!xbt_lib_get_or_null(link_lib, name, SURF_LINK_LEVEL), - "Link '%s' declared several times in the platform file.", + xbt_assert(NULL == Link::byName(name), + "Link '%s' declared several times in the platform", name); - NetworkCm02LinkPtr nw_link = - new NetworkCm02Link(this, name, properties, p_maxminSystem, sg_bandwidth_factor * bw_initial, history, - state_initial, state_trace, bw_initial, bw_trace, lat_initial, lat_trace, policy); - - - xbt_lib_set(link_lib, name, SURF_LINK_LEVEL, nw_link); - XBT_DEBUG("Create link '%s'",name); - - return nw_link; + return new NetworkCm02Link(this, name, properties, p_maxminSystem, sg_bandwidth_factor * bw_initial, history, + state_initial, state_trace, bw_initial, bw_trace, lat_initial, lat_trace, policy); } void NetworkCm02Model::updateActionsStateLazy(double now, double /*delta*/) @@ -233,7 +225,6 @@ void NetworkCm02Model::updateActionsStateLazy(double now, double /*delta*/) && (double_equals(xbt_heap_maxkey(p_actionHeap), now, sg_surf_precision))) { action = (NetworkCm02ActionPtr) xbt_heap_pop(p_actionHeap); XBT_DEBUG("Something happened to action %p", action); -#ifdef HAVE_TRACING if (TRACE_is_enabled()) { int n = lmm_get_number_of_cnst_from_var(p_maxminSystem, action->getVariable()); int i; @@ -241,7 +232,7 @@ void NetworkCm02Model::updateActionsStateLazy(double now, double /*delta*/) lmm_constraint_t constraint = lmm_get_cnst_from_var(p_maxminSystem, action->getVariable(), i); - NetworkCm02LinkPtr link = static_cast(lmm_constraint_id(constraint)); + NetworkCm02Link *link = static_cast(lmm_constraint_id(constraint)); TRACE_surf_link_set_utilization(link->getName(), action->getCategory(), (lmm_variable_getvalue(action->getVariable())* @@ -252,7 +243,6 @@ void NetworkCm02Model::updateActionsStateLazy(double now, double /*delta*/) now - action->getLastUpdate()); } } -#endif // if I am wearing a latency hat if (action->getHat() == LATENCY) { @@ -303,7 +293,6 @@ void NetworkCm02Model::updateActionsStateFull(double now, double delta) lmm_update_variable_weight(p_maxminSystem, action->getVariable(), action->m_weight); } - #ifdef HAVE_TRACING if (TRACE_is_enabled()) { int n = lmm_get_number_of_cnst_from_var(p_maxminSystem, action->getVariable()); int i; @@ -311,7 +300,7 @@ void NetworkCm02Model::updateActionsStateFull(double now, double delta) lmm_constraint_t constraint = lmm_get_cnst_from_var(p_maxminSystem, action->getVariable(), i); - NetworkCm02LinkPtr link = static_cast(lmm_constraint_id(constraint)); + NetworkCm02Link* link = static_cast(lmm_constraint_id(constraint)); TRACE_surf_link_set_utilization(link->getName(), action->getCategory(), (lmm_variable_getvalue(action->getVariable())* @@ -322,7 +311,6 @@ void NetworkCm02Model::updateActionsStateFull(double now, double delta) now - action->getLastUpdate()); } } - #endif if (!lmm_get_number_of_cnst_from_var (p_maxminSystem, action->getVariable())) { /* There is actually no link used, hence an infinite bandwidth. @@ -356,7 +344,7 @@ ActionPtr NetworkCm02Model::communicate(RoutingEdgePtr src, RoutingEdgePtr dst, { unsigned int i; void *_link; - NetworkCm02LinkPtr link; + NetworkCm02Link *link; int failed = 0; NetworkCm02ActionPtr action = NULL; double bandwidth_bound; @@ -374,7 +362,7 @@ ActionPtr NetworkCm02Model::communicate(RoutingEdgePtr src, RoutingEdgePtr dst, src->getName(), dst->getName()); xbt_dynar_foreach(route, i, _link) { - link = static_cast(_link); + link = static_cast(_link); if (link->getState() == SURF_RESOURCE_OFF) { failed = 1; break; @@ -383,7 +371,7 @@ ActionPtr NetworkCm02Model::communicate(RoutingEdgePtr src, RoutingEdgePtr dst, if (sg_network_crosstraffic == 1) { routing_platf->getRouteAndLatency(dst, src, &back_route, NULL); xbt_dynar_foreach(back_route, i, _link) { - link = static_cast(_link); + link = static_cast(_link); if (link->getState() == SURF_RESOURCE_OFF) { failed = 1; break; @@ -407,12 +395,12 @@ ActionPtr NetworkCm02Model::communicate(RoutingEdgePtr src, RoutingEdgePtr dst, bandwidth_bound = -1.0; if (sg_weight_S_parameter > 0) { xbt_dynar_foreach(route, i, _link) { - link = static_cast(_link); + link = static_cast(_link); action->m_weight += sg_weight_S_parameter / link->getBandwidth(); } } xbt_dynar_foreach(route, i, _link) { - link = static_cast(_link); + link = static_cast(_link); double bb = bandwidthFactor(size) * link->getBandwidth(); //(link->p_power.peak * link->p_power.scale); bandwidth_bound = (bandwidth_bound < 0.0) ? bb : min(bandwidth_bound, bb); @@ -425,7 +413,7 @@ ActionPtr NetworkCm02Model::communicate(RoutingEdgePtr src, RoutingEdgePtr dst, xbt_assert(!xbt_dynar_is_empty(route), "Using a model with a gap (e.g., SMPI) with a platform without links (e.g. vivaldi)!!!"); - link = *static_cast(xbt_dynar_get_ptr(route, 0)); + link = *static_cast(xbt_dynar_get_ptr(route, 0)); gapAppend(size, link, action); XBT_DEBUG("Comm %p: %s -> %s gap=%f (lat=%f)", action, src->getName(), dst->getName(), action->m_senderGap, @@ -455,14 +443,14 @@ ActionPtr NetworkCm02Model::communicate(RoutingEdgePtr src, RoutingEdgePtr dst, } xbt_dynar_foreach(route, i, _link) { - link = static_cast(_link); + link = static_cast(_link); lmm_expand(p_maxminSystem, link->getConstraint(), action->getVariable(), 1.0); } if (sg_network_crosstraffic == 1) { XBT_DEBUG("Fullduplex active adding backward flow using 5%%"); xbt_dynar_foreach(back_route, i, _link) { - link = static_cast(_link); + link = static_cast(_link); lmm_expand(p_maxminSystem, link->getConstraint(), action->getVariable(), .05); } } @@ -486,8 +474,7 @@ void NetworkCm02Model::addTraces(){ /* connect all traces relative to network */ xbt_dict_foreach(trace_connect_list_link_avail, cursor, trace_name, elm) { tmgr_trace_t trace = (tmgr_trace_t) xbt_dict_get_or_null(traces_set_list, trace_name); - NetworkCm02LinkPtr link = static_cast( - xbt_lib_get_or_null(link_lib, elm, SURF_LINK_LEVEL)); + NetworkCm02Link *link = static_cast( Link::byName(elm) ); xbt_assert(link, "Cannot connect trace %s to link %s: link undefined", trace_name, elm); @@ -500,8 +487,7 @@ void NetworkCm02Model::addTraces(){ xbt_dict_foreach(trace_connect_list_bandwidth, cursor, trace_name, elm) { tmgr_trace_t trace = (tmgr_trace_t) xbt_dict_get_or_null(traces_set_list, trace_name); - NetworkCm02LinkPtr link = static_cast( - xbt_lib_get_or_null(link_lib, elm, SURF_LINK_LEVEL)); + NetworkCm02Link *link = static_cast( Link::byName(elm) ); xbt_assert(link, "Cannot connect trace %s to link %s: link undefined", trace_name, elm); @@ -514,8 +500,7 @@ void NetworkCm02Model::addTraces(){ xbt_dict_foreach(trace_connect_list_latency, cursor, trace_name, elm) { tmgr_trace_t trace = (tmgr_trace_t) xbt_dict_get_or_null(traces_set_list, trace_name); - NetworkCm02LinkPtr link = static_cast( - xbt_lib_get_or_null(link_lib, elm, SURF_LINK_LEVEL)); + NetworkCm02Link *link = static_cast(Link::byName(elm));; xbt_assert(link, "Cannot connect trace %s to link %s: link undefined", trace_name, elm); @@ -541,7 +526,7 @@ NetworkCm02Link::NetworkCm02Link(NetworkCm02ModelPtr model, const char *name, xb double lat_initial, tmgr_trace_t lat_trace, e_surf_link_sharing_policy_t policy) -: NetworkLink(model, name, props, lmm_constraint_new(system, this, constraint_value), history, state_trace) +: Link(model, name, props, lmm_constraint_new(system, this, constraint_value), history, state_trace) { setState(state_init); @@ -614,6 +599,9 @@ void NetworkCm02Link::updateBandwidth(double value, double date){ (p_power.peak * p_power.scale); lmm_variable_t var = NULL; lmm_element_t elem = NULL; + lmm_element_t nextelem = NULL; + int numelem = 0; + NetworkCm02ActionPtr action = NULL; p_power.peak = value; @@ -621,11 +609,9 @@ void NetworkCm02Link::updateBandwidth(double value, double date){ getConstraint(), sg_bandwidth_factor * (p_power.peak * p_power.scale)); -#ifdef HAVE_TRACING TRACE_surf_link_set_bandwidth(date, getName(), sg_bandwidth_factor * p_power.peak * p_power.scale); -#endif if (sg_weight_S_parameter > 0) { - while ((var = lmm_get_var_from_cnst(getModel()->getMaxminSystem(), getConstraint(), &elem))) { + while ((var = lmm_get_var_from_cnst_safe(getModel()->getMaxminSystem(), getConstraint(), &elem, &nextelem, &numelem))) { action = (NetworkCm02ActionPtr) lmm_variable_id(var); action->m_weight += delta; if (!action->isSuspended()) @@ -638,10 +624,12 @@ void NetworkCm02Link::updateLatency(double value, double date){ double delta = value - m_latCurrent; lmm_variable_t var = NULL; lmm_element_t elem = NULL; + lmm_element_t nextelem = NULL; + int numelem = 0; NetworkCm02ActionPtr action = NULL; m_latCurrent = value; - while ((var = lmm_get_var_from_cnst(getModel()->getMaxminSystem(), getConstraint(), &elem))) { + while ((var = lmm_get_var_from_cnst_safe(getModel()->getMaxminSystem(), getConstraint(), &elem, &nextelem, &numelem))) { action = (NetworkCm02ActionPtr) lmm_variable_id(var); action->m_latCurrent += delta; action->m_weight += delta;