opal/pmix: fix pmix jobid calculation if external PMIx server is used.

artpol84 · artpol84 · commit c5a91c5c9dd2 · 2016-08-15T21:13:51.000+03:00
diff --git a/opal/mca/pmix/ext114/pmix_ext_client.c b/opal/mca/pmix/ext114/pmix_ext_client.c
@@ -24,7 +24,6 @@
 #include <unistd.h>
 #endif
 
-#include "opal/hash_string.h"
 #include "opal/util/argv.h"
 #include "opal/util/proc.h"
 
@@ -130,7 +129,7 @@ int pmix1_client_init(void)
     } else {
         /* 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);
+        OPAL_HASH_JOBID(my_proc.nspace, pname.jobid);
     }
     /* insert this into our list of jobids - it will be the
      * first, and so we'll check it first */
@@ -702,7 +701,7 @@ int pmix1_lookup(opal_list_t *data, opal_list_t *info)
             } else {
                 /* we were launched by someone else, so make the
                  * jobid just be the hash of the nspace */
-                OPAL_HASH_STR(pdata[n].proc.nspace, d->proc.jobid);
+                OPAL_HASH_JOBID(pdata[n].proc.nspace, d->proc.jobid);
             }
             /* if we don't already have it, add this to our jobid tracker */
             job = NULL;
@@ -765,7 +764,7 @@ static void lk_cbfunc(pmix_status_t status,
             } else {
                 /* we were launched by someone else, so make the
                  * jobid just be the hash of the nspace */
-                OPAL_HASH_STR(data[n].proc.nspace, d->proc.jobid);
+                OPAL_HASH_JOBID(data[n].proc.nspace, d->proc.jobid);
             }
             /* if we don't already have it, add this to our jobid tracker */
             job = NULL;
@@ -950,7 +949,7 @@ int pmix1_spawn(opal_list_t *job_info, opal_list_t *apps, opal_jobid_t *jobid)
         } else {
             /* we were launched by someone else, so make the
              * jobid just be the hash of the nspace */
-            OPAL_HASH_STR(nspace, *jobid);
+            OPAL_HASH_JOBID(nspace, *jobid);
         }
         /* add this to our jobid tracker */
         job = OBJ_NEW(opal_pmix1_jobid_trkr_t);
@@ -980,7 +979,7 @@ static void spcbfunc(pmix_status_t status,
         } else {
             /* we were launched by someone else, so make the
              * jobid just be the hash of the nspace */
-            OPAL_HASH_STR(nspace, jobid);
+            OPAL_HASH_JOBID(nspace, jobid);
         }
         /* add this to our jobid tracker */
         job = OBJ_NEW(opal_pmix1_jobid_trkr_t);
@@ -1265,7 +1264,7 @@ int pmix1_resolve_peers(const char *nodename, opal_jobid_t jobid,
             } else {
                 /* we were launched by someone else, so make the
                  * jobid just be the hash of the nspace */
-                OPAL_HASH_STR(array[n].nspace, nm->name.jobid);
+                OPAL_HASH_JOBID(array[n].nspace, nm->name.jobid);
             }
             /* if we don't already have it, add this to our jobid tracker */
             job = NULL;
diff --git a/opal/mca/pmix/ext20/pmix_ext20_client.c b/opal/mca/pmix/ext20/pmix_ext20_client.c
@@ -26,7 +26,6 @@
 #include <unistd.h>
 #endif
 
-#include "opal/hash_string.h"
 #include "opal/util/argv.h"
 #include "opal/util/proc.h"
 
@@ -85,7 +84,7 @@ int ext20_client_init(void)
     } else {
         /* 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);
+        OPAL_HASH_JOBID(my_proc.nspace, pname.jobid);
     }
     /* insert this into our list of jobids - it will be the
      * first, and so we'll check it first */
@@ -672,7 +671,7 @@ int ext20_lookup(opal_list_t *data, opal_list_t *info)
             } else {
                 /* we were launched by someone else, so make the
                  * jobid just be the hash of the nspace */
-                OPAL_HASH_STR(pdata[n].proc.nspace, d->proc.jobid);
+                OPAL_HASH_JOBID(pdata[n].proc.nspace, d->proc.jobid);
             }
             /* if we don't already have it, add this to our jobid tracker */
             job = NULL;
@@ -735,7 +734,7 @@ static void lk_cbfunc(pmix_status_t status,
             } else {
                 /* we were launched by someone else, so make the
                  * jobid just be the hash of the nspace */
-                OPAL_HASH_STR(data[n].proc.nspace, d->proc.jobid);
+                OPAL_HASH_JOBID(data[n].proc.nspace, d->proc.jobid);
             }
             /* if we don't already have it, add this to our jobid tracker */
             job = NULL;
