Merge pull request #1436 from rhc54/topic/names

rhc54 · rhc54 · commit 7b84207465bc · 2016-03-08T10:21:46.000-08:00
Ensure the process name is positive when using direct launch
diff --git a/opal/mca/pmix/pmix112/pmix1_client.c b/opal/mca/pmix/pmix112/pmix1_client.c
@@ -120,6 +120,8 @@ int pmix1_client_init(void)
         /* we were launched by someone else, so make the
          * jobid just be the hash of the nspace */
         OPAL_HASH_STR(my_proc.nspace, pname.jobid);
+        /* keep it from being negative */
+        pname.jobid &= ~(0x8000);
     }
     /* insert this into our list of jobids - it will be the
      * first, and so we'll check it first */
diff --git a/opal/mca/pmix/pmix120/pmix120_client.c b/opal/mca/pmix/pmix120/pmix120_client.c
@@ -64,6 +64,8 @@ int pmix120_client_init(void)
         /* we were launched by someone else, so make the
          * jobid just be the hash of the nspace */
         OPAL_HASH_STR(my_proc.nspace, pname.jobid);
+        /* keep it from being negative */
+        pname.jobid &= ~(0x8000);
     }
     /* insert this into our list of jobids - it will be the
      * first, and so we'll check it first */

Original file line number	Diff line number	Diff line change
`@@ -120,6 +120,8 @@ int pmix1_client_init(void)`
`120`	`120`	`/* we were launched by someone else, so make the`
`121`	`121`	`* jobid just be the hash of the nspace */`
`122`	`122`	`OPAL_HASH_STR(my_proc.nspace, pname.jobid);`
	`123`	`+ /* keep it from being negative */`
	`124`	`+ pname.jobid &= ~(0x8000);`
`123`	`125`	`}`
`124`	`126`	`/* insert this into our list of jobids - it will be the`
`125`	`127`	`* first, and so we'll check it first */`
Original file line number	Diff line number	Diff line change
`@@ -64,6 +64,8 @@ int pmix120_client_init(void)`
`64`	`64`	`/* we were launched by someone else, so make the`
`65`	`65`	`* jobid just be the hash of the nspace */`
`66`	`66`	`OPAL_HASH_STR(my_proc.nspace, pname.jobid);`
	`67`	`+ /* keep it from being negative */`
	`68`	`+ pname.jobid &= ~(0x8000);`
`67`	`69`	`}`
`68`	`70`	`/* insert this into our list of jobids - it will be the`
`69`	`71`	`* first, and so we'll check it first */`