From 0f19862443af8b934910bc994146f8c53092387d Mon Sep 17 00:00:00 2001 From: Weikuan Yu Date: Thu, 8 Jul 2004 16:39:59 +0000 Subject: [PATCH] checking in bug fixes again This commit was SVN r1601. --- src/mca/ptl/elan/src/ptl_elan.c | 6 ------ src/mca/ptl/elan/src/ptl_elan_comm_init.c | 4 +++- 2 files changed, 3 insertions(+), 7 deletions(-) diff --git a/src/mca/ptl/elan/src/ptl_elan.c b/src/mca/ptl/elan/src/ptl_elan.c index c45cd1455f..896d95e8d0 100644 --- a/src/mca/ptl/elan/src/ptl_elan.c +++ b/src/mca/ptl/elan/src/ptl_elan.c @@ -213,12 +213,6 @@ mca_ptl_elan_put (struct mca_ptl_t *ptl, { mca_ptl_elan_desc_item_t *sd; - if (size <= 0) { - sendreq->super.req_mpi_done = true; - sendreq->super.req_pml_done = true; - return OMPI_SUCCESS; - } - /* XXX: fix pml_send? * Why presenting so many arguments while each of them is already * contained in the request descriptors, diff --git a/src/mca/ptl/elan/src/ptl_elan_comm_init.c b/src/mca/ptl/elan/src/ptl_elan_comm_init.c index b36b089771..11361c17e5 100644 --- a/src/mca/ptl/elan/src/ptl_elan_comm_init.c +++ b/src/mca/ptl/elan/src/ptl_elan_comm_init.c @@ -36,17 +36,19 @@ ompi_init_elan_queue_events (mca_ptl_elan_t * ptl, rail = (RAIL *) ptl->ptl_elan_rail; ctx = (ELAN4_CTX *) ptl->ptl_elan_ctx; - flist = &queue->tx_desc_free; /* initialize list */ OBJ_CONSTRUCT (&queue->tx_desc, ompi_list_t); OBJ_CONSTRUCT (&queue->tx_desc_free, ompi_free_list_t); + flist = &queue->tx_desc_free; + main_align = MAX (sizeof (void *), 8); elan_align = MAX (sizeof (int *), 128); main_size = ALIGNUP (sizeof (ompi_ptl_elan_qdma_desc_t), main_align); elan_size = ALIGNUP (sizeof (ompi_elan_event_t), elan_align); + OBJ_CONSTRUCT(&flist->fl_lock, ompi_mutex_t); flist->fl_elem_size = flist->fl_max_to_alloc = 128; flist->fl_num_allocated = 0; flist->fl_num_per_alloc = count = 16;