1
1

Remove some unnecessary code, probably dating back to before we had

generalized component include/exclude infrastructure.  This commit
removes the oob_base_include and oob_base_exclude MCA params because
they have long-since been handled by the "oob" MCA parameter in the
MCA base.

This commit was SVN r14979.
Этот коммит содержится в:
Jeff Squyres 2007-06-10 14:16:05 +00:00
родитель d3c01a6978
Коммит 9fb2e807a9
3 изменённых файлов: 1 добавлений и 49 удалений

Просмотреть файл

@ -63,11 +63,6 @@ int mca_oob_base_close(void)
OBJ_DESTRUCT(&mca_oob_base_components);
OBJ_DESTRUCT(&mca_oob_base_exception_handlers);
if( NULL != mca_oob_base_include )
free(mca_oob_base_include);
if( NULL != mca_oob_base_exclude )
free(mca_oob_base_exclude);
/* All done */
orte_oob_base_already_opened = false;

Просмотреть файл

@ -9,6 +9,7 @@
* University of Stuttgart. All rights reserved.
* Copyright (c) 2004-2005 The Regents of the University of California.
* All rights reserved.
* Copyright (c) 2007 Cisco Systems, Inc. All rights reserved.
* $COPYRIGHT$
*
* Additional copyrights may follow
@ -102,9 +103,6 @@ int mca_oob_base_init(void)
mca_oob_t *s_module = NULL;
int s_priority = -1;
char** include = opal_argv_split(mca_oob_base_include, ',');
char** exclude = opal_argv_split(mca_oob_base_exclude, ',');
/* Traverse the list of available modules; call their init functions. */
for (item = opal_list_get_first(&mca_oob_base_components);
item != opal_list_get_end(&mca_oob_base_components);
@ -114,38 +112,6 @@ int mca_oob_base_init(void)
cli = (mca_base_component_list_item_t *) item;
component = (mca_oob_base_component_t *) cli->cli_component;
/* if there is an include list - item must be in the list to be included */
if ( NULL != include ) {
char** argv = include;
bool found = false;
while(argv && *argv) {
if(strcmp(component->oob_base.mca_component_name,*argv) == 0) {
found = true;
break;
}
argv++;
}
if(found == false) {
continue;
}
/* otherwise - check the exclude list to see if this item has been specifically excluded */
} else if ( NULL != exclude ) {
char** argv = exclude;
bool found = false;
while(argv && *argv) {
if(strcmp(component->oob_base.mca_component_name,*argv) == 0) {
found = true;
break;
}
argv++;
}
if(found == true) {
continue;
}
}
if (NULL == component->oob_init) {
opal_output_verbose(10, mca_oob_base_output, "mca_oob_base_init: no init function; ignoring component");
} else {

Просмотреть файл

@ -44,8 +44,6 @@
*/
mca_oob_t mca_oob;
int mca_oob_base_output = -1;
char* mca_oob_base_include = NULL;
char* mca_oob_base_exclude = NULL;
opal_list_t mca_oob_base_components;
opal_list_t mca_oob_base_modules;
opal_list_t mca_oob_base_exception_handlers;
@ -92,13 +90,6 @@ int mca_oob_base_open(void)
}
/* register parameters */
mca_base_param_reg_string_name("oob", "base_include",
"Components to include for oob framework selection",
false, false, NULL, &mca_oob_base_include);
mca_base_param_reg_string_name("oob", "base_exclude",
"Components to exclude for oob framework selection",
false, false, NULL, &mca_oob_base_exclude);
param = mca_base_param_reg_int_name("orte", "timing",
"Request that critical timing loops be measured",
false, false, 0, &value);