Skip to content

Commit 94851e4

Browse files
committed
mca/base: use project name for MCA groups and performance variables
1 parent 6d1a416 commit 94851e4

File tree

2 files changed

+4
-12
lines changed

2 files changed

+4
-12
lines changed

opal/mca/base/mca_base_pvar.c

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -328,11 +328,11 @@ int mca_base_component_pvar_register (const mca_base_component_t *component, con
328328
int bind, mca_base_pvar_flag_t flags, mca_base_get_value_fn_t get_value,
329329
mca_base_set_value_fn_t set_value, mca_base_notify_fn_t notify, void *ctx)
330330
{
331-
/* XXX -- component_update -- We will stash the project name in the component */
332331
/* invalidate this variable if the component's group is deregistered */
333-
return mca_base_pvar_register(NULL, component->mca_type_name, component->mca_component_name,
334-
name, description, verbosity, var_class, type, enumerator, bind,
335-
flags | MCA_BASE_PVAR_FLAG_IWG, get_value, set_value, notify, ctx);
332+
return mca_base_pvar_register(component->mca_project_name, component->mca_type_name,
333+
component->mca_component_name, name, description, verbosity, var_class,
334+
type, enumerator, bind, flags | MCA_BASE_PVAR_FLAG_IWG, get_value,
335+
set_value, notify, ctx);
336336
}
337337

338338
static int mca_base_pvar_get_internal (int index, mca_base_pvar_t **pvar, bool invalidok)

opal/mca/base/mca_base_var_group.c

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -154,9 +154,6 @@ static int group_find (const char *project_name, const char *framework_name,
154154
return OPAL_ERR_NOT_FOUND;
155155
}
156156

157-
/* TODO -- deal with the project name correctly (including the wildcard '*') */
158-
project_name = NULL;
159-
160157
ret = mca_base_var_generate_full_name4(project_name, framework_name, component_name,
161158
NULL, &full_name);
162159
if (OPAL_SUCCESS != ret) {
@@ -181,11 +178,6 @@ static int group_register (const char *project_name, const char *framework_name,
181178
return -1;
182179
}
183180

184-
/* XXX -- remove this once the project name is available in the component structure */
185-
if (framework_name || component_name) {
186-
project_name = NULL;
187-
}
188-
189181
group_id = group_find (project_name, framework_name, component_name, true);
190182
if (0 <= group_id) {
191183
(void) mca_base_var_group_get_internal (group_id, &group, true);

0 commit comments

Comments
 (0)