ports/openmpi
ports/openmpi
1
1
Форкнуть 0
Код Релизы Активность

Per this thread:

Просмотр исходного кода 
http://www.open-mpi.org/community/lists/devel/2011/10/9878.php

I am making a final decision to decide the behavior of what happens
when an MCA parameter is re-registered and changes types.  In
developer builds (i.e., OPAL_ENABLE_DEBUG==1), a show_help message
will be displayed.  In all builds, an error status will be returned.
Specifically, the logic looks like this:

{{{
    if (detect_re-registration_with_type_change) {
#if OPAL_ENABLE_DEBUG
        opal_show_help(...);
#endif
        return OPAL_ERR_VALUE_OUT_OF_BOUNDS;
    }
}}}

If someone would like to change this behavior, they are welcome to do
so.  :-) I am committing this so that ''some'' action occurs (rather
than talking about the issue and then nothing happens).

This commit was SVN r25432.
Этот коммит содержится в:
Jeff Squyres 2011-11-04 14:16:49 +00:00
родитель fb57a74a40
Коммит f08b8bf2d4
2 изменённых файлов: 26 добавлений и 88 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

8
opal/mca/base/help-mca-param.txt
Просмотреть файл

@ -52,3 +52,11 @@ parameters are supposed to affect.
Source of value: %s Source of value: %s
2nd MCA parameter: %s 2nd MCA parameter: %s
Source of value: %s Source of value: %s
#
[re-register with different type]
An MCA parameter was re-registered with a different type (i.e., it was
either originally registered as an INT and re-registered as a STRING,
or it was originially registered as a STRING and re-registered as an
INT). This a developer error; your job may abort.
MCA parameter name: %s

106
opal/mca/base/mca_base_param.c
Просмотреть файл

@ -43,6 +43,7 @@
#include "opal/constants.h" #include "opal/constants.h"
#include "opal/util/output.h" #include "opal/util/output.h"
#include "opal/util/opal_environ.h" #include "opal/util/opal_environ.h"
#include "opal/runtime/opal.h"
/* /*
* Local types * Local types
@ -1362,8 +1363,8 @@ static int param_register(const char *type_name,
for (i = 0; i < len; ++i) { for (i = 0; i < len; ++i) {
if (0 == strcmp(param.mbp_full_name, array[i].mbp_full_name)) { if (0 == strcmp(param.mbp_full_name, array[i].mbp_full_name)) {
/* We found an entry with the same param name. Check to see /* We found an entry with the same param name. Check to
if we're changing types */ ensure that we're not changing types */
/* Easy case: both are INT */ /* Easy case: both are INT */
if (MCA_BASE_PARAM_TYPE_INT == array[i].mbp_type && if (MCA_BASE_PARAM_TYPE_INT == array[i].mbp_type &&
@ -1424,93 +1425,22 @@ static int param_register(const char *type_name,
} }
} }
/* Original is INT, new is STRING */ /* If the original is INT and the new is STRING, or the original
is STRING and the new is INT, this is an OMPI developer
error. */
else if (MCA_BASE_PARAM_TYPE_INT == array[i].mbp_type && else if ((MCA_BASE_PARAM_TYPE_INT == array[i].mbp_type &&
MCA_BASE_PARAM_TYPE_STRING == param.mbp_type) { MCA_BASE_PARAM_TYPE_STRING == param.mbp_type) ||
if (NULL != default_value && (MCA_BASE_PARAM_TYPE_STRING == array[i].mbp_type &&
NULL != param.mbp_default_value.stringval) { MCA_BASE_PARAM_TYPE_INT == param.mbp_type)) {
array[i].mbp_default_value.stringval = #if OPAL_ENABLE_DEBUG
strdup(param.mbp_default_value.stringval); opal_show_help("help-mca-param.txt",
} else { "re-register with different type",
/* If the new STRING doesn't have a default value, we true, array[i].mbp_full_name);
must set the default value to "NULL" because it still #endif
contains the old INT default value (which may not /* Return an error code and hope for the best. */
compare equally to NULL) */ OBJ_DESTRUCT(&param);
array[i].mbp_default_value.stringval = NULL; return OPAL_ERR_VALUE_OUT_OF_BOUNDS;
}
if (NULL != file_value &&
NULL != param.mbp_file_value.stringval) {
array[i].mbp_file_value.stringval =
strdup(param.mbp_file_value.stringval);
array[i].mbp_file_value_set = true;
} else {
/* Similar to above, be sure to set the file default
value to NULL to ensure that it's not still set to a
non-NULL value from the prior INT default value */
array[i].mbp_file_value.stringval = NULL;
array[i].mbp_file_value_set = false;
}
if (NULL != override_value &&
NULL != param.mbp_override_value.stringval) {
array[i].mbp_override_value.stringval =
strdup(param.mbp_override_value.stringval);
array[i].mbp_override_value_set = true;
} else {
/* Similar to above, be sure to set the file default
value to NULL to ensure that it's not still set to a
non-NULL value from the prior INT default value */
array[i].mbp_file_value.stringval = NULL;
array[i].mbp_file_value_set = false;
}
array[i].mbp_type = param.mbp_type;
}
/* Original is STRING, new is INT */
else if (MCA_BASE_PARAM_TYPE_STRING == array[i].mbp_type &&
MCA_BASE_PARAM_TYPE_INT == param.mbp_type) {
/* Free the old STRING default value, if it exists */
if (NULL != array[i].mbp_default_value.stringval) {
free(array[i].mbp_default_value.stringval);
}
/* Set the new default value, or 0 if one wasn't provided */
if (NULL != default_value) {
array[i].mbp_default_value.intval =
param.mbp_default_value.intval;
} else {
array[i].mbp_default_value.intval = 0;
}
if (NULL != file_value) {
if (NULL != array[i].mbp_file_value.stringval) {
free(array[i].mbp_file_value.stringval);
}
array[i].mbp_file_value.intval =
param.mbp_file_value.intval;
array[i].mbp_file_value_set = true;
} else {
array[i].mbp_file_value.intval = 0;
array[i].mbp_file_value_set = false;
}
if (NULL != override_value) {
if (NULL != array[i].mbp_override_value.stringval) {
free(array[i].mbp_override_value.stringval);
}
array[i].mbp_override_value.intval =
param.mbp_override_value.intval;
array[i].mbp_override_value_set = true;
} else {
array[i].mbp_file_value.intval = 0;
array[i].mbp_file_value_set = false;
}
array[i].mbp_type = param.mbp_type;
} }
/* Now delete the newly-created entry (since we just saved the /* Now delete the newly-created entry (since we just saved the