Stop an ugly infinite loop caused by continual re-opening of the opal if framework.

opal/mca/if/base/if_base_components.c

@@ -1,5 +1,6 @@
 /*
  * Copyright (c) 2010-2013 Cisco Systems, Inc.  All rights reserved.
+ * Copyright (c) 2015      Intel, Inc. All rights reserved.
  * $COPYRIGHT$
  * 
  * Additional copyrights may follow
@@ -27,6 +28,8 @@ static int opal_if_base_open (mca_base_open_flag_t flags);
 static int opal_if_base_close(void);
 static void opal_if_construct(opal_if_t *obj);
 
+static bool frameopen = false;
+
 /* instance the opal_if_t object */
 OBJ_CLASS_INSTANCE(opal_if_t, opal_list_item_t, opal_if_construct, NULL);
 
@@ -55,10 +58,15 @@ static int opal_if_base_register (mca_base_register_flag_t flags)
 
 static int opal_if_base_open (mca_base_open_flag_t flags)
 {
+    if (frameopen) {
+        return OPAL_SUCCESS;
+    }
+    frameopen = true;
+    
     /* setup the global list */
     OBJ_CONSTRUCT(&opal_if_list, opal_list_t);
 
-    return mca_base_framework_components_open (&opal_if_base_framework, flags);
+    return mca_base_framework_components_open(&opal_if_base_framework, flags);
 }
 
 
@@ -66,12 +74,16 @@ static int opal_if_base_close(void)
 {
     opal_list_item_t *item;
 
+    if (!frameopen) {
+        return OPAL_SUCCESS;
+    }
+    
     while (NULL != (item = opal_list_remove_first(&opal_if_list))) {
         OBJ_RELEASE(item);
     }
     OBJ_DESTRUCT(&opal_if_list);
 
-    return mca_base_framework_components_close (&opal_if_base_framework, NULL);
+    return mca_base_framework_components_close(&opal_if_base_framework, NULL);
 }
 
 static void opal_if_construct(opal_if_t *obj)

opal/mca/if/posix_ipv4/if_posix.c

@@ -4,6 +4,7 @@
  * Copyright (c) 2013      The University of Tennessee and The University
  *                         of Tennessee Research Foundation.  All rights
  *                         reserved.
+ * Copyright (c) 2015      Intel, Inc. All rights reserved.
  * $COPYRIGHT$
  * 
  * Additional copyrights may follow
@@ -19,6 +20,7 @@
 #include "opal/constants.h"
 #include "opal/util/output.h"
 #include "opal/mca/if/if.h"
+#include "opal/mca/if/base/base.h"
 
 static int if_posix_open(void);
 
@@ -148,6 +150,7 @@ static int if_posix_open(void)
     } while (ifc_len < MAX_IFCONF_SIZE);
     if (!successful_locate) {
         opal_output(0, "opal_ifinit: unable to find network interfaces.");
+        close(sd);
         return OPAL_ERR_FATAL;
     }
         
@@ -221,6 +224,9 @@ static int if_posix_open(void)
         /* every new address gets its own internal if_index */
         intf->if_index = opal_list_get_size(&opal_if_list)+1;
 
+        opal_output_verbose(1, opal_if_base_framework.framework_output,
+                            "found interface %s", intf->if_name);
+        
         /* assign the kernel index to distinguish different NICs */
 #ifndef SIOCGIFINDEX
         intf->if_kernel_index = intf->if_index;

opal/runtime/opal_finalize.c

@@ -12,7 +12,7 @@
  * Copyright (c) 2008-2015 Cisco Systems, Inc.  All rights reserved.
  * Copyright (c) 2010-2013 Los Alamos National Security, LLC.
  *                         All rights reserved.
- * Copyright (c) 2013-2014 Intel, Inc. All rights reserved
+ * Copyright (c) 2013-2015 Intel, Inc. All rights reserved
  * $COPYRIGHT$
  *
  * Additional copyrights may follow
@@ -69,11 +69,6 @@ opal_finalize_util(void)
     }
 
     /* close interfaces code. */
-    if (opal_if_base_framework.framework_refcnt > 1) {
-        /* opal if may have been opened many times -- FIXME */
-        opal_if_base_framework.framework_refcnt = 1;
-    }
-
     (void) mca_base_framework_close(&opal_if_base_framework);
 
     (void) mca_base_framework_close(&opal_event_base_framework);