Back out r14073 - it speeds up TCP latency / bandwidth but at the same time

it kills ROMIO and one-sided performance when using only TCP.  The problem
is that it only allows those two to be progressed every couple of seconds,
leading to what looks like hangs in the one-sided tests (and the ROMIO stuff,
although people seem to not notice that at this point).

This commit was SVN r14142.

The following SVN revision numbers were found above:
  r14073 --> open-mpi/ompi@64fbbc20b8

ompi/mca/bml/r2/bml_r2.c

@@ -9,6 +9,8 @@
  *                         University of Stuttgart.  All rights reserved.
  * Copyright (c) 2004-2006 The Regents of the University of California.
  *                         All rights reserved.
+ * Copyright (c) 2007      Los Alamos National Security, LLC.  All rights
+ *                         reserved. 
  * $COPYRIGHT$
  * 
  * Additional copyrights may follow
@@ -22,8 +24,6 @@
 #include <string.h>
 
 #include "opal/util/show_help.h"
-#include "opal/prefetch.h"
-#include "opal/event/event.h"
 #include "orte/mca/ns/ns.h"
 #include "ompi/class/ompi_bitmap.h"
 #include "ompi/mca/bml/bml.h"
@@ -106,20 +106,11 @@ int mca_bml_r2_progress( void )
     /*
      * Progress each of the BTL modules
      */
-    if( OPAL_LIKELY( 0 != mca_bml_r2.num_btl_progress ) ) {
-        for( i = 0; i < (int)mca_bml_r2.num_btl_progress; i++) {
-            int rc = mca_bml_r2.btl_progress[i]();
-            if(rc > 0) {
-                count += rc;
-            }
+    for( i = 0; i < (int)mca_bml_r2.num_btl_progress; i++) {
+        int rc = mca_bml_r2.btl_progress[i]();
+        if(rc > 0) {
+            count += rc;
         }
-    } else {
-        /**
-         * If there are not callbacks registered it simply means there are no
-         * high performance BTL used by this application. Therefore, we run
-         * on the slow TCP mode, so we make the event engine blocking.
-         */
-        opal_progress_set_event_flag(OPAL_EVLOOP_ONCE);
     }
     return count;
 }

ompi/mca/osc/pt2pt/osc_pt2pt_sync.c

@@ -52,6 +52,7 @@ ompi_osc_pt2pt_progress_long(ompi_osc_pt2pt_module_t *module)
             /* BWB - FIX ME - error handling */
             if (completed > 0) {
                 longreq->req_comp_cb(longreq);
+                break;
             }
         }