X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/2c4b9b084f2dfb0b9e34bee11e1bc012ea13ad95..bf2c5d4d8474e3d5d414f1b722716128f43ad4d2:/src/surf/network.c diff --git a/src/surf/network.c b/src/surf/network.c index ed1db7b010..e295c736cb 100644 --- a/src/surf/network.c +++ b/src/surf/network.c @@ -122,14 +122,17 @@ static double smpi_bandwidth_factor(double size) unsigned int iter = 0; s_smpi_factor_t fact; + double current=1.0; xbt_dynar_foreach(smpi_bw_factor, iter, fact) { - if (size >= fact.factor) { - XBT_DEBUG("%lf >= %ld return %f", size, fact.factor, fact.value); - return fact.value; - } + if (size <= fact.factor) { + XBT_DEBUG("%lf <= %ld return %f", size, fact.factor, current); + return current; + }else + current=fact.value; } + XBT_DEBUG("%lf > %ld return %f", size, fact.factor, current); - return 1.0; + return current; } static double smpi_latency_factor(double size) @@ -140,14 +143,17 @@ static double smpi_latency_factor(double size) unsigned int iter = 0; s_smpi_factor_t fact; + double current=1.0; xbt_dynar_foreach(smpi_lat_factor, iter, fact) { - if (size >= fact.factor) { - XBT_DEBUG("%lf >= %ld return %f", size, fact.factor, fact.value); - return fact.value; - } + if (size <= fact.factor) { + XBT_DEBUG("%lf <= %ld return %f", size, fact.factor, current); + return current; + }else + current=fact.value; } + XBT_DEBUG("%lf > %ld return %f", size, fact.factor, current); - return 1.0; + return current; } /**--------- -----------*/