|
2 | 2 | * Copyright (c) 2004-2005 The Trustees of Indiana University and Indiana |
3 | 3 | * University Research and Technology |
4 | 4 | * Corporation. All rights reserved. |
5 | | - * Copyright (c) 2004-2005 The University of Tennessee and The University |
| 5 | + * Copyright (c) 2004-2017 The University of Tennessee and The University |
6 | 6 | * of Tennessee Research Foundation. All rights |
7 | 7 | * reserved. |
8 | 8 | * Copyright (c) 2004-2005 High Performance Computing Center Stuttgart, |
|
46 | 46 | static int init_query(const mca_base_component_t * ls, |
47 | 47 | bool enable_progress_threads, |
48 | 48 | bool enable_mpi_threads); |
49 | | -static int init_query_2_0_0(const mca_base_component_t * ls, |
50 | | - bool enable_progress_threads, |
51 | | - bool enable_mpi_threads); |
52 | 49 |
|
53 | 50 | /* |
54 | 51 | * Scan down the list of successfully opened components and query each of |
@@ -105,6 +102,20 @@ int mca_coll_base_find_available(bool enable_progress_threads, |
105 | 102 | } |
106 | 103 |
|
107 | 104 |
|
| 105 | +/* |
| 106 | + * Query a specific component, coll v2.0.0 |
| 107 | + */ |
| 108 | +static inline int |
| 109 | +init_query_2_0_0(const mca_base_component_t * component, |
| 110 | + bool enable_progress_threads, |
| 111 | + bool enable_mpi_threads) |
| 112 | +{ |
| 113 | + mca_coll_base_component_2_0_0_t *coll = |
| 114 | + (mca_coll_base_component_2_0_0_t *) component; |
| 115 | + |
| 116 | + return coll->collm_init_query(enable_progress_threads, |
| 117 | + enable_mpi_threads); |
| 118 | +} |
108 | 119 | /* |
109 | 120 | * Query a component, see if it wants to run at all. If it does, save |
110 | 121 | * some information. If it doesn't, close it. |
@@ -138,33 +149,11 @@ static int init_query(const mca_base_component_t * component, |
138 | 149 | } |
139 | 150 |
|
140 | 151 | /* Query done -- look at the return value to see what happened */ |
141 | | - |
142 | | - if (OMPI_SUCCESS != ret) { |
143 | | - opal_output_verbose(10, ompi_coll_base_framework.framework_output, |
144 | | - "coll:find_available: coll component %s is not available", |
145 | | - component->mca_component_name); |
146 | | - } else { |
147 | | - opal_output_verbose(10, ompi_coll_base_framework.framework_output, |
148 | | - "coll:find_available: coll component %s is available", |
149 | | - component->mca_component_name); |
150 | | - } |
151 | | - |
152 | | - /* All done */ |
| 152 | + opal_output_verbose(10, ompi_coll_base_framework.framework_output, |
| 153 | + "coll:find_available: coll component %s is %savailable", |
| 154 | + component->mca_component_name, |
| 155 | + (OMPI_SUCCESS == ret) ? "": "not "); |
153 | 156 |
|
154 | 157 | return ret; |
155 | 158 | } |
156 | 159 |
|
157 | | - |
158 | | -/* |
159 | | - * Query a specific component, coll v2.0.0 |
160 | | - */ |
161 | | -static int init_query_2_0_0(const mca_base_component_t * component, |
162 | | - bool enable_progress_threads, |
163 | | - bool enable_mpi_threads) |
164 | | -{ |
165 | | - mca_coll_base_component_2_0_0_t *coll = |
166 | | - (mca_coll_base_component_2_0_0_t *) component; |
167 | | - |
168 | | - return coll->collm_init_query(enable_progress_threads, |
169 | | - enable_mpi_threads); |
170 | | -} |
0 commit comments