X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/f9df6a0ce7023e4e22d83bb6c50f27bd21fab329..36fa571a13985879dc627c70ecc2340af606aa42:/src/surf/network_smpi.cpp diff --git a/src/surf/network_smpi.cpp b/src/surf/network_smpi.cpp index bb83b01a34..411a467b6c 100644 --- a/src/surf/network_smpi.cpp +++ b/src/surf/network_smpi.cpp @@ -5,69 +5,21 @@ * under the terms of the license (GNU LGPL) which comes with this package. */ #include - #include #include #include "network_smpi.hpp" #include "simgrid/sg_config.h" +#include "smpi/smpi_utils.hpp" XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(surf_network); -xbt_dynar_t smpi_bw_factor = nullptr; -xbt_dynar_t smpi_lat_factor = nullptr; - -typedef struct s_smpi_factor *smpi_factor_t; -typedef struct s_smpi_factor { // FIXME: s_smpi_factor_multival (defined in smpi_base) should be used instead to dedupplicate this code - long factor; - double value; -} s_smpi_factor_t; +std::vector smpi_bw_factor; +std::vector smpi_lat_factor; xbt_dict_t gap_lookup = nullptr; -static int factor_cmp(const void *pa, const void *pb) -{ - return (((s_smpi_factor_t*)pa)->factor > ((s_smpi_factor_t*)pb)->factor) ? 1 : - (((s_smpi_factor_t*)pa)->factor < ((s_smpi_factor_t*)pb)->factor) ? -1 : 0; -} - -#include "src/surf/xml/platf.hpp" // FIXME: move that back to the parsing area -static xbt_dynar_t parse_factor(const char *smpi_coef_string) -{ - char *value = nullptr; - unsigned int iter = 0; - s_smpi_factor_t fact; - xbt_dynar_t smpi_factor, radical_elements, radical_elements2 = nullptr; - - smpi_factor = xbt_dynar_new(sizeof(s_smpi_factor_t), nullptr); - radical_elements = xbt_str_split(smpi_coef_string, ";"); - xbt_dynar_foreach(radical_elements, iter, value) { - - radical_elements2 = xbt_str_split(value, ":"); - surf_parse_assert(xbt_dynar_length(radical_elements2) == 2, - "Malformed radical '%s' for smpi factor. I was expecting something like 'a:b'", value); - - char *errmsg = bprintf("Invalid factor in chunk #%d: %%s", iter+1); - fact.factor = xbt_str_parse_int(xbt_dynar_get_as(radical_elements2, 0, char *), errmsg); - xbt_free(errmsg); - fact.value = xbt_str_parse_double(xbt_dynar_get_as(radical_elements2, 1, char *), errmsg); - errmsg = bprintf("Invalid factor value in chunk #%d: %%s", iter+1); - xbt_free(errmsg); - - xbt_dynar_push_as(smpi_factor, s_smpi_factor_t, fact); - XBT_DEBUG("smpi_factor:\t%ld : %f", fact.factor, fact.value); - xbt_dynar_free(&radical_elements2); - } - xbt_dynar_free(&radical_elements); - xbt_dynar_sort(smpi_factor, &factor_cmp); - xbt_dynar_foreach(smpi_factor, iter, fact) { - XBT_DEBUG("ordered smpi_factor:\t%ld : %f", fact.factor, fact.value); - - } - return smpi_factor; -} - /********* * Model * *********/ @@ -88,7 +40,7 @@ void surf_network_model_init_SMPI() if (surf_network_model) return; surf_network_model = new simgrid::surf::NetworkSmpiModel(); - xbt_dynar_push(all_existing_models, &surf_network_model); + all_existing_models->push_back(surf_network_model); xbt_cfg_setdefault_double("network/sender-gap", 10e-6); xbt_cfg_setdefault_double("network/weight-S", 8775); @@ -97,113 +49,48 @@ void surf_network_model_init_SMPI() namespace simgrid { namespace surf { - NetworkSmpiModel::NetworkSmpiModel() - : NetworkCm02Model() { - haveGap_=true; + NetworkSmpiModel::NetworkSmpiModel() : NetworkCm02Model() + { + haveGap_ = true; } - NetworkSmpiModel::~NetworkSmpiModel(){ - xbt_dict_free(&gap_lookup); - xbt_dynar_free(&smpi_bw_factor); - xbt_dynar_free(&smpi_lat_factor); - } - - void NetworkSmpiModel::gapAppend(double size, Link* link, NetworkAction *act) + NetworkSmpiModel::~NetworkSmpiModel() { - const char *src = link->getName(); - xbt_fifo_t fifo; - NetworkCm02Action *action= static_cast(act); - - if (sg_sender_gap > 0.0) { - if (!gap_lookup) { - gap_lookup = xbt_dict_new_homogeneous(nullptr); - } - fifo = (xbt_fifo_t) xbt_dict_get_or_null(gap_lookup, src); - action->senderGap_ = 0.0; - if (fifo && xbt_fifo_size(fifo) > 0) { - /* Compute gap from last send */ - /*last_action = - (surf_action_network_CM02_t) - xbt_fifo_get_item_content(xbt_fifo_get_last_item(fifo));*/ - // bw = net_get_link_bandwidth(link); - action->senderGap_ = sg_sender_gap; - /* max(sg_sender_gap,last_action->sender.size / bw);*/ - action->latency_ += action->senderGap_; - } - /* Append action as last send */ - /*action->sender.link_name = link->lmm_resource.generic_resource.name; - fifo = - (xbt_fifo_t) xbt_dict_get_or_null(gap_lookup, - action->sender.link_name); - if (!fifo) { - fifo = xbt_fifo_new(); - xbt_dict_set(gap_lookup, action->sender.link_name, fifo, nullptr); - } - action->sender.fifo_item = xbt_fifo_push(fifo, action);*/ - action->senderSize_ = size; - } - } - - 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_); - xbt_fifo_remove_item(fifo, action->senderFifoItem_); - size = xbt_fifo_size(fifo); - if (size == 0) { - xbt_fifo_free(fifo); - xbt_dict_remove(gap_lookup, action->senderLinkName_); - size = xbt_dict_length(gap_lookup); - if (size == 0) { - xbt_dict_free(&gap_lookup); - } - } - } + xbt_dict_free(&gap_lookup); } double NetworkSmpiModel::bandwidthFactor(double size) { - if (!smpi_bw_factor) + if (smpi_bw_factor.empty()) smpi_bw_factor = parse_factor(xbt_cfg_get_string("smpi/bw-factor")); - unsigned int iter = 0; - s_smpi_factor_t fact; - double current=1.0; - xbt_dynar_foreach(smpi_bw_factor, iter, fact) { + double current = 1.0; + for (const auto& fact : smpi_bw_factor) { if (size <= fact.factor) { - XBT_DEBUG("%f <= %ld return %f", size, fact.factor, current); + XBT_DEBUG("%f <= %zu return %f", size, fact.factor, current); return current; - }else - current=fact.value; + } else + current = fact.values.front(); } - XBT_DEBUG("%f > %ld return %f", size, fact.factor, current); + XBT_DEBUG("%f > %zu return %f", size, smpi_bw_factor.back().factor, current); return current; } double NetworkSmpiModel::latencyFactor(double size) { - if (!smpi_lat_factor) + if (smpi_lat_factor.empty()) smpi_lat_factor = parse_factor(xbt_cfg_get_string("smpi/lat-factor")); - unsigned int iter = 0; - s_smpi_factor_t fact; double current=1.0; - xbt_dynar_foreach(smpi_lat_factor, iter, fact) { + for (const auto& fact : smpi_lat_factor) { if (size <= fact.factor) { - XBT_DEBUG("%f <= %ld return %f", size, fact.factor, current); + XBT_DEBUG("%f <= %zu return %f", size, fact.factor, current); return current; }else - current=fact.value; + current=fact.values.front(); } - XBT_DEBUG("%f > %ld return %f", size, fact.factor, current); + XBT_DEBUG("%f > %zu return %f", size, smpi_lat_factor.back().factor, current); return current; }