osc/portals4: To allocate a PT, use REQ_OSC_TABLE_ID and test that the right ID is allocated

Author: PDeveze

ompi/mca/osc/portals4/osc_portals4.h

@@ -21,6 +21,8 @@
 
 #include "ompi/mca/mtl/portals4/mtl_portals4.h"
 
+#define REQ_OSC_TABLE_ID     4
+
 #define OSC_PORTALS4_MB_DATA    0x0000000000000000ULL
 #define OSC_PORTALS4_MB_CONTROL 0x1000000000000000ULL
 

ompi/mca/osc/portals4/osc_portals4_component.c

@@ -305,7 +305,7 @@ component_init(bool enable_progress_threads, bool enable_mpi_threads)
     ret = PtlPTAlloc(mca_osc_portals4_component.matching_ni_h,
                      0,
                      mca_osc_portals4_component.matching_eq_h,
-                     4,
+                     REQ_OSC_TABLE_ID,
                      &mca_osc_portals4_component.matching_pt_idx);
     if (PTL_OK != ret) {
         opal_output_verbose(1, ompi_osc_base_framework.framework_output,
@@ -314,6 +314,13 @@ component_init(bool enable_progress_threads, bool enable_mpi_threads)
         return ret;
     }
 
+    if (mca_osc_portals4_component.matching_pt_idx != REQ_OSC_TABLE_ID) {
+        opal_output_verbose(1, ompi_osc_base_framework.framework_output,
+                            "%s:%d: PtlPTAlloc did not allocate the requested PT: %d\n",
+                            __FILE__, __LINE__, mca_osc_portals4_component.matching_pt_idx);
+        return ret;
+    }
+
     OBJ_CONSTRUCT(&mca_osc_portals4_component.requests, opal_free_list_t);
     ret = opal_free_list_init (&mca_osc_portals4_component.requests,
                                sizeof(ompi_osc_portals4_request_t),