removed dependency on ob1

This commit was SVN r6927.

ompi/mca/bml/bml.h

@@ -33,7 +33,6 @@
 #include "include/types.h"
 #include "class/ompi_free_list.h"
 #include "mca/pml/pml.h"
-#include "mca/pml/ob1/pml_ob1_hdr.h" 
 
 /*
  * BML types
@@ -46,7 +45,6 @@ struct mca_mpool_base_resources_t;
 
 /*
  * Cached set of information for each btl 
- * NOTE TO GALEN -- this replaces mca_pml_ob1_endpoint_t
  */
 
 struct mca_bml_base_btl_t {
@@ -199,7 +197,6 @@ static inline mca_bml_base_btl_t* mca_bml_base_btl_array_find(
 /**
  *  Structure associated w/ ompi_proc_t that contains the set
  *  of BTLs used to reach a destinationation
- *  NOTE TO GALEN -- this replaces mca_pml_ob1_proc_t
  */
 struct mca_bml_base_endpoint_t {
     mca_pml_proc_t super;
@@ -298,39 +295,35 @@ static inline void mca_bml_base_prepare_dst(mca_bml_base_btl_t* bml_btl,
 
 
 #if OMPI_HAVE_THREAD_SUPPORT
-#define MCA_BML_BASE_BTL_DES_ALLOC(bml_btl, des, size)                                   \
+#define MCA_BML_BASE_BTL_DES_ALLOC(bml_btl, des, alloc_size, seg_size)                   \
 do  {                                                                                    \
      if(NULL != (des = bml_btl->btl_cache)) {                                            \
         /* atomically acquire the cached descriptor */                                   \
         if(opal_atomic_cmpset_ptr(&bml_btl->btl_cache, des, NULL) == 0) {                \
             bml_btl->btl_cache = NULL;                                                   \
         } else {                                                                         \
-            des = bml_btl->btl_alloc(bml_btl->btl, size +                                \
-               MCA_BTL_DES_MAX_SEGMENTS * sizeof(mca_btl_base_segment_t));               \
+            des = bml_btl->btl_alloc(bml_btl->btl, alloc_size);                          \
         }                                                                                \
     } else {                                                                             \
-            des = bml_btl->btl_alloc(bml_btl->btl, size +                                \
-                MCA_BTL_DES_MAX_SEGMENTS * sizeof(mca_btl_base_segment_t));              \
+            des = bml_btl->btl_alloc(bml_btl->btl, alloc_size);                          \
     }                                                                                    \
-    des->des_src->seg_len = size;                                                        \
+    des->des_src->seg_len = seg_size;                                                    \
     des->des_context = (void*) bml_btl;                                                  \
 } while(0)                                                                               
 #else
-#define MCA_BML_BASE_BTL_DES_ALLOC(bml_btl, descriptor, size)                            \
+#define MCA_BML_BASE_BTL_DES_ALLOC(bml_btl, descriptor, alloc_size, seg_size)            \
 do {                                                                                     \
     if(NULL != (descriptor = bml_btl->btl_cache)) {                                      \
         bml_btl->btl_cache = NULL;                                                       \
     } else {                                                                             \
-        descriptor = bml_btl->btl_alloc(bml_btl->btl, sizeof(mca_pml_ob1_hdr_t) +        \
-            MCA_BTL_DES_MAX_SEGMENTS * sizeof(mca_btl_base_segment_t));                  \
+        descriptor = bml_btl->btl_alloc(bml_btl->btl, alloc_size);                       \
     }                                                                                    \
-    descriptor->des_src->seg_len = size;                                                 \
+    descriptor->des_src->seg_len = seg_size;                                             \
     descriptor->des_context = (void*) bml_btl;                                           \
 } while(0)
 #endif
 
 
-
 /**
  * Return a descriptor
  */