X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/7c047878cb2905079a6a0544f1a15134ae3ab3a6..dadfefc9f3cc6cf0fc28a9025307f9f08dc4ac96:/src/surf/network_cm02.cpp diff --git a/src/surf/network_cm02.cpp b/src/surf/network_cm02.cpp index 3edbdbf033..91a4622f8d 100644 --- a/src/surf/network_cm02.cpp +++ b/src/surf/network_cm02.cpp @@ -35,13 +35,13 @@ int sg_network_crosstraffic = 0; /* month = Nov, */ /* pdf = {http://hal.inria.fr/hal-00646896/PDF/rr-validity.pdf}, */ /* } */ -void surf_network_model_init_LegrandVelho(void) +void surf_network_model_init_LegrandVelho() { if (surf_network_model) return; surf_network_model = new simgrid::surf::NetworkCm02Model(); - xbt_dynar_push(all_existing_models, &surf_network_model); + all_existing_models->push_back(surf_network_model); xbt_cfg_setdefault_double("network/latency-factor", 13.01); xbt_cfg_setdefault_double("network/bandwidth-factor", 0.97); @@ -59,14 +59,14 @@ void surf_network_model_init_LegrandVelho(void) /* month = {oct}, */ /* year = {2002} */ /* } */ -void surf_network_model_init_CM02(void) +void surf_network_model_init_CM02() { if (surf_network_model) return; surf_network_model = new simgrid::surf::NetworkCm02Model(); - xbt_dynar_push(all_existing_models, &surf_network_model); + all_existing_models->push_back(surf_network_model); xbt_cfg_setdefault_double("network/latency-factor", 1.0); xbt_cfg_setdefault_double("network/bandwidth-factor", 1.0); @@ -83,16 +83,15 @@ void surf_network_model_init_CM02(void) /* journal={{IEEE/ACM} Transactions on Networking}, */ /* volume={11}, number={4}, */ /* } */ -void surf_network_model_init_Reno(void) +void surf_network_model_init_Reno() { if (surf_network_model) return; - surf_network_model = new simgrid::surf::NetworkCm02Model(); - xbt_dynar_push(all_existing_models, &surf_network_model); + surf_network_model = new simgrid::surf::NetworkCm02Model(lagrange_solve); + all_existing_models->push_back(surf_network_model); 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("network/latency-factor", 10.4); xbt_cfg_setdefault_double("network/bandwidth-factor", 0.92); @@ -100,32 +99,30 @@ void surf_network_model_init_Reno(void) } -void surf_network_model_init_Reno2(void) +void surf_network_model_init_Reno2() { if (surf_network_model) return; - surf_network_model = new simgrid::surf::NetworkCm02Model(); - xbt_dynar_push(all_existing_models, &surf_network_model); + surf_network_model = new simgrid::surf::NetworkCm02Model(lagrange_solve); + all_existing_models->push_back(surf_network_model); 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("network/latency-factor", 10.4); xbt_cfg_setdefault_double("network/bandwidth-factor", 0.92); xbt_cfg_setdefault_double("network/weight-S", 8775); } -void surf_network_model_init_Vegas(void) +void surf_network_model_init_Vegas() { if (surf_network_model) return; - surf_network_model = new simgrid::surf::NetworkCm02Model(); - xbt_dynar_push(all_existing_models, &surf_network_model); + surf_network_model = new simgrid::surf::NetworkCm02Model(lagrange_solve); + all_existing_models->push_back(surf_network_model); 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("network/latency-factor", 10.4); xbt_cfg_setdefault_double("network/bandwidth-factor", 0.92); @@ -139,32 +136,37 @@ NetworkCm02Model::NetworkCm02Model() :NetworkModel() { char *optim = xbt_cfg_get_string("network/optim"); - int select = xbt_cfg_get_boolean("network/maxmin-selective-update"); + bool select = xbt_cfg_get_boolean("network/maxmin-selective-update"); if (!strcmp(optim, "Full")) { updateMechanism_ = UM_FULL; selectiveUpdate_ = select; } else if (!strcmp(optim, "Lazy")) { updateMechanism_ = UM_LAZY; - selectiveUpdate_ = 1; - xbt_assert((select == 1) || (xbt_cfg_is_default_value("network/maxmin-selective-update")), - "Disabling selective update while using the lazy update mechanism is dumb!"); + selectiveUpdate_ = true; + xbt_assert(select || (xbt_cfg_is_default_value("network/maxmin-selective-update")), + "You cannot disable selective update when using the lazy update mechanism"); } else { - xbt_die("Unsupported optimization (%s) for this model", optim); + xbt_die("Unsupported optimization (%s) for this model. Accepted: Full, Lazy.", optim); } - if (!maxminSystem_) - maxminSystem_ = lmm_system_new(selectiveUpdate_); + maxminSystem_ = lmm_system_new(selectiveUpdate_); routing_model_create(createLink("__loopback__", 498000000, 0.000015, SURF_LINK_FATPIPE, nullptr)); if (updateMechanism_ == UM_LAZY) { - actionHeap_ = xbt_heap_new(8, nullptr); - xbt_heap_set_update_callback(actionHeap_, surf_action_lmm_update_index_heap); - modifiedSet_ = new ActionLmmList(); - maxminSystem_->keep_track = modifiedSet_; + actionHeap_ = xbt_heap_new(8, nullptr); + xbt_heap_set_update_callback(actionHeap_, surf_action_lmm_update_index_heap); + modifiedSet_ = new ActionLmmList(); + maxminSystem_->keep_track = modifiedSet_; } } +NetworkCm02Model::NetworkCm02Model(void (*specificSolveFun)(lmm_system_t self)) + : NetworkCm02Model() +{ + maxminSystem_->solve_fun = specificSolveFun; +} + NetworkCm02Model::~NetworkCm02Model() {} @@ -176,10 +178,10 @@ Link* NetworkCm02Model::createLink(const char *name, double bandwidth, double la void NetworkCm02Model::updateActionsStateLazy(double now, double /*delta*/) { - NetworkCm02Action *action; while ((xbt_heap_size(actionHeap_) > 0) && (double_equals(xbt_heap_maxkey(actionHeap_), now, sg_surf_precision))) { - action = static_cast (xbt_heap_pop(actionHeap_)); + + NetworkCm02Action *action = static_cast (xbt_heap_pop(actionHeap_)); XBT_DEBUG("Something happened to action %p", action); if (TRACE_is_enabled()) { int n = lmm_get_number_of_cnst_from_var(maxminSystem_, action->getVariable()); @@ -187,14 +189,10 @@ void NetworkCm02Model::updateActionsStateLazy(double now, double /*delta*/) for (int i = 0; i < n; i++){ lmm_constraint_t constraint = lmm_get_cnst_from_var(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(maxminSystem_, - action->getVariable(), - i)), - action->getLastUpdate(), - now - action->getLastUpdate()); + double value = lmm_variable_getvalue(action->getVariable())* + lmm_get_cnst_weight_from_var(maxminSystem_, action->getVariable(), i); + TRACE_surf_link_set_utilization(link->getName(), action->getCategory(), value, + action->getLastUpdate(), now - action->getLastUpdate()); } } @@ -206,8 +204,7 @@ void NetworkCm02Model::updateActionsStateLazy(double now, double /*delta*/) action->refreshLastUpdate(); // if I am wearing a max_duration or normal hat - } else if (action->getHat() == MAX_DURATION || - action->getHat() == NORMAL) { + } else if (action->getHat() == MAX_DURATION || action->getHat() == NORMAL) { // no need to communicate anymore // assume that flows that reached max_duration have remaining of 0 XBT_DEBUG("Action %p finished", action); @@ -225,14 +222,13 @@ void NetworkCm02Model::updateActionsStateLazy(double now, double /*delta*/) 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; + ++itNext; - action = static_cast (&*it); + NetworkCm02Action *action = static_cast (&*it); XBT_DEBUG("Something happened to action %p", action); double deltap = delta; if (action->latency_ > 0) { @@ -289,7 +285,8 @@ void NetworkCm02Model::updateActionsStateFull(double now, double delta) } } -Action *NetworkCm02Model::communicate(NetCard *src, NetCard *dst, double size, double rate) +Action *NetworkCm02Model::communicate(kernel::routing::NetCard *src, kernel::routing::NetCard *dst, + double size, double rate) { int failed = 0; double bandwidth_bound; @@ -389,11 +386,6 @@ Action *NetworkCm02Model::communicate(NetCard *src, NetCard *dst, double size, d return action; } -bool NetworkCm02Model::next_occuring_event_isIdempotent() -{ - return true; -} - void NetworkCm02Model::gapAppend(double size, const Link* link, NetworkAction* action) { // Nothing