Replace a useless counter with a boolean check to see if we have already passed thru opal_finalize so we don't call finalize, and then don't pass thru it (as was happening on several tools)

This commit was SVN r24862.

opal/runtime/opal_finalize.c

@@ -54,18 +54,16 @@
 #include "opal/runtime/opal_cr.h"
 #include "opal/mca/crs/base/base.h"
 
-extern int opal_initialized;
-extern int opal_util_initialized;
+extern bool opal_initialized;
+extern bool opal_util_initialized;
 
 int
 opal_finalize_util(void)
 {
-    if( --opal_util_initialized != 0 ) {
-        if( opal_util_initialized < 0 ) {
-            return OPAL_ERROR;
-        }
+    if (!opal_util_initialized) {
         return OPAL_SUCCESS;
     }
+    opal_util_initialized = false;
 
     /* Clear out all the registered MCA params */
     mca_base_param_finalize();
@@ -111,12 +109,10 @@ opal_finalize_util(void)
 int
 opal_finalize(void)
 {
-    if( --opal_initialized != 0 ) {
-        if( opal_initialized < 0 ) {
-            return OPAL_ERROR;
-        }
+    if (!opal_initialized) {
         return OPAL_SUCCESS;
     }
+    opal_initialized = false;
 
     /* close the checkpoint and restart service */
     opal_cr_finalize();

opal/runtime/opal_init.c

@@ -68,8 +68,8 @@
 #endif
 const char opal_version_string[] = OPAL_IDENT_STRING;
 
-int opal_initialized = 0;
-int opal_util_initialized = 0;
+bool opal_initialized = false;
+bool opal_util_initialized = false;
 int opal_cache_line_size;
 
 static int
@@ -219,12 +219,10 @@ opal_init_util(int* pargc, char*** pargv)
     int ret;
     char *error = NULL;
 
-    if( ++opal_util_initialized != 1 ) {
-        if( opal_util_initialized < 1 ) {
-            return OPAL_ERROR;
-        }
+    if (opal_util_initialized) {
         return OPAL_SUCCESS;
     }
+    opal_util_initialized = true;
 
     /* JMS See note in runtime/opal.h -- this is temporary; to be
        replaced with real hwloc information soon (in trunk/v1.5 and
@@ -324,12 +322,10 @@ opal_init(int* pargc, char*** pargv)
     int ret;
     char *error = NULL;
 
-    if( ++opal_initialized != 1 ) {
-        if( opal_initialized < 1 ) {
-            return OPAL_ERROR;
-        }
+    if (opal_initialized) {
         return OPAL_SUCCESS;
     }
+    opal_initialized = true;
 
     /* initialize util code */
     if (OPAL_SUCCESS != (ret = opal_init_util(pargc, pargv))) {

orte/tools/orterun/orterun.c

@@ -618,10 +618,6 @@ int orterun(int argc, char *argv[])
         ORTE_ERROR_LOG(rc);
         return rc;
     }
-    /* finalize the OPAL utils. As they are opened again from orte_init->opal_init
-     * we continue to have a reference count on them. So we have to finalize them twice...
-     */
-    opal_finalize_util();
 
     /* check for request to report uri */
     if (NULL != orterun_globals.report_uri) {