Merge pull request #7326 from jsquyres/pr/make-opal-output-safe-before-opal-init

opal: ensure opal_gethostname() always returns a value

Author: jsquyres

opal/runtime/opal.h

@@ -114,16 +114,32 @@ OPAL_DECLSPEC void opal_warn_fork(void);
  */
 OPAL_DECLSPEC int opal_register_params(void);
 
+/**
+ * Internal function.  Should not be called directly (should only be
+ * invoked internally by opal_init() and opal_gethostname()).
+ */
+OPAL_DECLSPEC int opal_init_gethostname(void);
+
 /**
  * Wrapper to return the hostname value that is in
-   opal_process_info.nodename, as opposed to calling gethostname()
-   directly, which is not guaranteed to be null-terminated and
-   varies in its behavior depending on implementation. The 
-   opal_process_info.nodename value is first populated in 
-   opal/runtime/opal_init.c
- */
-static inline const char *opal_gethostname( void ) {
-    assert( NULL != opal_process_info.nodename );
+ * opal_process_info.nodename, as opposed to calling gethostname()
+ * directly, which is not guaranteed to be null-terminated and varies
+ * in its behavior depending on implementation. The
+ * opal_process_info.nodename value is first populated in
+ * opal/runtime/opal_init.c.
+ *
+ * NOTE: In some cases (usually: developer debugging), it is possible
+ * that this function is invoked (e.g., via opal_output()) before
+ * opal_init() has been invoked, and therefore
+ * opal_process_info.nodename is still NULL.  In those cases, just
+ * call opal_init_gethostname() directly to fill in
+ * opal_process_info.nodename.
+ */
+static inline const char *opal_gethostname(void)
+{
+    if (NULL == opal_process_info.nodename) {
+        opal_init_gethostname();
+    }
     return opal_process_info.nodename;
 }
 

opal/runtime/opal_init.c

@@ -110,7 +110,7 @@ bool opal_warn_on_fork = true;
  * truncated. It also tries again in the case where gethostname returns an
  * error because the buffer is initially too short.
  */
-static int opal_init_gethostname(void)
+int opal_init_gethostname(void)
 {
     size_t count, length = OPAL_LOCAL_MAXHOSTNAMELEN;
     int ret_val, num_tries = 0;