updtae short recv blocks to properly setup for triggered operations (where

they also store the triggered start message)

This commit was SVN r24777.

ompi/mca/mtl/portals4/mtl_portals4_recv_short.c

@@ -69,14 +69,24 @@ static inline int
 ompi_mtl_portals4_activate_block(ompi_mtl_portals4_recv_short_block_t *block)
 {
     ptl_match_bits_t match_bits = PTL_SHORT_MSG;
-    ptl_match_bits_t ignore_bits = PTL_CONTEXT_MASK | PTL_SOURCE_MASK | PTL_TAG_MASK;
+    ptl_match_bits_t ignore_bits;
     ptl_me_t me;
     int ret;
 
+    if (ompi_mtl_portals4.protocol != triggered) {
+        ignore_bits = PTL_CONTEXT_MASK | PTL_SOURCE_MASK | PTL_TAG_MASK;
+    } else {
+        ignore_bits = ~0ULL;
+    }
+
     me.start = block->start;
     me.length = block->mtl->recv_short_size;
     me.ct_handle = PTL_CT_NONE;
-    me.min_free = block->mtl->eager_limit;
+    if (ompi_mtl_portals4.protocol != triggered) {
+        me.min_free = block->mtl->eager_limit;
+    } else {
+        me.min_free = block->mtl->eager_limit + 8;
+    }
     me.ac_id.uid = PTL_UID_ANY;
     me.options = PTL_ME_OP_PUT | PTL_ME_MANAGE_LOCAL | PTL_ME_NO_TRUNCATE | 
         PTL_ME_MAY_ALIGN | PTL_ME_ACK_DISABLE | PTL_ME_EVENT_COMM_DISABLE;