Fix unused variable warnings

Both warnings in FT code were due to variables only being used in debug
situations.

The datatype change was just never used.

Signed-off-by: Brian Barrett <bbarrett@amazon.com>

Author: bwbarrett

ompi/communicator/ft/comm_ft.c

@@ -121,7 +121,9 @@ int ompi_comm_shrink_internal(ompi_communicator_t* comm, ompi_communicator_t** n
     ompi_group_t *failed_group = NULL, *comm_group = NULL, *alive_group = NULL, *alive_rgroup = NULL;
     ompi_communicator_t *newcomp = NULL;
     int mode;
+#if OPAL_ENABLE_DEBUG
     double start, stop;
+#endif
 
     *newcomm = MPI_COMM_NULL;
 
@@ -132,15 +134,21 @@ int ompi_comm_shrink_internal(ompi_communicator_t* comm, ompi_communicator_t** n
     OPAL_OUTPUT_VERBOSE((5, ompi_ftmpi_output_handle,
                          "%s ompi: comm_shrink: Agreement on failed processes",
                          OMPI_NAME_PRINT(OMPI_PROC_MY_NAME) ));
+#if OPAL_ENABLE_DEBUG
     start = PMPI_Wtime();
+#endif
     opal_mutex_lock(&ompi_group_afp_mutex);
     ompi_group_intersection(comm->c_remote_group, ompi_group_all_failed_procs, &failed_group);
     opal_mutex_unlock(&ompi_group_afp_mutex);
+#if OPAL_ENABLE_DEBUG
     stop = PMPI_Wtime();
+#endif
     OPAL_OUTPUT_VERBOSE((10, ompi_ftmpi_output_handle,
                          "%s ompi: comm_shrink: group_inter: %g seconds",
                          OMPI_NAME_PRINT(OMPI_PROC_MY_NAME), stop-start));
+#if OPAL_ENABLE_DEBUG
     start = PMPI_Wtime();
+#endif
     do {
         /* We need to create the list of alive processes. Thus, we don't care about
          * the value of flag, instead we are only using the globally consistent
@@ -154,7 +162,9 @@ int ompi_comm_shrink_internal(ompi_communicator_t* comm, ompi_communicator_t** n
                                         comm,
                                         comm->c_coll->coll_agree_module);
     } while( MPI_ERR_PROC_FAILED == ret );
+#if OPAL_ENABLE_DEBUG
     stop = PMPI_Wtime();
+#endif
     OPAL_OUTPUT_VERBOSE((10, ompi_ftmpi_output_handle,
                          "%s ompi: comm_shrink: AGREE: %g seconds",
                          OMPI_NAME_PRINT(OMPI_PROC_MY_NAME), stop-start));
@@ -171,7 +181,9 @@ int ompi_comm_shrink_internal(ompi_communicator_t* comm, ompi_communicator_t** n
     OPAL_OUTPUT_VERBOSE((5, ompi_ftmpi_output_handle,
                          "%s ompi: comm_shrink: Determine ranking for new communicator intra %d",
                          OMPI_NAME_PRINT(OMPI_PROC_MY_NAME), OMPI_COMM_IS_INTRA(comm)));
+#if OPAL_ENABLE_DEBUG
     start = PMPI_Wtime();
+#endif
 
     /* Create 'alive' groups */
     mode = OMPI_COMM_CID_INTRA_FT;
@@ -210,7 +222,9 @@ int ompi_comm_shrink_internal(ompi_communicator_t* comm, ompi_communicator_t** n
         exit_status = MPI_ERR_INTERN;
         goto cleanup;
     }
+#if OPAL_ENABLE_DEBUG
     stop = PMPI_Wtime();
+#endif
     OPAL_OUTPUT_VERBOSE((10, ompi_ftmpi_output_handle,
                          "%s ompi: comm_shrink: GRP COMPUTATION: %g seconds\n",
                          OMPI_NAME_PRINT(OMPI_PROC_MY_NAME), stop-start));
@@ -221,7 +235,9 @@ int ompi_comm_shrink_internal(ompi_communicator_t* comm, ompi_communicator_t** n
     OPAL_OUTPUT_VERBOSE((5, ompi_ftmpi_output_handle,
                          "%s ompi: comm_shrink: Determine context id",
                          OMPI_NAME_PRINT(OMPI_PROC_MY_NAME) ));
+#if OPAL_ENABLE_DEBUG
     start = PMPI_Wtime();
+#endif
     ret = ompi_comm_nextcid( newcomp,  /* new communicator */
                              comm,     /* old comm */
                              NULL,     /* bridge comm */
@@ -236,7 +252,9 @@ int ompi_comm_shrink_internal(ompi_communicator_t* comm, ompi_communicator_t** n
         exit_status = ret;
         goto cleanup;
     }
+#if OPAL_ENABLE_DEBUG
     stop = PMPI_Wtime();
+#endif
     OPAL_OUTPUT_VERBOSE((10, ompi_ftmpi_output_handle,
                          "%s ompi: comm_shrink: NEXT CID: %g seconds\n",
                          OMPI_NAME_PRINT(OMPI_PROC_MY_NAME), stop-start));
@@ -248,7 +266,9 @@ int ompi_comm_shrink_internal(ompi_communicator_t* comm, ompi_communicator_t** n
     snprintf(newcomp->c_name, MPI_MAX_OBJECT_NAME, "MPI COMMUNICATOR %d SHRUNK FROM %d",
              ompi_comm_get_local_cid(newcomp),
              ompi_comm_get_local_cid(comm));
+#if OPAL_ENABLE_DEBUG
     start = PMPI_Wtime();
+#endif
     /* activate communicator and init coll-module */
     ret = ompi_comm_activate( &newcomp, /* new communicator */
                               comm,
@@ -261,7 +281,9 @@ int ompi_comm_shrink_internal(ompi_communicator_t* comm, ompi_communicator_t** n
         exit_status = ret;
         goto cleanup;
     }
+#if OPAL_ENABLE_DEBUG
     stop = PMPI_Wtime();
+#endif
     OPAL_OUTPUT_VERBOSE((10, ompi_ftmpi_output_handle,
                          "%s ompi: comm_shrink: COLL SELECT: %g seconds\n",
                          OMPI_NAME_PRINT(OMPI_PROC_MY_NAME), stop-start));

ompi/communicator/ft/comm_ft_reliable_bcast.c

@@ -161,11 +161,10 @@ static void ompi_comm_rbcast_bml_recv_cb(
         const mca_btl_base_receive_descriptor_t* descriptor)
 {
     ompi_comm_rbcast_message_t* msg;
-    mca_btl_base_tag_t tag = descriptor->tag;
     ompi_communicator_t* comm;
 
     /* Parse the rbcast fragment */
-    assert( MCA_BTL_TAG_FT_RBCAST == tag );
+    assert( MCA_BTL_TAG_FT_RBCAST == descriptor->tag );
     assert( 1 == descriptor->des_segment_count );
     assert( sizeof(ompi_comm_rbcast_message_t) <= descriptor->des_segments->seg_len );
     msg = (ompi_comm_rbcast_message_t*) descriptor->des_segments->seg_addr.pval;

ompi/datatype/ompi_datatype_module.c

@@ -693,8 +693,6 @@ int32_t ompi_datatype_init( void )
 
 static int ompi_datatype_finalize (void)
 {
-    int ret = OMPI_SUCCESS;
-
     /* As the synonyms are just copies of the internal data we should not free them.
      * Anyway they are over the limit of OMPI_DATATYPE_MPI_MAX_PREDEFINED so they will never get freed.
      */

ompi/mca/osc/sm/osc_sm_component.c

@@ -171,8 +171,6 @@ component_query(struct ompi_win_t *win, void **base, size_t size, int disp_unit,
                 struct ompi_communicator_t *comm, struct opal_info_t *info,
                 int flavor)
 {
-    int ret;
-
     /* component only supports shared or allocate flavors */
     if (! (MPI_WIN_FLAVOR_SHARED == flavor ||
            MPI_WIN_FLAVOR_ALLOCATE == flavor)) {