Init locks in open() function. Init() function is not called from ompi_info and

we crash in close().

This commit was SVN r14568.

orte/mca/rmgr/proxy/rmgr_proxy_component.c

@@ -72,12 +72,6 @@ orte_rmgr_proxy_component_t mca_rmgr_proxy_component = {
   * component open/close/init function
   */
 static int orte_rmgr_proxy_open(void)
-{
-    return ORTE_SUCCESS;
-}
-
-
-static orte_rmgr_base_module_t *orte_rmgr_proxy_init(int* priority)
 {
     /* setup the locks - need to do this first so that we don't crash
      * when we close the component, even if we aren't selected
@@ -85,6 +79,12 @@ static orte_rmgr_base_module_t *orte_rmgr_proxy_init(int* priority)
     OBJ_CONSTRUCT(&mca_rmgr_proxy_component.lock, opal_mutex_t);
     OBJ_CONSTRUCT(&mca_rmgr_proxy_component.cond, opal_condition_t);
     
+    return ORTE_SUCCESS;
+}
+
+
+static orte_rmgr_base_module_t *orte_rmgr_proxy_init(int* priority)
+{
     /* if we are an HNP, then do NOT select us */
     if (orte_process_info.seed) {
         return NULL;

orte/mca/rmgr/urm/rmgr_urm_component.c

@@ -79,6 +79,12 @@ orte_rmgr_urm_component_t mca_rmgr_urm_component = {
   */
 static int orte_rmgr_urm_open(void)
 {
+    /* setup the locks - need to do this first so that we don't crash
+     * when we close the component, even if we aren't selected
+     */
+    OBJ_CONSTRUCT(&mca_rmgr_urm_component.lock, opal_mutex_t);
+    OBJ_CONSTRUCT(&mca_rmgr_urm_component.cond, opal_condition_t);
+    
     return ORTE_SUCCESS;
 }
 
@@ -86,12 +92,6 @@ static orte_rmgr_base_module_t *orte_rmgr_urm_init(int* priority)
 {
     int param, value;
     
-    /* setup the locks - need to do this first so that we don't crash
-     * when we close the component, even if we aren't selected
-     */
-    OBJ_CONSTRUCT(&mca_rmgr_urm_component.lock, opal_mutex_t);
-    OBJ_CONSTRUCT(&mca_rmgr_urm_component.cond, opal_condition_t);
-    
     /* if we are NOT an HNP, then we do NOT want to be selected */
     if(!orte_process_info.seed) {
         return NULL;