// 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;
- std::vector<double> values; /** We allocate arbitrarily 4 elements **/
+ size_t factor=0;
+ std::vector<double> values;
} s_smpi_factor_multival_t;
std::vector<s_smpi_factor_multival_t> smpi_os_values;
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"));
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 %f", 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"));
// 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 %f", 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"));
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 %f", size, current);
return current;
}
{
xbt_dynar_t comms;
int i;
- int* map;
int flag = 0;
- int size = 0;
*index = MPI_UNDEFINED;
comms = xbt_dynar_new(sizeof(smx_synchro_t), nullptr);
- map = xbt_new(int, count);
+ std::vector<int> map; /** Maps all matching comms back to their location in requests **/
for(i = 0; i < count; i++) {
if ((requests[i] != MPI_REQUEST_NULL) && requests[i]->action && !(requests[i]->flags & PREPARED)) {
xbt_dynar_push(comms, &requests[i]->action);
- map[size] = i;
- size++;
+ map.push_back(i);
}
}
- if(size > 0) {
+ if(!map.empty()) {
//multiplier to the sleeptime, to increase speed of execution, each failed testany will increase it
static int nsleeps = 1;
if(smpi_test_sleep > 0)
simcall_process_sleep(nsleeps*smpi_test_sleep);
- i = simcall_comm_testany(comms);
- // not MPI_UNDEFINED, as this is a simix return code
- if(i != -1) {
- *index = map[i];
+ i = simcall_comm_testany(comms); // The i-th element in comms matches!
+ if (i != -1) { // -1 is not MPI_UNDEFINED but a SIMIX return code. (nothing matches)
+ *index = map[i];
finish_wait(&requests[*index], status);
- if (requests[*index] != MPI_REQUEST_NULL && (requests[*index]->flags & NON_PERSISTENT))
- requests[*index] = MPI_REQUEST_NULL;
flag = 1;
nsleeps = 1;
- }else{
+ if (requests[*index] != MPI_REQUEST_NULL && (requests[*index]->flags & NON_PERSISTENT)) {
+ requests[*index] = MPI_REQUEST_NULL;
+ }
+ } else {
nsleeps++;
}
- }else{
+ } else {
//all requests are null or inactive, return true
- flag=1;
+ flag = 1;
smpi_empty_status(status);
}
- xbt_free(map);
xbt_dynar_free(&comms);
return flag;