X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/c26cf1d94cbe1d90f8236c9b61da741a4258dcb6..95f6003dd91bcac6493664491e831de740ebffd3:/src/surf/network_cm02.cpp diff --git a/src/surf/network_cm02.cpp b/src/surf/network_cm02.cpp index 278dacd1c5..f0fce7bc86 100644 --- a/src/surf/network_cm02.cpp +++ b/src/surf/network_cm02.cpp @@ -1,9 +1,11 @@ -/* Copyright (c) 2013-2014. The SimGrid Team. +/* Copyright (c) 2013-2015. The SimGrid Team. * All rights reserved. */ /* This program is free software; you can redistribute it and/or modify it * under the terms of the license (GNU LGPL) which comes with this package. */ +#include + #include "network_cm02.hpp" #include "maxmin_private.hpp" #include "simgrid/sg_config.h" @@ -52,10 +54,10 @@ void surf_network_model_init_LegrandVelho(void) if (surf_network_model) return; - surf_network_model = new NetworkCm02Model(); + surf_network_model = new simgrid::surf::NetworkCm02Model(); net_define_callbacks(); - ModelPtr model = surf_network_model; - xbt_dynar_push(model_list, &model); + simgrid::surf::Model *model = surf_network_model; + xbt_dynar_push(all_existing_models, &model); xbt_cfg_setdefault_double(_sg_cfg_set, "network/latency_factor", 13.01); @@ -81,14 +83,12 @@ void surf_network_model_init_CM02(void) if (surf_network_model) return; - surf_network_model = new NetworkCm02Model(); + surf_network_model = new simgrid::surf::NetworkCm02Model(); + xbt_dynar_push(all_existing_models, &surf_network_model); net_define_callbacks(); - ModelPtr model = surf_network_model; - xbt_dynar_push(model_list, &model); xbt_cfg_setdefault_double(_sg_cfg_set, "network/latency_factor", 1.0); - xbt_cfg_setdefault_double(_sg_cfg_set, "network/bandwidth_factor", - 1.0); + xbt_cfg_setdefault_double(_sg_cfg_set, "network/bandwidth_factor", 1.0); xbt_cfg_setdefault_double(_sg_cfg_set, "network/weight_S", 0.0); } @@ -107,17 +107,14 @@ void surf_network_model_init_Reno(void) if (surf_network_model) return; - surf_network_model = new NetworkCm02Model(); + surf_network_model = new simgrid::surf::NetworkCm02Model(); + xbt_dynar_push(all_existing_models, &surf_network_model); net_define_callbacks(); - ModelPtr model = surf_network_model; - xbt_dynar_push(model_list, &model); - lmm_set_default_protocol_function(func_reno_f, func_reno_fp, - func_reno_fpi); + lmm_set_default_protocol_function(func_reno_f, func_reno_fp, func_reno_fpi); surf_network_model->f_networkSolve = lagrange_solve; 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/bandwidth_factor", 0.92); xbt_cfg_setdefault_double(_sg_cfg_set, "network/weight_S", 8775); } @@ -127,19 +124,15 @@ void surf_network_model_init_Reno2(void) if (surf_network_model) return; - surf_network_model = new NetworkCm02Model(); + surf_network_model = new simgrid::surf::NetworkCm02Model(); + xbt_dynar_push(all_existing_models, &surf_network_model); net_define_callbacks(); - ModelPtr model = surf_network_model; - xbt_dynar_push(model_list, &model); - lmm_set_default_protocol_function(func_reno2_f, func_reno2_fp, - func_reno2_fpi); + lmm_set_default_protocol_function(func_reno2_f, func_reno2_fp, func_reno2_fpi); surf_network_model->f_networkSolve = lagrange_solve; 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", - 8775); + xbt_cfg_setdefault_double(_sg_cfg_set, "network/bandwidth_factor", 0.92); + xbt_cfg_setdefault_double(_sg_cfg_set, "network/weight_S", 8775); } void surf_network_model_init_Vegas(void) @@ -147,21 +140,22 @@ void surf_network_model_init_Vegas(void) if (surf_network_model) return; - surf_network_model = new NetworkCm02Model(); + surf_network_model = new simgrid::surf::NetworkCm02Model(); + xbt_dynar_push(all_existing_models, &surf_network_model); net_define_callbacks(); - ModelPtr model = surf_network_model; - xbt_dynar_push(model_list, &model); - lmm_set_default_protocol_function(func_vegas_f, func_vegas_fp, - func_vegas_fpi); + lmm_set_default_protocol_function(func_vegas_f, func_vegas_fp, func_vegas_fpi); surf_network_model->f_networkSolve = lagrange_solve; 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/bandwidth_factor", 0.92); xbt_cfg_setdefault_double(_sg_cfg_set, "network/weight_S", 8775); } -void NetworkCm02Model::initialize() +namespace simgrid { +namespace surf { + +NetworkCm02Model::NetworkCm02Model() + :NetworkModel() { char *optim = xbt_cfg_get_string(_sg_cfg_set, "network/optim"); int select = @@ -185,11 +179,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); @@ -197,11 +190,9 @@ void NetworkCm02Model::initialize() p_modifiedSet = new ActionLmmList(); p_maxminSystem->keep_track = p_modifiedSet; } - - 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,29 +202,23 @@ 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; + Link* 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); + Link::onCreation(link); + return link; } void NetworkCm02Model::updateActionsStateLazy(double now, double /*delta*/) { - NetworkCm02ActionPtr action; + NetworkCm02Action *action; while ((xbt_heap_size(p_actionHeap) > 0) && (double_equals(xbt_heap_maxkey(p_actionHeap), now, sg_surf_precision))) { - action = (NetworkCm02ActionPtr) xbt_heap_pop(p_actionHeap); + action = static_cast (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 +226,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 +237,6 @@ void NetworkCm02Model::updateActionsStateLazy(double now, double /*delta*/) now - action->getLastUpdate()); } } -#endif // if I am wearing a latency hat if (action->getHat() == LATENCY) { @@ -278,30 +262,101 @@ void NetworkCm02Model::updateActionsStateLazy(double now, double /*delta*/) return; } -ActionPtr NetworkCm02Model::communicate(RoutingEdgePtr src, RoutingEdgePtr dst, + +void NetworkCm02Model::updateActionsStateFull(double now, double delta) +{ + NetworkCm02Action *action; + ActionList *running_actions = getRunningActionSet(); + + for(ActionList::iterator it(running_actions->begin()), itNext=it, itend(running_actions->end()) + ; it != itend ; it=itNext) { + ++itNext; + + action = static_cast (&*it); + XBT_DEBUG("Something happened to action %p", action); + double deltap = delta; + if (action->m_latency > 0) { + if (action->m_latency > deltap) { + double_update(&(action->m_latency), deltap, sg_surf_precision); + deltap = 0.0; + } else { + double_update(&(deltap), action->m_latency, sg_surf_precision); + action->m_latency = 0.0; + } + if (action->m_latency == 0.0 && !(action->isSuspended())) + lmm_update_variable_weight(p_maxminSystem, action->getVariable(), + action->m_weight); + } + if (TRACE_is_enabled()) { + int n = lmm_get_number_of_cnst_from_var(p_maxminSystem, action->getVariable()); + int i; + for (i = 0; i < n; i++){ + lmm_constraint_t constraint = lmm_get_cnst_from_var(p_maxminSystem, + action->getVariable(), + i); + NetworkCm02Link* link = static_cast(lmm_constraint_id(constraint)); + TRACE_surf_link_set_utilization(link->getName(), + action->getCategory(), + (lmm_variable_getvalue(action->getVariable())* + lmm_get_cnst_weight_from_var(p_maxminSystem, + action->getVariable(), + i)), + action->getLastUpdate(), + now - action->getLastUpdate()); + } + } + if (!lmm_get_number_of_cnst_from_var + (p_maxminSystem, action->getVariable())) { + /* There is actually no link used, hence an infinite bandwidth. + * This happens often when using models like vivaldi. + * In such case, just make sure that the action completes immediately. + */ + action->updateRemains(action->getRemains()); + } + action->updateRemains(lmm_variable_getvalue(action->getVariable()) * delta); + + if (action->getMaxDuration() != NO_MAX_DURATION) + action->updateMaxDuration(delta); + + if ((action->getRemains() <= 0) && + (lmm_get_variable_weight(action->getVariable()) > 0)) { + action->finish(); + action->setState(SURF_ACTION_DONE); + action->gapRemove(); + } else if (((action->getMaxDuration() != NO_MAX_DURATION) + && (action->getMaxDuration() <= 0))) { + action->finish(); + action->setState(SURF_ACTION_DONE); + action->gapRemove(); + } + } + return; +} + +Action *NetworkCm02Model::communicate(NetCard *src, NetCard *dst, double size, double rate) { unsigned int i; void *_link; - NetworkCm02LinkPtr link; + NetworkCm02Link *link; int failed = 0; - NetworkCm02ActionPtr action = NULL; + NetworkCm02Action *action = NULL; double bandwidth_bound; double latency = 0.0; xbt_dynar_t back_route = NULL; int constraints_per_variable = 0; - xbt_dynar_t route = xbt_dynar_new(sizeof(RoutingEdgePtr), NULL); + xbt_dynar_t route = xbt_dynar_new(sizeof(NetCard*), NULL); XBT_IN("(%s,%s,%g,%g)", src->getName(), dst->getName(), size, rate); routing_platf->getRouteAndLatency(src, dst, &route, &latency); xbt_assert(!xbt_dynar_is_empty(route) || latency, - "You're trying to send data from %s to %s but there is no connection at all between these two hosts.", + "You're trying to send data from %s to %s but there is no connecting path between these two hosts.", 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; @@ -310,7 +365,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; @@ -334,15 +389,15 @@ 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); - double bb = bandwidthFactor(size) * link->getBandwidth(); //(link->p_power.peak * link->p_power.scale); + link = static_cast(_link); + double bb = bandwidthFactor(size) * link->getBandwidth(); bandwidth_bound = - (bandwidth_bound < 0.0) ? bb : min(bandwidth_bound, bb); + (bandwidth_bound < 0.0) ? bb : std::min(bandwidth_bound, bb); } action->m_latCurrent = action->m_latency; @@ -352,7 +407,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, @@ -378,18 +433,18 @@ ActionPtr NetworkCm02Model::communicate(RoutingEdgePtr src, RoutingEdgePtr dst, if (action->m_rate < 0) { lmm_update_variable_bound(p_maxminSystem, action->getVariable(), (action->m_latCurrent > 0) ? sg_tcp_gamma / (2.0 * action->m_latCurrent) : -1.0); } else { - lmm_update_variable_bound(p_maxminSystem, action->getVariable(), (action->m_latCurrent > 0) ? min(action->m_rate, sg_tcp_gamma / (2.0 * action->m_latCurrent)) : action->m_rate); + lmm_update_variable_bound(p_maxminSystem, action->getVariable(), (action->m_latCurrent > 0) ? std::min(action->m_rate, sg_tcp_gamma / (2.0 * action->m_latCurrent)) : action->m_rate); } 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); } } @@ -397,7 +452,7 @@ ActionPtr NetworkCm02Model::communicate(RoutingEdgePtr src, RoutingEdgePtr dst, xbt_dynar_free(&route); XBT_OUT(); - surf_callback_emit(networkCommunicateCallbacks, action, src, dst, size, rate); + networkCommunicateCallbacks(action, src, dst, size, rate); return action; } @@ -413,8 +468,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); @@ -427,8 +481,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); @@ -436,13 +489,12 @@ void NetworkCm02Model::addTraces(){ "Cannot connect trace %s to link %s: trace undefined", trace_name, elm); - link->p_power.event = tmgr_history_add_trace(history, trace, 0.0, 0, link); + link->p_speed.event = tmgr_history_add_trace(history, trace, 0.0, 0, link); } 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); @@ -457,7 +509,7 @@ void NetworkCm02Model::addTraces(){ /************ * Resource * ************/ -NetworkCm02Link::NetworkCm02Link(NetworkCm02ModelPtr model, const char *name, xbt_dict_t props, +NetworkCm02Link::NetworkCm02Link(NetworkCm02Model *model, const char *name, xbt_dict_t props, lmm_system_t system, double constraint_value, tmgr_history_t history, @@ -468,16 +520,16 @@ 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); - p_power.scale = 1.0; - p_power.peak = metric_peak; + p_speed.scale = 1.0; + p_speed.peak = metric_peak; if (metric_trace) - p_power.event = tmgr_history_add_trace(history, metric_trace, 0.0, 0, this); + p_speed.event = tmgr_history_add_trace(history, metric_trace, 0.0, 0, this); else - p_power.event = NULL; + p_speed.event = NULL; m_latCurrent = lat_initial; if (lat_trace) @@ -496,10 +548,10 @@ void NetworkCm02Link::updateState(tmgr_trace_event_t event_type, /* "%g" " for event %p\n", surf_get_clock(), nw_link->name, */ /* value, event_type); */ - if (event_type == p_power.event) { + if (event_type == p_speed.event) { updateBandwidth(value, date); if (tmgr_trace_event_free(event_type)) - p_power.event = NULL; + p_speed.event = NULL; } else if (event_type == p_latEvent) { updateLatency(value, date); if (tmgr_trace_event_free(event_type)) @@ -514,7 +566,7 @@ void NetworkCm02Link::updateState(tmgr_trace_event_t event_type, setState(SURF_RESOURCE_OFF); while ((var = lmm_get_var_from_cnst(getModel()->getMaxminSystem(), cnst, &elem))) { - ActionPtr action = (ActionPtr) lmm_variable_id(var); + Action *action = static_cast( lmm_variable_id(var) ); if (action->getState() == SURF_ACTION_RUNNING || action->getState() == SURF_ACTION_READY) { @@ -538,22 +590,23 @@ void NetworkCm02Link::updateState(tmgr_trace_event_t event_type, void NetworkCm02Link::updateBandwidth(double value, double date){ double delta = sg_weight_S_parameter / value - sg_weight_S_parameter / - (p_power.peak * p_power.scale); + (p_speed.peak * p_speed.scale); lmm_variable_t var = NULL; lmm_element_t elem = NULL; - NetworkCm02ActionPtr action = NULL; + lmm_element_t nextelem = NULL; + int numelem = 0; + + NetworkCm02Action *action = NULL; - p_power.peak = value; + p_speed.peak = value; lmm_update_constraint_bound(getModel()->getMaxminSystem(), 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 + (p_speed.peak * p_speed.scale)); + TRACE_surf_link_set_bandwidth(date, getName(), sg_bandwidth_factor * p_speed.peak * p_speed.scale); if (sg_weight_S_parameter > 0) { - while ((var = lmm_get_var_from_cnst(getModel()->getMaxminSystem(), getConstraint(), &elem))) { - action = (NetworkCm02ActionPtr) lmm_variable_id(var); + while ((var = lmm_get_var_from_cnst_safe(getModel()->getMaxminSystem(), getConstraint(), &elem, &nextelem, &numelem))) { + action = (NetworkCm02Action*) lmm_variable_id(var); action->m_weight += delta; if (!action->isSuspended()) lmm_update_variable_weight(getModel()->getMaxminSystem(), action->getVariable(), action->m_weight); @@ -565,18 +618,20 @@ void NetworkCm02Link::updateLatency(double value, double date){ double delta = value - m_latCurrent; lmm_variable_t var = NULL; lmm_element_t elem = NULL; - NetworkCm02ActionPtr action = NULL; + lmm_element_t nextelem = NULL; + int numelem = 0; + NetworkCm02Action *action = NULL; m_latCurrent = value; - while ((var = lmm_get_var_from_cnst(getModel()->getMaxminSystem(), getConstraint(), &elem))) { - action = (NetworkCm02ActionPtr) lmm_variable_id(var); + while ((var = lmm_get_var_from_cnst_safe(getModel()->getMaxminSystem(), getConstraint(), &elem, &nextelem, &numelem))) { + action = (NetworkCm02Action*) lmm_variable_id(var); action->m_latCurrent += delta; action->m_weight += delta; if (action->m_rate < 0) lmm_update_variable_bound(getModel()->getMaxminSystem(), action->getVariable(), sg_tcp_gamma / (2.0 * action->m_latCurrent)); else { lmm_update_variable_bound(getModel()->getMaxminSystem(), action->getVariable(), - min(action->m_rate, sg_tcp_gamma / (2.0 * action->m_latCurrent))); + std::min(action->m_rate, sg_tcp_gamma / (2.0 * action->m_latCurrent))); if (action->m_rate < sg_tcp_gamma / (2.0 * action->m_latCurrent)) { XBT_INFO("Flow is limited BYBANDWIDTH"); @@ -628,8 +683,6 @@ void NetworkCm02Action::updateRemainingLazy(double now) m_lastUpdate = now; m_lastValue = lmm_variable_getvalue(getVariable()); } -void NetworkCm02Action::recycle() -{ - return; -} +} +}