From 97fad1dd9507ce474c0343b02f1416dc2522b236 Mon Sep 17 00:00:00 2001
From: Nathan Hjelm <hjelmn@lanl.gov>
Date: Wed, 30 Jul 2014 17:45:23 +0000
Subject: [PATCH] mca/base: ensure component version parameters get
deregistered when the component gets dlclosed
cmr=v1.8.2:reviewer=rhc
This commit was SVN r32359.
---
opal/mca/base/mca_base_components_register.c | 24 ++++++++++----------
1 file changed, 12 insertions(+), 12 deletions(-)
diff --git a/opal/mca/base/mca_base_components_register.c b/opal/mca/base/mca_base_components_register.c
index 0fbc537bd0..7c7743ac22 100644
--- a/opal/mca/base/mca_base_components_register.c
+++ b/opal/mca/base/mca_base_components_register.c
@@ -156,18 +156,18 @@ static int register_components(const char *project_name, const char *type_name,
}
/* Register this component's version */
- mca_base_var_register (project_name, type_name, component->mca_component_name, "major_version",
- NULL, MCA_BASE_VAR_TYPE_INT, NULL, 0, MCA_BASE_VAR_FLAG_DEFAULT_ONLY |
- MCA_BASE_VAR_FLAG_INTERNAL, OPAL_INFO_LVL_9, MCA_BASE_VAR_SCOPE_CONSTANT,
- &component->mca_component_major_version);
- mca_base_var_register (project_name, type_name, component->mca_component_name, "minor_version",
- NULL, MCA_BASE_VAR_TYPE_INT, NULL, 0, MCA_BASE_VAR_FLAG_DEFAULT_ONLY |
- MCA_BASE_VAR_FLAG_INTERNAL, OPAL_INFO_LVL_9, MCA_BASE_VAR_SCOPE_CONSTANT,
- &component->mca_component_minor_version);
- mca_base_var_register (project_name, type_name, component->mca_component_name, "release_version",
- NULL, MCA_BASE_VAR_TYPE_INT, NULL, 0, MCA_BASE_VAR_FLAG_DEFAULT_ONLY |
- MCA_BASE_VAR_FLAG_INTERNAL, OPAL_INFO_LVL_9, MCA_BASE_VAR_SCOPE_CONSTANT,
- &component->mca_component_release_version);
+ mca_base_component_var_register (component, "major_version", NULL, MCA_BASE_VAR_TYPE_INT, NULL,
+ 0, MCA_BASE_VAR_FLAG_DEFAULT_ONLY | MCA_BASE_VAR_FLAG_INTERNAL,
+ OPAL_INFO_LVL_9, MCA_BASE_VAR_SCOPE_CONSTANT,
+ &component->mca_component_major_version);
+ mca_base_component_var_register (component, "minor_version", NULL, MCA_BASE_VAR_TYPE_INT, NULL,
+ 0, MCA_BASE_VAR_FLAG_DEFAULT_ONLY | MCA_BASE_VAR_FLAG_INTERNAL,
+ OPAL_INFO_LVL_9, MCA_BASE_VAR_SCOPE_CONSTANT,
+ &component->mca_component_minor_version);
+ mca_base_component_var_register (component, "release_version", NULL, MCA_BASE_VAR_TYPE_INT, NULL,
+ 0, MCA_BASE_VAR_FLAG_DEFAULT_ONLY | MCA_BASE_VAR_FLAG_INTERNAL,
+ OPAL_INFO_LVL_9, MCA_BASE_VAR_SCOPE_CONSTANT,
+ &component->mca_component_release_version);
opal_list_append(dest, item);
}