Don't require a progress function from the PML. If there is one then the

PML base will take care of the registration with the event library.
Otherwise, (and this apply for the CM case) the MTL are in charge of
registering their own progress function.

This commit was SVN r16415.

ompi/mca/pml/base/pml_base_close.c

@@ -40,7 +40,9 @@ int mca_pml_base_finalize(void) {
 int mca_pml_base_close(void)
 {
     /* turn off the progress code for the pml */
+    if( NULL != mca_pml.pml_progress ) {
         opal_progress_unregister(mca_pml.pml_progress);
+    }
 
     /* Blatently ignore the return code (what would we do to recover,
        anyway?  This module is going away, so errors don't matter

ompi/mca/pml/base/pml_base_select.c

@@ -267,8 +267,9 @@ int mca_pml_base_select(bool enable_progress_threads,
 #endif
 
     /* register the winner's callback */
+    if( NULL != mca_pml.pml_progress ) {
         opal_progress_register(mca_pml.pml_progress);
-
+    }
 
     /* register winner in the modex */
     mca_pml_base_pml_selected(best_component->pmlm_version.mca_component_name);

ompi/mca/pml/cm/Makefile.am

@@ -37,7 +37,6 @@ local_sources = \
 	pml_cm_send.c \
 	pml_cm_sendreq.h \
 	pml_cm_sendreq.c \
-	pml_cm_progress.c \
 	pml_cm_start.c
 
 mcacomponentdir = $(pkglibdir)

ompi/mca/pml/cm/pml_cm.c

@@ -31,7 +31,7 @@ ompi_pml_cm_t ompi_pml_cm = {
         mca_pml_cm_add_procs,
         mca_pml_cm_del_procs,
         mca_pml_cm_enable,
-        mca_pml_cm_progress,
+        NULL, /* No progress function. The MTL register their own */
         mca_pml_cm_add_comm,
         mca_pml_cm_del_comm,
         mca_pml_cm_irecv_init,

ompi/mca/pml/cm/pml_cm_progress.c

@@ -1,19 +0,0 @@
-/*
- * Copyright (c) 2004-2006 The Regents of the University of California.
- *                         All rights reserved.
- * $COPYRIGHT$
- *
- * Additional copyrights may follow
- *
- * $HEADER$
- */
-
-#include "ompi_config.h"
-#include "pml_cm.h"
-
-
-int
-mca_pml_cm_progress(void)
-{
-    return 0;
-}