Merge pull request open-mpi#1016 from rhc54/2.0/naming

hppritcha · hppritcha · commit d5c4644d9988 · 2016-03-14T11:20:59.000-06:00
Merge pull request open-mpi#1436 from rhc54/topic/names
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 */

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 */`