Make ompi_info correctly display "filter" components
This commit was SVN r18435.
Этот коммит содержится в:
родитель
e7ecd56bd2
Коммит
fb17097de4
@ -9,7 +9,7 @@
|
||||
// University of Stuttgart. All rights reserved.
|
||||
// Copyright (c) 2004-2005 The Regents of the University of California.
|
||||
// All rights reserved.
|
||||
// Copyright (c) 2006 Cisco Systems, Inc. All rights reserved.
|
||||
// Copyright (c) 2006-2008 Cisco Systems, Inc. All rights reserved.
|
||||
// $COPYRIGHT$
|
||||
//
|
||||
// Additional copyrights may follow
|
||||
@ -53,6 +53,8 @@
|
||||
#endif
|
||||
#include "opal/runtime/opal.h"
|
||||
#include "opal/dss/dss.h"
|
||||
#include "opal/mca/filter/filter.h"
|
||||
#include "opal/mca/filter/base/base.h"
|
||||
|
||||
#include "ompi/mca/allocator/allocator.h"
|
||||
#include "ompi/mca/allocator/base/base.h"
|
||||
@ -197,6 +199,9 @@ void ompi_info::open_components()
|
||||
|
||||
// OPAL frameworks
|
||||
|
||||
opal_filter_base_open();
|
||||
component_map["filter"] = &opal_filter_base_components_available;
|
||||
|
||||
opal_backtrace_base_open();
|
||||
component_map["backtrace"] = &opal_backtrace_base_components_opened;
|
||||
|
||||
@ -206,7 +211,6 @@ void ompi_info::open_components()
|
||||
opal_memchecker_base_open();
|
||||
component_map["memchecker"] = &opal_memchecker_base_components_opened;
|
||||
|
||||
|
||||
opal_paffinity_base_open();
|
||||
component_map["paffinity"] = &opal_paffinity_base_components_opened;
|
||||
|
||||
@ -389,6 +393,7 @@ void ompi_info::close_components()
|
||||
#if OPAL_ENABLE_FT == 1
|
||||
opal_crs_base_close();
|
||||
#endif
|
||||
|
||||
// Do not call OPAL's installdirs close; it will be handled in
|
||||
// opal_finalize_util().
|
||||
|
||||
|
@ -9,7 +9,7 @@
|
||||
// University of Stuttgart. All rights reserved.
|
||||
// Copyright (c) 2004-2005 The Regents of the University of California.
|
||||
// All rights reserved.
|
||||
// Copryight (c) 2007 Cisco Systems, Inc. All rights reserved.
|
||||
// Copryight (c) 2007-2008 Cisco Systems, Inc. All rights reserved.
|
||||
// $COPYRIGHT$
|
||||
//
|
||||
// Additional copyrights may follow
|
||||
@ -179,6 +179,7 @@ int main(int argc, char *argv[])
|
||||
ompi_info::mca_types.push_back("orte");
|
||||
ompi_info::mca_types.push_back("opal");
|
||||
|
||||
ompi_info::mca_types.push_back("filter");
|
||||
ompi_info::mca_types.push_back("backtrace");
|
||||
ompi_info::mca_types.push_back("memchecker");
|
||||
ompi_info::mca_types.push_back("memory");
|
||||
|
@ -10,6 +10,7 @@
|
||||
* Copyright (c) 2004-2005 The Regents of the University of California.
|
||||
* All rights reserved.
|
||||
* Copyright (c) 2007 Evergrid, Inc. All rights reserved.
|
||||
* Copyright (c) 2008 Cisco Systems, Inc. All rights reserved.
|
||||
*
|
||||
* $COPYRIGHT$
|
||||
*
|
||||
@ -66,9 +67,9 @@ OPAL_DECLSPEC int opal_filter_base_close(void);
|
||||
/**** No-op base functions ****/
|
||||
OPAL_DECLSPEC char* opal_filter_base_process(char *str, int major_id, int minor_id, int num_tags, char **tags);
|
||||
|
||||
extern int opal_filter_base_output;
|
||||
extern opal_list_t opal_filter_base_components_available;
|
||||
extern opal_filter_base_component_t opal_filter_base_selected_component;
|
||||
OPAL_DECLSPEC extern int opal_filter_base_output;
|
||||
OPAL_DECLSPEC extern opal_list_t opal_filter_base_components_available;
|
||||
OPAL_DECLSPEC extern opal_filter_base_component_t opal_filter_base_selected_component;
|
||||
|
||||
END_C_DECLS
|
||||
|
||||
|
Загрузка…
Ссылка в новой задаче
Block a user