Merge pull request #6 from rhc54/topic/update

Update to OMPI master

Author: Ralph Castain

contrib/travis/test_client.sh

@@ -6,6 +6,8 @@ export PATH=$HOME/bogus/bin:$PATH
 make client
 
 psrvr &
+# wait a little for the server to start
+sleep 2
 prun --oversubscribe -n 2 ./client
 ret=$?
 

opal/mca/pmix/pmix2x/pmix/VERSION

@@ -30,7 +30,7 @@ greek=
 # command, or with the date (if "git describe" fails) in the form of
 # "date<date>".
 
-repo_rev=git8684147
+repo_rev=git1154ce3
 
 # If tarball_version is not empty, it is used as the version string in
 # the tarball filename, regardless of all other versions listed in
@@ -44,7 +44,7 @@ tarball_version=
 
 # The date when this release was created
 
-date="Sep 11, 2017"
+date="Sep 12, 2017"
 
 # The shared library version of each of PMIx's public libraries.
 # These versions are maintained in accordance with the "Library

opal/mca/pmix/pmix2x/pmix/src/client/pmix_client_get.c

@@ -281,17 +281,18 @@ static void _getnb_cbfunc(struct pmix_peer_t *pr,
         PMIX_ERROR_LOG(PMIX_ERR_BAD_PARAM);
         return;
     }
+
+    /* cache the proc id */
+    (void)strncpy(proc.nspace, cb->pname.nspace, PMIX_MAX_NSLEN);
+    proc.rank = cb->pname.rank;
+
     /* a zero-byte buffer indicates that this recv is being
      * completed due to a lost connection */
     if (PMIX_BUFFER_IS_EMPTY(buf)) {
         ret = PMIX_ERR_UNREACH;
         goto done;
     }
 
