X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/363bbeefecf651b8a99f0f4507993fe27fcba6e1..ab319b7200020e1280da137a8c77bf57b2588714:/src/surf/network_smpi.cpp diff --git a/src/surf/network_smpi.cpp b/src/surf/network_smpi.cpp index a6d0c60c67..6d0e8ffc7f 100644 --- a/src/surf/network_smpi.cpp +++ b/src/surf/network_smpi.cpp @@ -59,9 +59,9 @@ namespace simgrid { xbt_dict_free(&gap_lookup); } - void NetworkSmpiModel::gapAppend(double size, Link* link, NetworkAction *act) + void NetworkSmpiModel::gapAppend(double size, LinkImpl* link, NetworkAction* act) { - const char *src = link->getName(); + const char* src = link->cname(); xbt_fifo_t fifo; NetworkCm02Action *action= static_cast(act); @@ -97,17 +97,12 @@ namespace simgrid { void NetworkSmpiModel::gapRemove(Action *lmm_action) { - xbt_fifo_t fifo; - size_t size; NetworkCm02Action *action = static_cast(lmm_action); - if (sg_sender_gap > 0.0 && action->senderLinkName_ - && action->senderFifoItem_) { - fifo = - (xbt_fifo_t) xbt_dict_get_or_null(gap_lookup, - action->senderLinkName_); + if (sg_sender_gap > 0.0 && action->senderLinkName_ && action->senderFifoItem_) { + xbt_fifo_t fifo = (xbt_fifo_t)xbt_dict_get_or_null(gap_lookup, action->senderLinkName_); xbt_fifo_remove_item(fifo, action->senderFifoItem_); - size = xbt_fifo_size(fifo); + size_t size = xbt_fifo_size(fifo); if (size == 0) { xbt_fifo_free(fifo); xbt_dict_remove(gap_lookup, action->senderLinkName_); @@ -125,7 +120,7 @@ namespace simgrid { smpi_bw_factor = parse_factor(xbt_cfg_get_string("smpi/bw-factor")); double current = 1.0; - for (auto fact: smpi_bw_factor) { + for (const auto& fact : smpi_bw_factor) { if (size <= fact.factor) { XBT_DEBUG("%f <= %zu return %f", size, fact.factor, current); return current; @@ -143,7 +138,7 @@ namespace simgrid { smpi_lat_factor = parse_factor(xbt_cfg_get_string("smpi/lat-factor")); double current=1.0; - for (auto fact: smpi_lat_factor) { + for (const auto& fact : smpi_lat_factor) { if (size <= fact.factor) { XBT_DEBUG("%f <= %zu return %f", size, fact.factor, current); return current;