Merge pull request #9702 from awlauria/compiler_and_ident_v5.0.x

v5.0.x: Compiler and ident cleanup

Author: awlauria

config/opal_check_ident.m4

@@ -395,10 +395,6 @@ AM_CONDITIONAL(OMPI_NEED_WINDOWS_REPLACEMENTS,
 # Do all Interix detections if necessary
 OMPI_INTERIX
 
-# Does the compiler support "ident"-like constructs?
-
-OPAL_CHECK_IDENT([CC], [CFLAGS], [c], [C])
-
 #
 # Check for some types
 #

configure.ac

@@ -685,7 +685,7 @@ static int dpm_convert(opal_list_t *infos,
     char *ck, *ptr, *help_str = NULL;
     int rc;
     char **tmp;
-    dpm_conflicts_t *modifiers;
+    dpm_conflicts_t *modifiers = NULL;
     const char *attr;
 
     /* pick the modifiers to be checked */

ompi/dpm/dpm.c

@@ -403,11 +403,11 @@ static void backend_abort_no_aggregate(int fatal, char *type,
 
             len -= strlen(type);
             if (len > 0) {
-                strncat(str, " ", len);
+                strncat(str, " ", len - 1);
 
                 --len;
                 if (len > 0) {
-                    strncat(str, name, len);
+                    strncat(str, name, len - 1);
                 }
             }
             out("*** on %s", str);

ompi/errhandler/errhandler_predefined.c

@@ -62,6 +62,7 @@ enum {
     OMPI_ERR_BUFFER                 = OPAL_ERR_BUFFER,
     OMPI_ERR_SILENT                 = OPAL_ERR_SILENT,
     OMPI_ERR_HANDLERS_COMPLETE      = OPAL_ERR_HANDLERS_COMPLETE,
+    OMPI_ERR_NOT_BOUND              = OPAL_ERR_NOT_BOUND,
 
     OMPI_ERR_REQUEST                = OMPI_ERR_BASE - 1,
     OMPI_ERR_RMA_SYNC               = OMPI_ERR_BASE - 2,

ompi/include/ompi/constants.h

@@ -22,15 +22,9 @@
 #include "ompi/mca/bml/base/base.h"
 #include "ompi/mca/mtl/base/base.h"
 
-// In regular strncpy up to n bytes are copied, so if the 'to' buffer
-// was char string[16] and you called strncpy(string, , 16) you could
-// get 16 bytes of chars without a null.  My preferred API is to let
-// n be the size of the buffer, and to let n-1 chars be copied, and
-// to guarantee null termination.
 static void
 mystrncpy(char *to, const char *from, int n) {
-    strncpy(to, from, n-1);
-    to[n-1] = 0;
+    snprintf(to, n, "%s", from);
 }
 
 // For converting comm_method strings to comm_method id# and back.

ompi/mca/hook/comm_method/hook_comm_method_fns.c

@@ -37,6 +37,9 @@ BEGIN_C_DECLS
 int ompi_osc_base_find_available(bool enable_progress_threads,
                                  bool enable_mpi_threads);
 
+void ompi_osc_base_set_memory_alignment(struct opal_info_t *info,
+                                        size_t *memory_alignment);
+
 int ompi_osc_base_select(ompi_win_t *win,
                          void **base,
                          size_t size,

ompi/mca/osc/base/base.h

@@ -22,7 +22,7 @@
 #include "ompi/mca/mca.h"
 #include "opal/util/output.h"
 #include "opal/mca/base/base.h"
-
+#include "opal/include/opal/align.h"
 
 #include "ompi/mca/osc/osc.h"
 #include "ompi/mca/osc/base/base.h"
@@ -36,6 +36,24 @@
 
 #include "ompi/mca/osc/base/static-components.h"
 
+void
+ompi_osc_base_set_memory_alignment(struct opal_info_t *info,
+                                   size_t *memory_alignment)
+{
+    int flag;
+    opal_cstring_t *align_info_str;
+
+    opal_info_get(info, "mpi_minimum_memory_alignment", &align_info_str, &flag);
+    if (flag) {
+        long long tmp_align = atoll(align_info_str->string);
+        OBJ_RELEASE(align_info_str);
+        if ((long long) OPAL_ALIGN_MIN < tmp_align) {
+            *memory_alignment = tmp_align;
+        }
+    }
+}
+
+
 int
 ompi_osc_base_find_available(bool enable_progress_threads,
                             bool enable_mpi_threads)

ompi/mca/osc/base/osc_base_frame.c

@@ -48,7 +48,6 @@
 #include "opal/util/arch.h"
 #include "opal/util/argv.h"
 #include "opal/util/printf.h"
-#include "opal/align.h"
 #include "opal/util/sys_limits.h"
 #if OPAL_CUDA_SUPPORT
 #include "opal/mca/common/cuda/common_cuda.h"
@@ -1321,8 +1320,6 @@ static int ompi_osc_rdma_component_select (struct ompi_win_t *win, void **base,
     int world_size = ompi_comm_size (comm);
     int init_limit = 256;
     int ret;
-    int flag;
-    char infoval[32];
     char *name;
 
     /* the osc/sm component is the exclusive provider for support for shared
@@ -1363,15 +1360,7 @@ static int ompi_osc_rdma_component_select (struct ompi_win_t *win, void **base,
     module->size = size;
     module->memory_alignment = mca_osc_rdma_component.memory_alignment;
     if (NULL != info) {
-        opal_cstring_t *align_info_str;
-        opal_info_get(info, "mpi_minimum_memory_alignment", &align_info_str, &flag);
-        if (flag) {
-            ssize_t tmp_align = atoll(align_info_str->string);
-            OBJ_RELEASE(align_info_str);
-            if (OPAL_ALIGN_MIN < tmp_align) {
-                module->memory_alignment = tmp_align;
-            }
-        }
+        ompi_osc_base_set_memory_alignment(info, &module->memory_alignment);
     }
 
     /* set the module so we properly cleanup */

ompi/mca/osc/rdma/osc_rdma_component.c

@@ -29,7 +29,7 @@
 #include "ompi/mca/osc/base/osc_base_obj_convert.h"
 #include "ompi/request/request.h"
 #include "opal/util/sys_limits.h"
-#include "opal/include/opal/align.h"
+#include "opal/align.h"
 #include "opal/util/info_subscriber.h"
 #include "opal/util/printf.h"
 #include "opal/mca/mpool/base/base.h"
@@ -196,7 +196,6 @@ component_select(struct ompi_win_t *win, void **base, size_t size, int disp_unit
     int comm_size = ompi_comm_size (comm);
     bool unlink_needed = false;
     int ret = OMPI_ERROR;
-    int flag;
     size_t memory_alignment = OPAL_ALIGN_MIN;
 
     if (OMPI_SUCCESS != (ret = check_win_ok(comm, flavor))) {
@@ -216,15 +215,7 @@ component_select(struct ompi_win_t *win, void **base, size_t size, int disp_unit
     if (OPAL_SUCCESS != ret) goto error;
 
     if (NULL != info) {
-        opal_cstring_t *align_info_str;
-        ret = opal_info_get(info, "mpi_minimum_memory_alignment", &align_info_str, &flag);
-        if (flag) {
-            ssize_t tmp_align = atoll(align_info_str->string);
-            OBJ_RELEASE(align_info_str);
-            if (OPAL_ALIGN_MIN < tmp_align) {
-                memory_alignment = tmp_align;
-            }
-        }
+        ompi_osc_base_set_memory_alignment(info, &memory_alignment);
     }
 
     /* fill in the function pointer part */