Merge pull request #1124 from kmroz/hostname-len-cleanup

ompi/opal/orte/oshmem/test: max hostname length cleanup

Author: jsquyres

ompi/info/info.c

@@ -95,7 +95,7 @@ opal_pointer_array_t ompi_info_f_to_c_table = {{0}};
  */
 int ompi_info_init(void)
 {
-    char val[MPI_MAX_INFO_VAL];
+    char val[OPAL_MAXHOSTNAMELEN];
     char *cptr;
 
     /* initialize table */
@@ -134,7 +134,7 @@ int ompi_info_init(void)
     }
 
     /* local host name */
-    gethostname(val, MPI_MAX_INFO_VAL);
+    gethostname(val, sizeof(val));
     ompi_info_set(&ompi_mpi_info_env.info, "host", val);
 
     /* architecture name */

ompi/mca/pml/v/pml_v_output.c

@@ -21,7 +21,7 @@
 
 int pml_v_output_open(char *output, int verbosity) {
     opal_output_stream_t lds;
-    char hostname[32] = "NA";
+    char hostname[OPAL_MAXHOSTNAMELEN] = "NA";
 
     OBJ_CONSTRUCT(&lds, opal_output_stream_t);
     if(!output) {
@@ -40,7 +40,7 @@ int pml_v_output_open(char *output, int verbosity) {
             lds.lds_file_suffix = output;
         }
         lds.lds_is_debugging = true;
-        gethostname(hostname, 32);
+        gethostname(hostname, sizeof(hostname));
         asprintf(&lds.lds_prefix, "[%s:%05d] pml_v: ", hostname, getpid());
         lds.lds_verbose_level = verbosity;
         mca_pml_v.output = opal_output_open(&lds);

ompi/mpi/c/get_processor_name.c

@@ -64,7 +64,7 @@ int MPI_Get_processor_name(char *name, int *resultlen)
        Guard against gethostname() returning a *really long* hostname
        and not null-terminating the string.  The Fortran API version
        will pad to the right if necessary. */
-    gethostname(name, MPI_MAX_PROCESSOR_NAME - 1);
+    gethostname(name, (MPI_MAX_PROCESSOR_NAME - 1));
     name[MPI_MAX_PROCESSOR_NAME - 1] = '\0';
     *resultlen = (int) strlen(name);
 

ompi/runtime/ompi_mpi_abort.c

@@ -119,7 +119,7 @@ int
 ompi_mpi_abort(struct ompi_communicator_t* comm,
                int errcode)
 {
-    char *msg, *host, hostname[MAXHOSTNAMELEN];
+    char *msg, *host, hostname[OPAL_MAXHOSTNAMELEN];
     pid_t pid = 0;
 
     /* Protection for recursive invocation */

ompi/runtime/ompi_mpi_finalize.c

@@ -114,7 +114,7 @@ int ompi_mpi_finalize(void)
         /* Note that if we're not initialized or already finalized, we
            cannot raise an MPI exception.  The best that we can do is
            write something to stderr. */
-        char hostname[MAXHOSTNAMELEN];
+        char hostname[OPAL_MAXHOSTNAMELEN];
         pid_t pid = getpid();
         gethostname(hostname, sizeof(hostname));
 

ompi/tools/mpisync/sync.c

@@ -69,7 +69,7 @@ int main(int argc, char **argv)
     MPI_Comm comm = MPI_COMM_WORLD;
     int rank, commsize;
     double offs = 0, rtt = 0;
-    char hname[1024];
+    char hname[OPAL_MAXHOSTNAMELEN];
 
     MPI_Comm_rank(comm, &rank);
     MPI_Comm_size(comm, &commsize);
@@ -93,7 +93,7 @@ int main(int argc, char **argv)
         exit(1);
     }
 
-    if( gethostname(hname, 1024) ){
+    if( gethostname(hname, sizeof(hname)) ){
         perror("Cannot get hostname. Abort");
         MPI_Abort(MPI_COMM_WORLD, 1);
     }
@@ -114,13 +114,13 @@ int main(int argc, char **argv)
              fprintf(stderr, "Fail to allocate memory. Abort\n");
              MPI_Abort(MPI_COMM_WORLD, 1);
         }
-        char *hnames = malloc(1024*commsize);
+        char *hnames = malloc(OPAL_MAXHOSTNAMELEN * commsize);
         if( hnames == NULL ){
              fprintf(stderr, "Fail to allocate memory. Abort\n");
              MPI_Abort(MPI_COMM_WORLD, 1);
         }
 
-        MPI_Gather(hname,1024,MPI_CHAR,hnames,1024,MPI_CHAR, 0, MPI_COMM_WORLD);
+        MPI_Gather(hname,sizeof(hname),MPI_CHAR,hnames,sizeof(hname),MPI_CHAR, 0, MPI_COMM_WORLD);
         MPI_Gather(send,2,MPI_DOUBLE,measure,2, MPI_DOUBLE, 0, MPI_COMM_WORLD);
         char tmpname[128];
         FILE *fp = fopen(filename,"w");
@@ -129,14 +129,14 @@ int main(int argc, char **argv)
              MPI_Abort(MPI_COMM_WORLD, 1);
         }
         double (*m)[2] = (void*)measure;
-        char (*h)[1024] = (void*)hnames;
+        char (*h)[OPAL_MAXHOSTNAMELEN] = (void*)hnames;
         int i;
         for(i=0; i<commsize;i++){
             fprintf(fp, "%s %lf %lf\n", h[i], m[i][0], m[i][1]);
         }
         fclose(fp);
     } else {
-        MPI_Gather(hname,1024, MPI_CHAR, NULL, 1024, MPI_CHAR, 0, MPI_COMM_WORLD);
+        MPI_Gather(hname, sizeof(hname), MPI_CHAR, NULL, sizeof(hname), MPI_CHAR, 0, MPI_COMM_WORLD);
         MPI_Gather(send,2, MPI_DOUBLE, NULL, 2, MPI_DOUBLE, 0, MPI_COMM_WORLD);
     }
 

