// These are taken from surf/network.c and generalized to have more values for each factor
typedef struct s_smpi_factor_multival *smpi_os_factor_multival_t;
typedef struct s_smpi_factor_multival { // FIXME: this should be merged (deduplicated) with s_smpi_factor defined in network_smpi.c
- long factor=0;
+ size_t factor=0;
std::vector<double> values;
} s_smpi_factor_multival_t;
static simgrid::config::Flag<double> smpi_test_sleep(
"smpi/test", "Minimum time to inject inside a call to MPI_Test", 1e-4);
-static int factor_cmp(const s_smpi_factor_multival_t& pa, const s_smpi_factor_multival_t& pb)
+static bool factor_cmp(const s_smpi_factor_multival_t& pa, const s_smpi_factor_multival_t& pb)
{
- return (pa.factor > pb.factor) ? 1 :
- (pa.factor < pb.factor) ? -1 : 0;
+ return (pa.factor < pb.factor);
}
static std::vector<s_smpi_factor_multival_t> parse_factor(const char *smpi_coef_string)
{
std::vector<s_smpi_factor_multival_t> smpi_factor;
- s_smpi_factor_multival_t fact;
/** Setup the tokenizer that parses the string **/
typedef boost::tokenizer<boost::char_separator<char>> Tokenizer;
*/
for (Tokenizer::iterator token_iter = tokens.begin();
token_iter != tokens.end(); token_iter++) {
+XBT_DEBUG("token : %s", token_iter->c_str());
Tokenizer factor_values(*token_iter, factor_separator);
-
+ s_smpi_factor_multival_t fact;
if (factor_values.begin() == factor_values.end()) {
xbt_die("Malformed radical for smpi factor: '%s'", smpi_coef_string);
}
}
else {
errmsg = bprintf("Invalid factor value %d in chunk #%zu: %%s", iteration, smpi_factor.size()+1);
- fact.values.push_back(xbt_str_parse_double((*factor_iter).c_str(), errmsg));
+ fact.values.push_back(xbt_str_parse_double(factor_iter->c_str(), errmsg));
}
xbt_free(errmsg);
}
return smpi_factor;
}
-static double smpi_os(double size)
+static double smpi_os(size_t size)
{
if (smpi_os_values.empty()) {
smpi_os_values = parse_factor(xbt_cfg_get_string("smpi/os"));
}
- double current=0.0;
+ double current=smpi_os_values.empty()?0.0:smpi_os_values[0].values[0]+smpi_os_values[0].values[1]*size;
// Iterate over all the sections that were specified and find the right
// value. (fact.factor represents the interval sizes; we want to find the
// section that has fact.factor <= size and no other such fact.factor <= size)
for (auto& fact : smpi_os_values) {
if (size <= fact.factor) { // Values already too large, use the previously
// computed value of current!
- XBT_DEBUG("os : %f <= %ld return %f", size, fact.factor, current);
+ XBT_DEBUG("os : %zu <= %ld return %.10f", size, fact.factor, current);
return current;
}else{
// If the next section is too large, the current section must be used.
current = fact.values[0]+fact.values[1]*size;
}
}
- XBT_DEBUG("Searching for smpi/os: %f is larger than the largest boundary, return %f", size, current);
+ XBT_DEBUG("Searching for smpi/os: %zu is larger than the largest boundary, return %.10f", size, current);
return current;
}
-static double smpi_ois(double size)
+static double smpi_ois(size_t size)
{
if (smpi_ois_values.empty()) {
smpi_ois_values = parse_factor(xbt_cfg_get_string("smpi/ois"));
}
- double current=0.0;
+ double current=smpi_ois_values.empty()?0.0:smpi_ois_values[0].values[0]+smpi_ois_values[0].values[1]*size;
// Iterate over all the sections that were specified and find the right value. (fact.factor represents the interval
// sizes; we want to find the section that has fact.factor <= size and no other such fact.factor <= size)
// Note: parse_factor() (used before) already sorts the dynar we iterate over!
for (auto& fact : smpi_ois_values) {
if (size <= fact.factor) { // Values already too large, use the previously computed value of current!
- XBT_DEBUG("ois : %f <= %ld return %f", size, fact.factor, current);
+ XBT_DEBUG("ois : %zu <= %ld return %.10f", size, fact.factor, current);
return current;
}else{
// If the next section is too large, the current section must be used.
current = fact.values[0]+fact.values[1]*size;
}
}
- XBT_DEBUG("Searching for smpi/ois: %f is larger than the largest boundary, return %f", size, current);
+ XBT_DEBUG("Searching for smpi/ois: %zu is larger than the largest boundary, return %.10f", size, current);
return current;
}
-static double smpi_or(double size)
+static double smpi_or(size_t size)
{
if (smpi_or_values.empty()) {
smpi_or_values = parse_factor(xbt_cfg_get_string("smpi/or"));
}
- double current=0.0;
+
+ double current=smpi_or_values.empty()?0.0:smpi_or_values.front().values[0]+smpi_or_values.front().values[1]*size;
+
// Iterate over all the sections that were specified and find the right value. (fact.factor represents the interval
// sizes; we want to find the section that has fact.factor <= size and no other such fact.factor <= size)
// Note: parse_factor() (used before) already sorts the dynar we iterate over!
for (auto fact : smpi_or_values) {
if (size <= fact.factor) { // Values already too large, use the previously
// computed value of current!
- XBT_DEBUG("or : %f <= %ld return %f", size, fact.factor, current);
+ XBT_DEBUG("or : %zu <= %ld return %.10f", size, fact.factor, current);
return current;
} else {
// If the next section is too large, the current section must be used.
current=fact.values[0]+fact.values[1]*size;
}
}
- XBT_DEBUG("smpi_or: %f is larger than largest boundary, return %f", size, current);
+ XBT_DEBUG("smpi_or: %zu is larger than largest boundary, return %.10f", size, current);
return current;
}
nsleeps++;
}
} else {
- flag = 0; // all requests are null or inactive, return false
+ //all requests are null or inactive, return true
+ flag = 1;
smpi_empty_status(status);
}
xbt_dynar_free(&comms);
