Merge pull request openpmix#1308 from rhc54/topic/tl

Add missing tool rendezvous file

Author: rhc54

src/mca/ptl/tcp/ptl_tcp.h

@@ -9,7 +9,7 @@
  *                         University of Stuttgart.  All rights reserved.
  * Copyright (c) 2004-2005 The Regents of the University of California.
  *                         All rights reserved.
- * Copyright (c) 2016-2018 Intel, Inc. All rights reserved.
+ * Copyright (c) 2016-2019 Intel, Inc.  All rights reserved.
  * Copyright (c) 2018      IBM Corporation.  All rights reserved.
  * $COPYRIGHT$
  *
@@ -48,6 +48,7 @@ typedef struct {
     struct sockaddr_storage connection;
     char *session_filename;
     char *nspace_filename;
+    char *pid_filename;
     char *system_filename;
     char *rendezvous_filename;
     int wait_to_connect;

src/mca/ptl/tcp/ptl_tcp_component.c

@@ -118,6 +118,7 @@ static pmix_status_t setup_fork(const pmix_proc_t *proc, char ***env);
     .disable_ipv6_family = true,
     .session_filename = NULL,
     .nspace_filename = NULL,
+    .pid_filename = NULL,
     .system_filename = NULL,
     .rendezvous_filename = NULL,
     .wait_to_connect = 4,
@@ -306,6 +307,10 @@ pmix_status_t component_close(void)
         unlink(mca_ptl_tcp_component.nspace_filename);
         free(mca_ptl_tcp_component.nspace_filename);
     }
+    if (NULL != mca_ptl_tcp_component.pid_filename) {
+        unlink(mca_ptl_tcp_component.pid_filename);
+        free(mca_ptl_tcp_component.pid_filename);
+    }
     if (NULL != mca_ptl_tcp_component.rendezvous_filename) {
         unlink(mca_ptl_tcp_component.rendezvous_filename);
         free(mca_ptl_tcp_component.rendezvous_filename);
@@ -779,10 +784,10 @@ static pmix_status_t setup_listener(pmix_info_t info[], size_t ninfo,
         FILE *fp;
         pid_t mypid;
 
-        /* first output to a file based on pid */
+        /* first output to a std file */
         mypid = getpid();
-        if (0 > asprintf(&mca_ptl_tcp_component.session_filename, "%s/pmix.%s.tool.%d",
-                         mca_ptl_tcp_component.session_tmpdir, myhost, mypid)) {
+        if (0 > asprintf(&mca_ptl_tcp_component.session_filename, "%s/pmix.%s.tool",
+                         mca_ptl_tcp_component.session_tmpdir, myhost)) {
             CLOSE_THE_SOCKET(lt->socket);
             goto sockerror;
         }
@@ -813,6 +818,40 @@ static pmix_status_t setup_listener(pmix_info_t info[], size_t ninfo,
             goto sockerror;
         }
 
+        /* now output to a file based on pid */
+        mypid = getpid();
+        if (0 > asprintf(&mca_ptl_tcp_component.pid_filename, "%s/pmix.%s.tool.%d",
+                         mca_ptl_tcp_component.session_tmpdir, myhost, mypid)) {
+            CLOSE_THE_SOCKET(lt->socket);
+            goto sockerror;
+        }
+        pmix_output_verbose(2, pmix_ptl_base_framework.framework_output,
+                            "WRITING TOOL FILE %s",
+                            mca_ptl_tcp_component.pid_filename);
+        fp = fopen(mca_ptl_tcp_component.pid_filename, "w");
+        if (NULL == fp) {
+            pmix_output(0, "Impossible to open the file %s in write mode\n", mca_ptl_tcp_component.pid_filename);
+            PMIX_ERROR_LOG(PMIX_ERR_FILE_OPEN_FAILURE);
+            CLOSE_THE_SOCKET(lt->socket);
+            free(mca_ptl_tcp_component.pid_filename);
+            mca_ptl_tcp_component.pid_filename = NULL;
+            goto sockerror;
+        }
+
+        /* output my URI */
+        fprintf(fp, "%s\n", lt->uri);
+        /* add a flag that indicates we accept v2.1 protocols */
+        fprintf(fp, "%s\n", PMIX_VERSION);
+        fclose(fp);
+        /* set the file mode */
+        if (0 != chmod(mca_ptl_tcp_component.pid_filename, S_IRUSR | S_IWUSR | S_IRGRP)) {
+            PMIX_ERROR_LOG(PMIX_ERR_FILE_OPEN_FAILURE);
+            CLOSE_THE_SOCKET(lt->socket);
+            free(mca_ptl_tcp_component.pid_filename);
+            mca_ptl_tcp_component.pid_filename = NULL;
+            goto sockerror;
+        }
+
         /* now output it into a file based on my nspace */
 
         if (0 > asprintf(&mca_ptl_tcp_component.nspace_filename, "%s/pmix.%s.tool.%s",