Address comments on ts.{h,c}

Signed-off-by: Jake Tronge <[email protected]>

Author: jtronge

ompi/mpi/fortran/use-mpi-f08/base/ts.c

@@ -23,7 +23,7 @@ int ompi_ts_create_datatype(CFI_cdesc_t *cdesc, int oldcount, MPI_Datatype oldty
     int mpi_errno = MPI_SUCCESS;
     int accum_elems = 1;
     int accum_sm = cdesc->elem_len;
-    int done = 0; /* Have we created a datatype for oldcount of oldtype? */
+    int done = false; /* Have we created a datatype for oldcount of oldtype? */
     int last; /* Index of the last successfully created datatype in types[] */
     int extent;
     int i, j;
@@ -34,15 +34,15 @@ int ompi_ts_create_datatype(CFI_cdesc_t *cdesc, int oldcount, MPI_Datatype oldty
         assert(cdesc->rank <= MAX_RANK);
         ompi_datatype_type_size(oldtype, &size);
         /* When cdesc->elem_len != size, things suddenly become complicated. Generally, it is hard to create
-         * a composite datatype based on two datatypes. Currently we don't support it and doubt it is usefull.
+         * a composite datatype based on two datatypes. Currently we don't support it and doubt it is useful.
          */
         assert(cdesc->elem_len == size);
     }
 #endif
 
     types[0] = oldtype;
     i = 0;
-    done = 0;
+    done = false;
     while (i < cdesc->rank && !done) {
         if (oldcount % accum_elems) {
             /* oldcount should be a multiple of accum_elems, otherwise we might need an
@@ -58,7 +58,7 @@ int ompi_ts_create_datatype(CFI_cdesc_t *cdesc, int oldcount, MPI_Datatype oldty
             extent = cdesc->dim[i].extent;
         } else {
             /* Up to now, we have accumlated enough elements */
-            done = 1;
+            done = true;
         }
 
         if (cdesc->dim[i].sm == accum_sm) {
@@ -90,8 +90,9 @@ int ompi_ts_create_datatype(CFI_cdesc_t *cdesc, int oldcount, MPI_Datatype oldty
     }
 
 fn_exit:
-    for (j = 1; j <= last; j++)
+    for (j = 1; j <= last; j++) {
         PMPI_Type_free(&types[j]);
+    }
     return mpi_errno;
 }
 

ompi/mpi/fortran/use-mpi-f08/base/ts.h

@@ -36,7 +36,7 @@ extern int ompi_ts_copy(CFI_cdesc_t *cdesc, char *buffer);
         datatype = type;                                                \
         if (x->rank != 0 && !CFI_is_contiguous(x)) {                    \
             rc = ompi_ts_create_datatype(x, count, type, &datatype);    \
-            if (MPI_SUCCESS == rc) {                                    \
+            if (OPAL_LIKELY(MPI_SUCCESS == rc)) {                       \
                 count = 1;                                              \
             }                                                           \
         } else {                                                        \
@@ -50,7 +50,7 @@ extern int ompi_ts_copy(CFI_cdesc_t *cdesc, char *buffer);
         if (x->rank != 0 && !CFI_is_contiguous(x)) {                    \
             size_t size = ompi_ts_size(x);                              \
             buffer = malloc(size);                                      \
-            if (NULL == buffer) {                                       \
+            if (OPAL_UNLIKELY(NULL == buffer)) {                        \
                 rc = MPI_ERR_NO_MEM;                                    \
             } else {                                                    \
                 rc = MPI_SUCCESS;                                       \
@@ -67,7 +67,7 @@ extern int ompi_ts_copy(CFI_cdesc_t *cdesc, char *buffer);
         if (x->rank != 0 && !CFI_is_contiguous(x)) {                    \
             size_t size = ompi_ts_size(x);                              \
             buffer = malloc(size);                                      \
-            if (NULL == buffer) {                                       \
+            if (OPAL_UNLIKELY(NULL == buffer)) {                        \
                 rc = MPI_ERR_NO_MEM;                                    \
             } else {                                                    \
                 rc = ompi_ts_copy(x, buffer);                           \
@@ -84,18 +84,18 @@ extern int ompi_ts_copy(CFI_cdesc_t *cdesc, char *buffer);
             free(buffer);                                               \
         }                                                               \
         if (type != datatype) {                                         \
-	    rc = PMPI_Type_free(&datatype);                             \
+            rc = PMPI_Type_free(&datatype);                             \
         }                                                               \
     } while (0)
 
 #define OMPI_C_2_CFI_COPY(x, buffer, count, type, datatype, rc)         \
     do {                                                                \
         if (buffer != x->base_addr) {                                   \
-	    rc = ompi_ts_copy_back(buffer, x);                          \
+            rc = ompi_ts_copy_back(buffer, x);                          \
             free(buffer);                                               \
         }                                                               \
         if (type != datatype) {                                         \
-	    rc = PMPI_Type_free(&datatype);                             \
+            rc = PMPI_Type_free(&datatype);                             \
         }                                                               \
     } while (0)