opal/include/opal_config_bottom.h

@@ -339,6 +339,14 @@ typedef unsigned char bool;
 #define OPAL_PATH_SEP "/"
 #define OPAL_ENV_SEP  ':'
 
+#if defined(MAXHOSTNAMELEN)
+#define OPAL_MAXHOSTNAMELEN (MAXHOSTNAMELEN + 1)
+#elif defined(HOST_NAME_MAX)
+#define OPAL_MAXHOSTNAMELEN (HOST_NAME_MAX + 1)
+#else
+/* SUSv2 guarantees that "Host names are limited to 255 bytes". */
+#define OPAL_MAXHOSTNAMELEN (255 + 1)
+#endif
 
 /*
  * Do we want memory debugging?
@@ -540,14 +548,9 @@ static inline uint16_t ntohs(uint16_t netvar) { return netvar; }
 #ifdef HAVE_HOSTLIB_H
 /* gethostname() */
 #include <hostLib.h>
-
-#ifndef MAXHOSTNAMELEN
-#define MAXHOSTNAMELEN 64
 #endif
 #endif
 
-#endif
-
 /* If we're in C++, then just undefine restrict and then define it to
    nothing.  "restrict" is not part of the C++ language, and we don't
    have a corresponding AC_CXX_RESTRICT to figure out what the C++

opal/mca/base/mca_base_component_find.c

@@ -330,7 +330,7 @@ static int component_find_check (mca_base_framework_t *framework, char **request
         }
 
         if (!found) {
-            char h[MAXHOSTNAMELEN];
+            char h[OPAL_MAXHOSTNAMELEN];
             gethostname(h, sizeof(h));
             opal_show_help("help-mca-base.txt",
                            "find-available:not-valid", true,

opal/mca/base/mca_base_open.c

@@ -66,7 +66,7 @@ int mca_base_open(void)
 {
     char *value;
     opal_output_stream_t lds;
-    char hostname[64];
+    char hostname[OPAL_MAXHOSTNAMELEN];
     int var_id;
 
     if (mca_base_opened++) {
@@ -137,7 +137,7 @@ int mca_base_open(void)
     } else {
         set_defaults(&lds);
     }
-    gethostname(hostname, 64);
+    gethostname(hostname, sizeof(hostname));
     asprintf(&lds.lds_prefix, "[%s:%05d] ", hostname, getpid());
     opal_output_reopen(0, &lds);
     opal_output_verbose (MCA_BASE_VERBOSE_COMPONENT, 0, "mca: base: opening components");

opal/mca/event/libevent2022/libevent/evdns.c

@@ -48,6 +48,8 @@
  * Version: 0.1b
  */
 
+#include "opal_config.h"
+
 #include <sys/types.h>
 #include "event2/event-config.h"
 
@@ -121,10 +123,6 @@
 #define EVDNS_LOG_WARN 1
 #define EVDNS_LOG_MSG 2
 
-#ifndef HOST_NAME_MAX
-#define HOST_NAME_MAX 255
-#endif
-
 #include <stdio.h>
 
 #undef MIN
@@ -3108,7 +3106,7 @@ evdns_search_ndots_set(const int ndots) {
 
 static void
 search_set_from_hostname(struct evdns_base *base) {
-	char hostname[HOST_NAME_MAX + 1], *domainname;
+	char hostname[OPAL_MAXHOSTNAMELEN], *domainname;
 
 	ASSERT_LOCKED(base);
 	search_postfix_clear(base);