Correctly handle the length for unexpected messages (add one more field in the recv frag

struct).

This commit was SVN r5944.

src/mca/ptl/gm/ptl_gm.c

@@ -382,10 +382,7 @@ mca_ptl_gm_matched( mca_ptl_base_module_t* ptl,
         unsigned int max_data, out_size;
         int freeAfter;
 
-        iov.iov_len = mca_ptl_gm_component.gm_segment_size - sizeof(mca_ptl_base_rendezvous_header_t);
-        if( frag->frag_base.frag_size < iov.iov_len ) {
-            iov.iov_len = frag->frag_base.frag_size;
-        }
+        iov.iov_len = recv_frag->attached_data_length;
         /* Here we expect that frag_addr is the begin of the buffer header included */
         iov.iov_base = frag->frag_base.frag_addr;
     

src/mca/ptl/gm/ptl_gm_priv.c

@@ -554,7 +554,6 @@ int mca_ptl_gm_peer_send( struct mca_ptl_base_module_t* ptl,
     } else {
         iov.iov_len = 0;  /* no data will be transmitted */
     }
-    
     /* adjust size and request offset to reflect actual number of bytes
      * packed by convertor
      */
@@ -608,7 +607,6 @@ mca_ptl_gm_recv_frag_match( struct mca_ptl_gm_module_t *ptl,
 {
     mca_ptl_gm_recv_frag_t* recv_frag;
     bool matched;
-    uint64_t length;
 
     /* allocate a receive fragment */
     recv_frag = mca_ptl_gm_alloc_recv_frag( (struct mca_ptl_base_module_t*)ptl );
@@ -623,8 +621,9 @@ mca_ptl_gm_recv_frag_match( struct mca_ptl_gm_module_t *ptl,
             (char*)hdr + sizeof(mca_ptl_base_rendezvous_header_t);
         recv_frag->frag_recv.frag_base.frag_size = hdr->hdr_rndv.hdr_match.hdr_msg_length;
     }
-    recv_frag->frag_recv.frag_is_buffered = false;
-    recv_frag->have_allocated_buffer = false;
+    recv_frag->frag_recv.frag_is_buffered    = false;
+    recv_frag->have_allocated_buffer         = false;
+    recv_frag->attached_data_length          = msg_len - sizeof(mca_ptl_base_rendezvous_header_t);
     recv_frag->frag_recv.frag_base.frag_peer = NULL;
     recv_frag->frag_recv.frag_base.frag_header.hdr_rndv = hdr->hdr_rndv;
     matched = ptl->super.ptl_match( &(ptl->super),
@@ -632,15 +631,11 @@ mca_ptl_gm_recv_frag_match( struct mca_ptl_gm_module_t *ptl,
                                     &(recv_frag->frag_recv.frag_base.frag_header.hdr_match) );
     if( true == matched ) return NULL;  /* done and fragment already removed */
 
-    length = mca_ptl_gm_component.gm_segment_size - sizeof(mca_ptl_base_rendezvous_header_t);
-    if( recv_frag->frag_recv.frag_base.frag_size < length ) {
-        length = recv_frag->frag_recv.frag_base.frag_size;
-    }
     /* get some memory and copy the data inside. We can then release the receive buffer */
-    if( 0 != length ) {
+    if( 0 != (recv_frag->attached_data_length) ) {
         char* ptr = (char*)gm_get_local_buffer();
         recv_frag->have_allocated_buffer = true;
-        memcpy( ptr, recv_frag->frag_recv.frag_base.frag_addr, length );
+        memcpy( ptr, recv_frag->frag_recv.frag_base.frag_addr, recv_frag->attached_data_length );
         recv_frag->frag_recv.frag_base.frag_addr = ptr;
     } else {
         recv_frag->frag_recv.frag_base.frag_addr = NULL;

src/mca/ptl/gm/ptl_gm_sendfrag.h

@@ -99,13 +99,14 @@ extern "C" {
     struct mca_ptl_gm_recv_frag_t {
         mca_ptl_base_recv_frag_t frag_recv;
         uint64_t     frag_bytes_processed;
-	uint64_t     frag_bytes_validated;  /**< amount of data for which we receive an ack */
-	uint64_t     frag_offset;
-	mca_ptl_gm_pipeline_info_t pipeline;  /**< storing the information about the status of
-					       *   the pipeline for long messages. */
-	uint32_t     type;
+        uint64_t     frag_bytes_validated;  /**< amount of data for which we receive an ack */
+        uint64_t     frag_offset;
+        mca_ptl_gm_pipeline_info_t pipeline;  /**< storing the information about the status of
+                                               *   the pipeline for long messages. */
+        uint32_t     type;
         bool         matched;
         bool         have_allocated_buffer;
+        uint32_t     attached_data_length;
     };
     typedef struct mca_ptl_gm_recv_frag_t mca_ptl_gm_recv_frag_t;