From 8b45b6e3a42b213958b623aeedfc6824c076ac19 Mon Sep 17 00:00:00 2001
From: Weikuan Yu <yuw@lanl.gov>
Date: Mon, 16 Aug 2004 18:37:34 +0000
Subject: [PATCH] Add an additional type  MCA_PTL_HDR_TYPE_FIN for last
 fragment notification

This commit was SVN r2165.
---
 src/mca/ptl/base/ptl_base_header.h   | 1 +
 src/mca/ptl/elan/src/ptl_elan.c      | 2 +-
 src/mca/ptl/elan/src/ptl_elan_priv.c | 7 ++++---
 3 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/src/mca/ptl/base/ptl_base_header.h b/src/mca/ptl/base/ptl_base_header.h
index 2d62fc13af..004f58d6a6 100644
--- a/src/mca/ptl/base/ptl_base_header.h
+++ b/src/mca/ptl/base/ptl_base_header.h
@@ -15,6 +15,7 @@
 #define MCA_PTL_HDR_TYPE_ACK    2
 #define MCA_PTL_HDR_TYPE_NACK   3
 #define MCA_PTL_HDR_TYPE_GET    4
+#define MCA_PTL_HDR_TYPE_FIN    5
 
 #define MCA_PTL_FLAGS_ACK_MATCHED     1
 #define MCA_PTL_FLAGS_ACK_AGGREGATE   2
diff --git a/src/mca/ptl/elan/src/ptl_elan.c b/src/mca/ptl/elan/src/ptl_elan.c
index 98f0498a41..05aa43fb5c 100644
--- a/src/mca/ptl/elan/src/ptl_elan.c
+++ b/src/mca/ptl/elan/src/ptl_elan.c
@@ -348,7 +348,7 @@ mca_ptl_elan_matched (mca_ptl_base_module_t * ptl,
     request = frag->frag_request;
     recv_frag = (mca_ptl_elan_recv_frag_t * ) frag;
 
-#if 1 
+#if 0 
     /* XXX: If to change in PML and PTL/base
      * Two places to setting the frag_peer after match
      * teg_recvreq.c:157 or ptl_base_match.c:131 
diff --git a/src/mca/ptl/elan/src/ptl_elan_priv.c b/src/mca/ptl/elan/src/ptl_elan_priv.c
index ff14e640e6..87febbfc24 100644
--- a/src/mca/ptl/elan/src/ptl_elan_priv.c
+++ b/src/mca/ptl/elan/src/ptl_elan_priv.c
@@ -9,6 +9,7 @@
 #include "datatype/datatype.h"
 #include "mca/pml/base/pml_base_sendreq.h"
 #include "mca/pml/base/pml_base_recvreq.h"
+#include "mca/ptl/base/ptl_base_recvfrag.h"
 #include "ptl_elan.h"
 #include "ptl_elan_peer.h"
 #include "ptl_elan_proc.h"
@@ -77,7 +78,7 @@ mca_ptl_elan_data_frag (struct mca_ptl_elan_module_t *ptl,
     recv_frag->frag_recv.frag_base.frag_size = header->hdr_frag.hdr_frag_length;
 
     /* match with preposted requests */
-    matched = mca_ptl_base_recv_frag_match (
+    matched = ptl->super.ptl_match(
 	    recv_frag->frag_recv.frag_base.frag_owner,
 	    &recv_frag->frag_recv,
 	    &recv_frag->frag_recv.frag_base.frag_header.hdr_match); 
@@ -335,7 +336,7 @@ mca_ptl_elan_init_putget_desc (struct mca_ptl_elan_send_frag_t *frag,
     size_in = *size;
     ctx =  ptl->ptl_elan_ctx;
 
-    hdr->hdr_common.hdr_type = MCA_PTL_HDR_TYPE_LAST;
+    hdr->hdr_common.hdr_type = MCA_PTL_HDR_TYPE_FIN;
     hdr->hdr_common.hdr_flags = flags;
     hdr->hdr_common.hdr_size = sizeof(mca_ptl_base_frag_header_t);
     hdr->hdr_frag.hdr_frag_offset = offset;
@@ -712,7 +713,7 @@ mca_ptl_elan_drain_recv (mca_ptl_elan_component_t * emp)
                 /* a control fragment for a message */
                 mca_ptl_elan_ctrl_frag (ptl, header);
                 break;
-            case MCA_PTL_HDR_TYPE_LAST:
+            case MCA_PTL_HDR_TYPE_FIN:
                 /* a control fragment for a message */
                 mca_ptl_elan_last_frag (ptl, header);
 		break;