-    /* cache the proc id */
-    (void)strncpy(proc.nspace, cb->pname.nspace, PMIX_MAX_NSLEN);
-    proc.rank = cb->pname.rank;
-
     /* unpack the status */
     cnt = 1;
     PMIX_BFROPS_UNPACK(rc, pmix_client_globals.myserver,

opal/mca/pmix/pmix2x/pmix/src/client/pmix_client_spawn.c

@@ -218,20 +218,19 @@ static void wait_cbfunc(struct pmix_peer_t *pr,
                         "pmix:client recv callback activated with %d bytes",
                         (NULL == buf) ? -1 : (int)buf->bytes_used);
 
-    /* a zero-byte buffer indicates that this recv is being
-     * completed due to a lost connection */
-    if (PMIX_BUFFER_IS_EMPTY(buf)) {
-        ret = PMIX_ERR_UNREACH;
-        goto report;
-    }
-
     /* init */
     memset(nspace, 0, PMIX_MAX_NSLEN+1);
 
     if (NULL == buf) {
         ret = PMIX_ERR_BAD_PARAM;
         goto report;
     }
+    /* a zero-byte buffer indicates that this recv is being
+     * completed due to a lost connection */
+    if (PMIX_BUFFER_IS_EMPTY(buf)) {
+        ret = PMIX_ERR_UNREACH;
+        goto report;
+    }
 
     /* unpack the returned status */
     cnt = 1;

opal/mca/pmix/pmix2x/pmix/src/event/pmix_event_notification.c

@@ -124,7 +124,9 @@ static pmix_status_t notify_server_of_event(pmix_status_t status,
     if (PMIX_RANGE_PROC_LOCAL != range) {
         /* create the msg object */
         msg = PMIX_NEW(pmix_buffer_t);
-
+        if (NULL == msg) {
+            return PMIX_ERR_NOMEM;
+        }
         /* pack the command */
         PMIX_BFROPS_PACK(rc, pmix_client_globals.myserver, msg, &cmd, 1, PMIX_COMMAND);
         if (PMIX_SUCCESS != rc) {
@@ -263,9 +265,7 @@ static pmix_status_t notify_server_of_event(pmix_status_t status,
   cleanup:
     pmix_output_verbose(2, pmix_globals.debug_output,
                         "client: notifying server - unable to send");
-    if (NULL != msg) {
-        PMIX_RELEASE(msg);
-    }
+    PMIX_RELEASE(msg);
     /* we were unable to send anything, so we just return the error */
     return rc;
 }

opal/mca/pmix/pmix2x/pmix/src/mca/pdl/pdlopen/pdl_pdlopen_module.c

@@ -191,7 +191,7 @@ static int pdlopen_foreachfile(const char *search_path,
             char *abs_name = NULL;
             ret = asprintf(&abs_name, "%s/%s", dirs[i], de->d_name);
             if (0 > ret) {
-                return PMIX_ERR_NOMEM;
+                goto error;
             }
             if (NULL == abs_name) {
                 ret = PMIX_ERR_IN_ERRNO;

opal/mca/pmix/pmix2x/pmix/src/mca/ptl/ptl_types.h

@@ -280,12 +280,12 @@ PMIX_EXPORT extern int pmix_ptl_base_output;
         }                                                                               \
     } while (0)
 
-#define CLOSE_THE_SOCKET(socket)                \
+#define CLOSE_THE_SOCKET(s)                     \
     do {                                        \
-        if (0 <= socket) {                      \
-            shutdown(socket, 2);                \
-            close(socket);                      \
-            socket = -1;                        \
+        if (0 <= (s)) {                         \
+            shutdown((s), 2);                   \
+            close((s));                         \
+            (s) = -1;                           \
         }                                       \
     } while (0)
 

opal/mca/pmix/pmix2x/pmix/src/mca/ptl/tcp/ptl_tcp_component.c

@@ -1240,6 +1240,7 @@ static void process_cbfunc(int sd, short args, void *cbdata)
     pmix_pending_connection_t *pnd = (pmix_pending_connection_t*)cd->cbdata;
     pmix_nspace_t *nptr;
     pmix_rank_info_t *info;
+    pmix_peer_t *peer;
     int rc;
     uint32_t u32;
     pmix_info_t ginfo;
@@ -1294,10 +1295,24 @@ static void process_cbfunc(int sd, short args, void *cbdata)
 
     /* add this nspace to our pool */
     nptr = PMIX_NEW(pmix_nspace_t);
+    if (NULL == nptr) {
+        PMIX_ERROR_LOG(PMIX_ERR_NOMEM);
+        CLOSE_THE_SOCKET(pnd->sd);
+        PMIX_RELEASE(pnd);
+        PMIX_RELEASE(cd);
+        return;
+    }
     nptr->nspace = strdup(cd->proc.nspace);
     pmix_list_append(&pmix_server_globals.nspaces, &nptr->super);
     /* add this tool rank to the nspace */
     info = PMIX_NEW(pmix_rank_info_t);
+    if (NULL == info) {
+        PMIX_ERROR_LOG(PMIX_ERR_NOMEM);
+        CLOSE_THE_SOCKET(pnd->sd);
+        PMIX_RELEASE(pnd);
+        PMIX_RELEASE(cd);
+        return;
+    }
     info->pname.nspace = strdup(cd->proc.nspace);
     info->pname.rank = 0;
     /* need to include the uid/gid for validation */
@@ -1306,7 +1321,14 @@ static void process_cbfunc(int sd, short args, void *cbdata)
     pmix_list_append(&nptr->ranks, &info->super);
 
     /* setup a peer object for this tool */
-    pmix_peer_t *peer = PMIX_NEW(pmix_peer_t);
+    peer = PMIX_NEW(pmix_peer_t);
+    if (NULL == peer) {
+        PMIX_ERROR_LOG(PMIX_ERR_NOMEM);
+        CLOSE_THE_SOCKET(pnd->sd);
+        PMIX_RELEASE(pnd);
+        PMIX_RELEASE(cd);
+        return;
+    }
     /* mark the peer proc type */
     peer->proc_type = PMIX_PROC_TOOL | pnd->proc_type;
     /* add in the nspace pointer */
@@ -1382,11 +1404,11 @@ static void process_cbfunc(int sd, short args, void *cbdata)
     }
 
     /* start the events for this tool */
-    pmix_event_assign(&peer->recv_event, pmix_globals.evbase, pnd->sd,
+    pmix_event_assign(&peer->recv_event, pmix_globals.evbase, peer->sd,
                       EV_READ|EV_PERSIST, pmix_ptl_base_recv_handler, peer);
     pmix_event_add(&peer->recv_event, NULL);
     peer->recv_ev_active = true;
-    pmix_event_assign(&peer->send_event, pmix_globals.evbase, pnd->sd,
+    pmix_event_assign(&peer->send_event, pmix_globals.evbase, peer->sd,
                       EV_WRITE|EV_PERSIST, pmix_ptl_base_send_handler, peer);
     pmix_output_verbose(2, pmix_ptl_base_framework.framework_output,
                         "pmix:server tool %s:%d has connected on socket %d",
@@ -1410,6 +1432,10 @@ static void cnct_cbfunc(pmix_status_t status,
 
     /* need to thread-shift this into our context */
     cd = PMIX_NEW(pmix_setup_caddy_t);
+    if (NULL == cd) {
+        PMIX_ERROR_LOG(PMIX_ERR_NOMEM);
+        return;
+    }
     cd->status = status;
     (void)strncpy(cd->proc.nspace, proc->nspace, PMIX_MAX_NSLEN);
     cd->cbdata = cbdata;

opal/mca/pmix/pmix2x/pmix/src/util/path.c

@@ -402,9 +402,12 @@ char* pmix_find_absolute_path( char* app_name )
     if( NULL != abs_app_name ) {
         char* resolved_path = (char*)malloc(PMIX_PATH_MAX);
         if (NULL == realpath( abs_app_name, resolved_path )) {
+            free(resolved_path);
             return NULL;
         }
-        if( abs_app_name != app_name ) free(abs_app_name);
+        if( abs_app_name != app_name ) {
+            free(abs_app_name);
+        }
         return resolved_path;
     }
     return NULL;

opal/mca/pmix/pmix2x/pmix2x_server_north.c

@@ -670,6 +670,9 @@ static pmix_status_t server_spawn_fn(const pmix_proc_t *p,
         if (NULL != apps[n].env) {
             app->env = opal_argv_copy(apps[n].env);
         }
+        if (NULL != apps[n].cwd) {
+            app->cwd = strdup(apps[n].cwd);
+        }
         app->maxprocs = apps[n].maxprocs;
         for (k=0; k < apps[n].ninfo; k++) {
             oinfo = OBJ_NEW(opal_value_t);