Make sure the PVAR are always registered.

Signed-off-by: George Bosilca <[email protected]>

Author: bosilca

ompi/runtime/ompi_spc.c

@@ -1,11 +1,13 @@
 /*
- * Copyright (c) 2018      The University of Tennessee and The University
+ * Copyright (c) 2018-2019 The University of Tennessee and The University
  *                         of Tennessee Research Foundation.  All rights
  *                         reserved.
  *
  * Copyright (c) 2018      Cisco Systems, Inc.  All rights reserved
  * Copyright (c) 2018      Research Organization for Information Science
  *                         and Technology (RIST).  All rights reserved.
+ * Copyright (c) 2019      Mellanox Technologies, Inc.
+ *                         All rights reserved.
  * $COPYRIGHT$
  *
  * Additional copyrights may follow
@@ -287,14 +289,6 @@ void ompi_spc_init(void)
     char **arg_strings = opal_argv_split(ompi_mpi_spc_attach_string, ',');
     int num_args       = opal_argv_count(arg_strings);
 
-    /* Reset all timer-based counters */
-    for(i = 0; i < OMPI_SPC_NUM_COUNTERS; i++) {
-        CLEAR_SPC_BIT(ompi_spc_timer_event, i);
-    }
-
-    /* If this is a timer event, set the corresponding timer_event entry */
-    SET_SPC_BIT(ompi_spc_timer_event, OMPI_SPC_MATCH_TIME);
-
     /* If there is only one argument and it is 'all', then all counters
      * should be turned on.  If the size is 0, then no counters will be enabled.
      */
@@ -304,47 +298,50 @@ void ompi_spc_init(void)
         }
     }
 
-    /* Turn on only the counters that were specified in the MCA parameter */
     for(i = 0; i < OMPI_SPC_NUM_COUNTERS; i++) {
-        if(all_on) {
-            found++;
-        } else {
-            matched = 0;
-            /* Note: If no arguments were given, this will be skipped */
+        /* Reset all timer-based counters */
+        CLEAR_SPC_BIT(ompi_spc_timer_event, i);
+        matched = all_on;
+
+        if( !matched ) {
+            /* Turn on only the counters that were specified in the MCA parameter */
             for(j = 0; j < num_args; j++) {
                 if( 0 == strcmp(ompi_spc_events_names[i].counter_name, arg_strings[j]) ) {
-                    found++;
                     matched = 1;
                     break;
                 }
             }
         }
 
-        if (all_on || matched) {
+        if (matched) {
             SET_SPC_BIT(ompi_spc_attached_event, i);
             mpi_t_enabled = true;
+            found++;
+        }
 
-            /* Registers the current counter as an MPI_T pvar regardless of whether it's been turned on or not */
-            ret = mca_base_pvar_register("ompi", "runtime", "spc", ompi_spc_events_names[i].counter_name, ompi_spc_events_names[i].counter_description,
-                                         OPAL_INFO_LVL_4, MPI_T_PVAR_CLASS_SIZE,
-                                         MCA_BASE_VAR_TYPE_UNSIGNED_LONG_LONG, NULL, MPI_T_BIND_NO_OBJECT,
-                                         MCA_BASE_PVAR_FLAG_READONLY | MCA_BASE_PVAR_FLAG_CONTINUOUS,
-                                         ompi_spc_get_count, NULL, ompi_spc_notify, NULL);
-
-            /* Check to make sure that ret is a valid index and not an error code */
-            if( ret >= 0 ) {
-                if( mpi_t_offset == -1 ) {
-                    mpi_t_offset = ret;
-                }
-            }
-            if( (ret < 0) || (ret != (mpi_t_offset + found - 1)) ) {
-                mpi_t_enabled = false;
-                opal_show_help("help-mpi-runtime.txt", "spc: MPI_T disabled", true);
-                break;
-            }
+        /* Registers the current counter as an MPI_T pvar regardless of whether it's been turned on or not */
+        ret = mca_base_pvar_register("ompi", "runtime", "spc", ompi_spc_events_names[i].counter_name, ompi_spc_events_names[i].counter_description,
+                                     OPAL_INFO_LVL_4, MPI_T_PVAR_CLASS_SIZE,
+                                     MCA_BASE_VAR_TYPE_UNSIGNED_LONG_LONG, NULL, MPI_T_BIND_NO_OBJECT,
+                                     MCA_BASE_PVAR_FLAG_READONLY | MCA_BASE_PVAR_FLAG_CONTINUOUS,
+                                     ompi_spc_get_count, NULL, ompi_spc_notify, NULL);
+
+        /* Check to make sure that ret is a valid index and not an error code */
+        if( ret >= 0 ) {
+            if( mpi_t_offset == -1 )
+                mpi_t_offset = ret;
+        }
+        /* We need the SPC counters to be contiguous in the PVAR array */
+        if( (ret < 0) || (ret != (mpi_t_offset + found - 1)) ) {
+            mpi_t_enabled = false;
+            opal_show_help("help-mpi-runtime.txt", "spc: MPI_T disabled", true);
+            break;
         }
     }
 
+    /* If this is a timer event, set the corresponding timer_event entry */
+    SET_SPC_BIT(ompi_spc_timer_event, OMPI_SPC_MATCH_TIME);
+
     opal_argv_free(arg_strings);
 }