From 3d94612c68def9c6d9d1fddb5ab69411a189540e Mon Sep 17 00:00:00 2001 From: Augustin Degomme Date: Thu, 27 Sep 2012 10:53:39 +0200 Subject: [PATCH] the smpi factor parsing was still returning wrong values --- src/surf/network.c | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/src/surf/network.c b/src/surf/network.c index ed1db7b010..5bc5bab36f 100644 --- a/src/surf/network.c +++ b/src/surf/network.c @@ -122,9 +122,10 @@ static double smpi_bandwidth_factor(double size) unsigned int iter = 0; s_smpi_factor_t fact; + xbt_dynar_foreach(smpi_bw_factor, iter, fact) { - if (size >= fact.factor) { - XBT_DEBUG("%lf >= %ld return %f", size, fact.factor, fact.value); + if (size < fact.factor) { + XBT_DEBUG("%lf < %ld return %f", size, fact.factor, fact.value); return fact.value; } } @@ -140,11 +141,13 @@ static double smpi_latency_factor(double size) unsigned int iter = 0; s_smpi_factor_t fact; + xbt_dynar_foreach(smpi_lat_factor, iter, fact) { - if (size >= fact.factor) { - XBT_DEBUG("%lf >= %ld return %f", size, fact.factor, fact.value); + if (size < fact.factor) { + XBT_DEBUG("%lf < %ld return %f", size, fact.factor, fact.value); return fact.value; } + } return 1.0; -- 2.20.1