@@ -916,7 +915,7 @@ int ext20_spawn(opal_list_t *job_info, opal_list_t *apps, opal_jobid_t *jobid)
         } else {
             /* we were launched by someone else, so make the
              * jobid just be the hash of the nspace */
-            OPAL_HASH_STR(nspace, *jobid);
+            OPAL_HASH_JOBID(nspace, *jobid);
         }
         /* add this to our jobid tracker */
         job = OBJ_NEW(opal_ext20_jobid_trkr_t);
@@ -950,7 +949,7 @@ static void spcbfunc(pmix_status_t status,
         } else {
             /* we were launched by someone else, so make the
              * jobid just be the hash of the nspace */
-            OPAL_HASH_STR(nspace, jobid);
+            OPAL_HASH_JOBID(nspace, jobid);
         }
         /* add this to our jobid tracker */
         job = OBJ_NEW(opal_ext20_jobid_trkr_t);
@@ -1229,7 +1228,7 @@ int ext20_resolve_peers(const char *nodename, opal_jobid_t jobid,
             } else {
                 /* we were launched by someone else, so make the
                  * jobid just be the hash of the nspace */
-                OPAL_HASH_STR(array[n].nspace, nm->name.jobid);
+                OPAL_HASH_JOBID(array[n].nspace, nm->name.jobid);
             }
             /* if we don't already have it, add this to our jobid tracker */
             job = NULL;
diff --git a/opal/mca/pmix/pmix.h b/opal/mca/pmix/pmix.h
@@ -27,6 +27,7 @@
 #include "opal/dss/dss.h"
 #include "opal/util/error.h"
 #include "opal/util/proc.h"
+#include "opal/hash_string.h"
 
 #include "opal/mca/pmix/pmix_types.h"
 #include "opal/mca/pmix/pmix_server.h"
@@ -42,6 +43,14 @@ extern int opal_pmix_base_exchange(opal_value_t *info,
                                    opal_pmix_pdata_t *pdat,
                                    int timeout);
 
+/*
+ * Count the fash for the the external RM
+ */
+#define OPAL_HASH_JOBID( str, hash ){               \
+    OPAL_HASH_STR( str, hash );                     \
+    hash &= ~(0x8000);                              \
+}
+
 /**
  * Provide a simplified macro for sending data via modex
  * to other processes. The macro requires four arguments:
diff --git a/opal/mca/pmix/pmix2x/pmix2x_client.c b/opal/mca/pmix/pmix2x/pmix2x_client.c
@@ -85,7 +85,7 @@ int pmix2x_client_init(void)
     } else {
         /* 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);
+        OPAL_HASH_JOBID(my_proc.nspace, pname.jobid);
     }
     /* insert this into our list of jobids - it will be the
      * first, and so we'll check it first */
@@ -672,7 +672,7 @@ int pmix2x_lookup(opal_list_t *data, opal_list_t *info)
             } else {
                 /* we were launched by someone else, so make the
                  * jobid just be the hash of the nspace */
-                OPAL_HASH_STR(pdata[n].proc.nspace, d->proc.jobid);
+                OPAL_HASH_JOBID(pdata[n].proc.nspace, d->proc.jobid);
             }
             /* if we don't already have it, add this to our jobid tracker */
             job = NULL;
@@ -735,7 +735,7 @@ static void lk_cbfunc(pmix_status_t status,
             } else {
                 /* we were launched by someone else, so make the
                  * jobid just be the hash of the nspace */
-                OPAL_HASH_STR(data[n].proc.nspace, d->proc.jobid);
+                OPAL_HASH_JOBID(data[n].proc.nspace, d->proc.jobid);
             }
             /* if we don't already have it, add this to our jobid tracker */
             job = NULL;
@@ -916,7 +916,7 @@ int pmix2x_spawn(opal_list_t *job_info, opal_list_t *apps, opal_jobid_t *jobid)
         } else {
             /* we were launched by someone else, so make the
              * jobid just be the hash of the nspace */
-            OPAL_HASH_STR(nspace, *jobid);
+            OPAL_HASH_JOBID(nspace, *jobid);
         }
         /* add this to our jobid tracker */
         job = OBJ_NEW(opal_pmix2x_jobid_trkr_t);
@@ -950,7 +950,7 @@ static void spcbfunc(pmix_status_t status,
         } else {
             /* we were launched by someone else, so make the
              * jobid just be the hash of the nspace */
-            OPAL_HASH_STR(nspace, jobid);
+            OPAL_HASH_JOBID(nspace, jobid);
         }
         /* add this to our jobid tracker */
         job = OBJ_NEW(opal_pmix2x_jobid_trkr_t);
@@ -1229,7 +1229,7 @@ int pmix2x_resolve_peers(const char *nodename, opal_jobid_t jobid,
             } else {
                 /* we were launched by someone else, so make the
                  * jobid just be the hash of the nspace */
-                OPAL_HASH_STR(array[n].nspace, nm->name.jobid);
+                OPAL_HASH_JOBID(array[n].nspace, nm->name.jobid);
             }
             /* if we don't already have it, add this to our jobid tracker */
             job = NULL;
