Improve the cleanup process in ob1

Remove a redundant statement in the r2 BML.

This commit was SVN r14228.

The following SVN revision numbers were found above:
  r2 --> open-mpi/ompi@58fdc18855

ompi/mca/bml/r2/bml_r2.c

@@ -130,10 +130,6 @@ static int mca_bml_r2_add_btls( void )
     btls = &mca_btl_base_modules_initialized;
     num_btls = opal_list_get_size(btls);
 
-    if(true == mca_bml_r2.btls_added) {
-        return OMPI_SUCCESS; 
-    }
-
     mca_bml_r2.num_btl_modules = 0;
     mca_bml_r2.num_btl_progress = 0;
    

ompi/mca/pml/ob1/pml_ob1.c

@@ -185,6 +185,18 @@ int mca_pml_ob1_del_procs(ompi_proc_t** procs, size_t nprocs)
 
 int mca_pml_ob1_component_fini(void)
 {
+    int rc;
+
+    /* Shutdown BML */
+    if(OMPI_SUCCESS != (rc = mca_bml.bml_finalize()))
+        return rc;
+
+
+    /* Shutdown buffered send */
+    if(OMPI_SUCCESS != (rc = mca_pml_base_bsend_fini())) {
+        return rc;
+    }
+
     /* FIX */
     return OMPI_SUCCESS;
 }

ompi/mca/pml/ob1/pml_ob1_component.c

@@ -223,21 +223,22 @@ int mca_pml_ob1_component_close(void)
     if(OMPI_SUCCESS != (rc = mca_bml_base_close()))
         return rc;
 
-    /* buffered send */
-    if(OMPI_SUCCESS != (rc = mca_pml_base_bsend_fini())) {
+    OBJ_DESTRUCT(&mca_pml_ob1.rdma_pending);
+    OBJ_DESTRUCT(&mca_pml_ob1.pckt_pending);
+    OBJ_DESTRUCT(&mca_pml_ob1.recv_pending);
+    OBJ_DESTRUCT(&mca_pml_ob1.send_pending);
+    OBJ_DESTRUCT(&mca_pml_ob1.buffers);
+    OBJ_DESTRUCT(&mca_pml_ob1.pending_pckts);
+    OBJ_DESTRUCT(&mca_pml_ob1.recv_frags);
+    OBJ_DESTRUCT(&mca_pml_ob1.rdma_frags);
+    OBJ_DESTRUCT(&mca_pml_ob1.recv_requests);
+    OBJ_DESTRUCT(&mca_pml_ob1.send_requests);
+    OBJ_DESTRUCT(&mca_pml_ob1.lock);
+
+    if(OMPI_SUCCESS != (rc = mca_pml_ob1.allocator->alc_finalize(mca_pml_ob1.allocator))) {
         return rc;
     }
 
-    OBJ_DESTRUCT(&mca_pml_ob1.pckt_pending);
-    OBJ_DESTRUCT(&mca_pml_ob1.send_pending);
-    OBJ_DESTRUCT(&mca_pml_ob1.recv_pending);
-    OBJ_DESTRUCT(&mca_pml_ob1.send_requests);
-    OBJ_DESTRUCT(&mca_pml_ob1.recv_requests);
-    OBJ_DESTRUCT(&mca_pml_ob1.rdma_frags);
-    OBJ_DESTRUCT(&mca_pml_ob1.recv_frags);
-    OBJ_DESTRUCT(&mca_pml_ob1.buffers);
-    OBJ_DESTRUCT(&mca_pml_ob1.lock);
-
 #if 0
     if (mca_pml_ob1.send_requests.fl_num_allocated !=
         mca_pml_ob1.send_requests.super.opal_list_length) {