From 24684bd66abae3591cef20c39ad0646498babcb7 Mon Sep 17 00:00:00 2001 From: Weikuan Yu Date: Wed, 8 Sep 2004 21:36:02 +0000 Subject: [PATCH] -- Remove a bug on completion Queue support to get. This commit was SVN r2551. --- src/mca/ptl/elan/src/ptl_elan_priv.c | 13 ++++++------- src/mca/ptl/elan/src/ptl_elan_priv.h | 2 +- 2 files changed, 7 insertions(+), 8 deletions(-) diff --git a/src/mca/ptl/elan/src/ptl_elan_priv.c b/src/mca/ptl/elan/src/ptl_elan_priv.c index c9db03eb10..734e729340 100644 --- a/src/mca/ptl/elan/src/ptl_elan_priv.c +++ b/src/mca/ptl/elan/src/ptl_elan_priv.c @@ -632,15 +632,12 @@ mca_ptl_elan_init_get_desc (mca_ptl_elan_module_t *ptl, *size); #if OMPI_PTL_ELAN_COMP_QUEUE - - /* XXX: Chain a QDMA to each queue and - * Have all the srcEvent fired to the Queue - * - * XXX: The chain dma will go directly into a command stream + /* XXX: The chain dma will go directly into a command stream * so we need addend the command queue control bits. * Allocate space from command queues hanged off the CTX. */ - + frag->frag_base.frag_header = *hdr; + ((mca_ptl_elan_ack_header_t *) &frag->frag_base.frag_header)->frag = frag; desc->comp_event->ev_Params[1] = elan4_alloccq_space (ctx, 8, CQ_Size8K); desc->comp_event->ev_CountAndType = E4_EVENT_INIT_VALUE(-32, E4_EVENT_COPY, E4_EVENT_DTYPE_LONG, 8); @@ -1194,7 +1191,9 @@ ptl_elan_send_comp: return OMPI_SUCCESS; } #endif - if (header->hdr_common.hdr_type == MCA_PTL_HDR_TYPE_ACK) { + /* FIXME: Support Completion Queue with Get */ + if (header->hdr_common.hdr_type == MCA_PTL_HDR_TYPE_ACK + || header->hdr_common.hdr_type == MCA_PTL_HDR_TYPE_FIN_ACK) { frag = ((mca_ptl_elan_ack_header_t*)header)->frag; } else { frag = (mca_ptl_elan_send_frag_t *) diff --git a/src/mca/ptl/elan/src/ptl_elan_priv.h b/src/mca/ptl/elan/src/ptl_elan_priv.h index f9b622eedb..afc1698c58 100644 --- a/src/mca/ptl/elan/src/ptl_elan_priv.h +++ b/src/mca/ptl/elan/src/ptl_elan_priv.h @@ -102,7 +102,7 @@ do { \ #define OMPI_PTL_ELAN_NUM_PUTGET (8) #define OMPI_PTL_ELAN_ZERO_FFRAG (0) -#define OMPI_PTL_ELAN_ENABLE_GET (1) +#define OMPI_PTL_ELAN_ENABLE_GET (0) #define OMPI_PTL_ELAN_COMP_QUEUE (0) #define OMPI_PTL_ELAN_THREADING \ (OMPI_PTL_ELAN_COMP_QUEUE && OMPI_HAVE_POSIX_THREADS)