1.1 --- a/ompi/mca/allocator/base/allocator_base_close.c Mon Nov 12 22:30:32 2012 +0000
1.2 +++ b/ompi/mca/allocator/base/allocator_base_close.c Tue Nov 13 07:14:41 2012 +0000
1.3 @@ -36,15 +36,9 @@
1.4 /* Close all remaining available modules (may be one if this is a
1.5 OMPI RTE program, or [possibly] multiple if this is ompi_info) */
1.6
1.7 - mca_base_components_close(mca_allocator_base_output,
1.8 - &mca_allocator_base_components, NULL);
1.9 -
1.10 - /* Close the framework output */
1.11 - opal_output_close (mca_allocator_base_output);
1.12 - mca_allocator_base_output = -1;
1.13 + mca_base_components_close(0, &mca_allocator_base_components, NULL);
1.14
1.15 /* All done */
1.16 -
1.17 return OMPI_SUCCESS;
1.18 }
1.19
2.1 --- a/ompi/mca/allocator/base/allocator_base_open.c Mon Nov 12 22:30:32 2012 +0000
2.2 +++ b/ompi/mca/allocator/base/allocator_base_open.c Tue Nov 13 07:14:41 2012 +0000
2.3 @@ -40,7 +40,6 @@
2.4 * Global variables
2.5 */
2.6 opal_list_t mca_allocator_base_components;
2.7 -int mca_allocator_base_output = -1;
2.8
2.9 /**
2.10 * Function for finding and opening either all MCA components, or the one
3.1 --- a/ompi/mca/coll/base/coll_base_close.c Mon Nov 12 22:30:32 2012 +0000
3.2 +++ b/ompi/mca/coll/base/coll_base_close.c Tue Nov 13 07:14:41 2012 +0000
3.3 @@ -24,7 +24,7 @@
3.4 #include "opal/mca/mca.h"
3.5 #include "opal/mca/base/base.h"
3.6 #include "ompi/mca/coll/base/base.h"
3.7 -
3.8 +#include "opal/util/output.h"
3.9
3.10 int mca_coll_base_close(void)
3.11 {
4.1 --- a/ompi/mca/op/base/op_base_close.c Mon Nov 12 22:30:32 2012 +0000
4.2 +++ b/ompi/mca/op/base/op_base_close.c Tue Nov 13 07:14:41 2012 +0000
4.3 @@ -25,7 +25,7 @@
4.4 #include "ompi/constants.h"
4.5 #include "ompi/mca/op/op.h"
4.6 #include "ompi/mca/op/base/base.h"
4.7 -
4.8 +#include "opal/util/output.h"
4.9
4.10 int ompi_op_base_close(void)
4.11 {
5.1 --- a/ompi/mca/pubsub/base/pubsub_base_close.c Mon Nov 12 22:30:32 2012 +0000
5.2 +++ b/ompi/mca/pubsub/base/pubsub_base_close.c Tue Nov 13 07:14:41 2012 +0000
5.3 @@ -23,6 +23,7 @@
5.4
5.5 #include "ompi/mca/pubsub/pubsub.h"
5.6 #include "ompi/mca/pubsub/base/base.h"
5.7 +#include "opal/util/output.h"
5.8
5.9 int ompi_pubsub_base_close(void)
5.10 {
6.1 --- a/opal/mca/hwloc/base/hwloc_base_close.c Mon Nov 12 22:30:32 2012 +0000
6.2 +++ b/opal/mca/hwloc/base/hwloc_base_close.c Tue Nov 13 07:14:41 2012 +0000
6.3 @@ -14,6 +14,7 @@
6.4 #include "opal/mca/base/base.h"
6.5 #include "opal/mca/hwloc/hwloc.h"
6.6 #include "opal/mca/hwloc/base/base.h"
6.7 +#include "opal/util/output.h"
6.8
6.9 int opal_hwloc_base_close(void)
6.10 {
7.1 --- a/opal/mca/memchecker/base/memchecker_base_close.c Mon Nov 12 22:30:32 2012 +0000
7.2 +++ b/opal/mca/memchecker/base/memchecker_base_close.c Tue Nov 13 07:14:41 2012 +0000
7.3 @@ -15,6 +15,7 @@
7.4 #include "opal/mca/base/base.h"
7.5 #include "opal/mca/memchecker/base/base.h"
7.6 #include "opal/mca/memchecker/memchecker.h"
7.7 +#include "opal/util/output.h"
7.8
7.9 int opal_memchecker_base_close(void)
7.10 {
8.1 --- a/opal/mca/pstat/base/pstat_base_close.c Mon Nov 12 22:30:32 2012 +0000
8.2 +++ b/opal/mca/pstat/base/pstat_base_close.c Tue Nov 13 07:14:41 2012 +0000
8.3 @@ -24,6 +24,7 @@
8.4 #include "opal/mca/base/base.h"
8.5 #include "opal/mca/pstat/pstat.h"
8.6 #include "opal/mca/pstat/base/base.h"
8.7 +#include "opal/util/output.h"
8.8
8.9 int opal_pstat_base_close(void)
8.10 {
9.1 --- a/opal/mca/shmem/base/shmem_base_close.c Mon Nov 12 22:30:32 2012 +0000
9.2 +++ b/opal/mca/shmem/base/shmem_base_close.c Tue Nov 13 07:14:41 2012 +0000
9.3 @@ -26,6 +26,7 @@
9.4 #include "opal/mca/base/base.h"
9.5 #include "opal/mca/shmem/shmem.h"
9.6 #include "opal/mca/shmem/base/base.h"
9.7 +#include "opal/util/output.h"
9.8
9.9 /* ////////////////////////////////////////////////////////////////////////// */
9.10 int