From 61b4bc71a5b3cbe0e6f3664ff0c5bd7290e0d651 Mon Sep 17 00:00:00 2001
From: Weikuan Yu <yuw@lanl.gov>
Date: Mon, 16 Aug 2004 15:48:22 +0000
Subject: [PATCH] check in some cleanup

This commit was SVN r2163.
---
 src/mca/ptl/elan/src/ptl_elan_init.c | 2 --
 src/mca/ptl/elan/src/ptl_elan_priv.c | 4 ++--
 src/mca/ptl/elan/tests/lat.c         | 2 --
 3 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/src/mca/ptl/elan/src/ptl_elan_init.c b/src/mca/ptl/elan/src/ptl_elan_init.c
index c37f947743..3964e26c4b 100644
--- a/src/mca/ptl/elan/src/ptl_elan_init.c
+++ b/src/mca/ptl/elan/src/ptl_elan_init.c
@@ -545,7 +545,6 @@ ompi_mca_ptl_elan_finalize (mca_ptl_elan_component_t * emp)
         RAIL       *rail;
 
         rail = ems->all_rails[i];
-
         free (rail->r_railTable);
 
         /* Free the memory from the rail allocator */
@@ -575,4 +574,3 @@ ompi_mca_ptl_elan_finalize (mca_ptl_elan_component_t * emp)
     END_FUNC(PTL_ELAN_DEBUG_FIN);
     return (OMPI_SUCCESS);
 }
-
diff --git a/src/mca/ptl/elan/src/ptl_elan_priv.c b/src/mca/ptl/elan/src/ptl_elan_priv.c
index 2ff8e62b21..ff14e640e6 100644
--- a/src/mca/ptl/elan/src/ptl_elan_priv.c
+++ b/src/mca/ptl/elan/src/ptl_elan_priv.c
@@ -677,7 +677,7 @@ mca_ptl_elan_drain_recv (mca_ptl_elan_component_t * emp)
 
         OMPI_LOCK (&queue->rx_lock);
 
-#if 0
+#if 1
         rc = (*(int *) (&rxq->qr_doneWord));
 #else
         rc = elan4_pollevent_word (ctx, &rxq->qr_doneWord, 2000);
@@ -789,7 +789,7 @@ mca_ptl_elan_update_desc (mca_ptl_elan_component_t * emp)
 	while (ompi_list_get_size (&queue->tx_desc) > 0) {
             desc = (mca_ptl_elan_send_frag_t *)
                 ompi_list_get_first (&queue->tx_desc);
-#if 0
+#if 1
             rc = * ((int *) (&desc->desc->main_doneWord));
 #else
             /* Poll the completion event for 1usec */
diff --git a/src/mca/ptl/elan/tests/lat.c b/src/mca/ptl/elan/tests/lat.c
index b5fcce069a..bb6e997374 100644
--- a/src/mca/ptl/elan/tests/lat.c
+++ b/src/mca/ptl/elan/tests/lat.c
@@ -27,7 +27,6 @@ main (int argc, char *argv[])
 
     if (argc < 2) {
         fprintf (stderr, "Usage: %s msg_size\n", argv[0]);
-        MPI_Finalize ();
         return 0;
     }
     size = atoi (argv[1]);
@@ -70,7 +69,6 @@ main (int argc, char *argv[])
 	    hostname, __FUNCTION__, __LINE__);
     fflush(stdout);
  
-
     if (myid == 0) {
         double      latency;
         latency = ((1.0e6 * t_end.tv_sec + t_end.tv_usec)