Add endpoint parameter to btl_alloc() function. Enables various optimizations

inside BTL. This commit was SVN r16898.
2007-12-09 14:00:42 +00:00 · 2007-12-09 14:00:42 +00:00 · 7364b7cf47
--- a/ompi/mca/bml/bml.h
+++ b/ompi/mca/bml/bml.h
@ -260,7 +260,7 @@ typedef struct mca_bml_base_endpoint_t mca_bml_base_endpoint_t;
 OMPI_DECLSPEC OBJ_CLASS_DECLARATION(mca_bml_base_endpoint_t);

 static inline void mca_bml_base_alloc(mca_bml_base_btl_t* bml_btl, mca_btl_base_descriptor_t** des, uint8_t order, size_t size) { 
-    *des = bml_btl->btl_alloc(bml_btl->btl, order, size);
+    *des = bml_btl->btl_alloc(bml_btl->btl, bml_btl->btl_endpoint, order, size);
 }

 static inline void mca_bml_base_free(mca_bml_base_btl_t* bml_btl, mca_btl_base_descriptor_t* des) { 
--- a/ompi/mca/btl/btl.h
+++ b/ompi/mca/btl/btl.h
@ -515,6 +515,7 @@ typedef int (*mca_btl_base_module_register_error_fn_t)(

 typedef mca_btl_base_descriptor_t* (*mca_btl_base_module_alloc_fn_t)(
    struct mca_btl_base_module_t* btl,
+    struct mca_btl_base_endpoint_t* endpoint,
    uint8_t order,
    size_t size
 );
--- a/ompi/mca/btl/elan/btl_elan.c
+++ b/ompi/mca/btl/elan/btl_elan.c
@ -221,9 +221,11 @@ int mca_btl_elan_register( struct mca_btl_base_module_t* btl,
 * @param size (IN)     Request segment size.
 */

-mca_btl_base_descriptor_t* mca_btl_elan_alloc(struct mca_btl_base_module_t* btl,
-                                              uint8_t order,
-					      size_t size )
+mca_btl_base_descriptor_t* mca_btl_elan_alloc(
+        struct mca_btl_base_module_t* btl,
+        struct mca_btl_base_endpoint_t* peer,
+        uint8_t order,
+        size_t size )
 {
    mca_btl_elan_frag_t* frag;
    int rc;
--- a/ompi/mca/btl/elan/btl_elan.h
+++ b/ompi/mca/btl/elan/btl_elan.h
@ -290,7 +290,8 @@ extern int mca_btl_elan_register(
 */

 extern mca_btl_base_descriptor_t* mca_btl_elan_alloc(
-    struct mca_btl_base_module_t* btl, 
+    struct mca_btl_base_module_t* btl,
+    struct mca_btl_base_endpoint_t* peer,
    uint8_t order,
    size_t size); 

--- a/ompi/mca/btl/gm/btl_gm.c
+++ b/ompi/mca/btl/gm/btl_gm.c
@ -202,6 +202,7 @@ int mca_btl_gm_register_error_cb(

 mca_btl_base_descriptor_t* mca_btl_gm_alloc(
    struct mca_btl_base_module_t* btl,
+    struct mca_btl_base_endpoint_t* endpoint,
    uint8_t order,
    size_t size)
 {
--- a/ompi/mca/btl/gm/btl_gm.h
+++ b/ompi/mca/btl/gm/btl_gm.h
@ -291,7 +291,8 @@ extern int mca_btl_gm_register_error_cb(
 */

 extern mca_btl_base_descriptor_t* mca_btl_gm_alloc(
-    struct mca_btl_base_module_t* btl, 
+    struct mca_btl_base_module_t* btl,
+    struct mca_btl_base_endpoint_t* endpoint,
    uint8_t order,
    size_t size); 

--- a/ompi/mca/btl/mx/btl_mx.c
+++ b/ompi/mca/btl/mx/btl_mx.c
@ -163,6 +163,7 @@ int mca_btl_mx_register( struct mca_btl_base_module_t* btl,
 */

 mca_btl_base_descriptor_t* mca_btl_mx_alloc( struct mca_btl_base_module_t* btl,
+                                             struct mca_btl_base_endpoint_t* endpoint,
                                             uint8_t order,
                                             size_t size )
 {
--- a/ompi/mca/btl/mx/btl_mx.h
+++ b/ompi/mca/btl/mx/btl_mx.h
@ -253,7 +253,8 @@ extern int mca_btl_mx_register(
 * @param size (IN)     Request segment size.
 */

-mca_btl_base_descriptor_t* mca_btl_mx_alloc( struct mca_btl_base_module_t* btl, 
+mca_btl_base_descriptor_t* mca_btl_mx_alloc( struct mca_btl_base_module_t* btl,
+                                             struct mca_btl_base_endpoint_t* endpoint,
                                             uint8_t order,
                                             size_t size );

--- a/ompi/mca/btl/ofud/btl_ofud.c
+++ b/ompi/mca/btl/ofud/btl_ofud.c
@ -218,6 +218,7 @@ int mca_btl_ud_register(struct mca_btl_base_module_t* btl,
 */

 mca_btl_base_descriptor_t* mca_btl_ud_alloc(struct mca_btl_base_module_t* btl,
+                                            struct mca_btl_base_endpoint_t* endpoint,
                                            uint8_t order,
                                            size_t size)
 {
--- a/ompi/mca/btl/ofud/btl_ofud.h
+++ b/ompi/mca/btl/ofud/btl_ofud.h
@ -294,6 +294,7 @@ extern int mca_btl_ud_send(struct mca_btl_base_module_t* btl,

 extern mca_btl_base_descriptor_t* mca_btl_ud_alloc(
                                              struct mca_btl_base_module_t* btl,
+                                              struct mca_btl_base_endpoint_t* endpoint,
                                              uint8_t order,
                                              size_t size);

--- a/ompi/mca/btl/openib/btl_openib.c
+++ b/ompi/mca/btl/openib/btl_openib.c
@ -493,6 +493,7 @@ int mca_btl_openib_register_error_cb(
 */
 mca_btl_base_descriptor_t* mca_btl_openib_alloc(
    struct mca_btl_base_module_t* btl,
+    struct mca_btl_base_endpoint_t* endpoint,
    uint8_t order,
    size_t size)
 {
--- a/ompi/mca/btl/openib/btl_openib.h
+++ b/ompi/mca/btl/openib/btl_openib.h
@ -474,9 +474,10 @@ extern int mca_btl_openib_get(
 * @param size (IN)     Requested descriptor size.
 */
 extern mca_btl_base_descriptor_t* mca_btl_openib_alloc(
-                                                       struct mca_btl_base_module_t* btl, 
-                                                       uint8_t order,
-                                                       size_t size); 
+        struct mca_btl_base_module_t* btl,
+        struct mca_btl_base_endpoint_t* endpoint,
+        uint8_t order,
+        size_t size); 
    

 /**
--- a/ompi/mca/btl/portals/btl_portals.c
+++ b/ompi/mca/btl/portals/btl_portals.c
@ -241,8 +241,9 @@ mca_btl_portals_register(struct mca_btl_base_module_t* btl_base,

 mca_btl_base_descriptor_t*
 mca_btl_portals_alloc(struct mca_btl_base_module_t* btl_base,
+                      struct mca_btl_base_endpoint_t* endpoint,
                      uint8_t order,
-                       size_t size)
+                      size_t size)
 {
    int rc;
    mca_btl_portals_frag_t* frag;
--- a/ompi/mca/btl/portals/btl_portals.h
+++ b/ompi/mca/btl/portals/btl_portals.h
@ -172,6 +172,7 @@ int mca_btl_portals_register(struct mca_btl_base_module_t* btl_base,

 mca_btl_base_descriptor_t* 
 mca_btl_portals_alloc(struct mca_btl_base_module_t* btl_base, 
+                      struct mca_btl_base_endpoint_t* endpoint,
                      uint8_t order,
                      size_t size); 

--- a/ompi/mca/btl/sctp/btl_sctp.c
+++ b/ompi/mca/btl/sctp/btl_sctp.c
@ -184,6 +184,7 @@ int mca_btl_sctp_register(

 mca_btl_base_descriptor_t* mca_btl_sctp_alloc(
    struct mca_btl_base_module_t* btl,
+    struct mca_btl_base_endpoint_t* endpoint,
    uint8_t order,
    size_t size)
 {
--- a/ompi/mca/btl/sctp/btl_sctp.h
+++ b/ompi/mca/btl/sctp/btl_sctp.h
@ -292,6 +292,7 @@ extern int mca_btl_sctp_register(

 extern mca_btl_base_descriptor_t* mca_btl_sctp_alloc(
    struct mca_btl_base_module_t* btl,
+    struct mca_btl_base_endpoint_t* endpoint,
    uint8_t order,
    size_t size); 

--- a/ompi/mca/btl/self/btl_self.c
+++ b/ompi/mca/btl/self/btl_self.c
@ -148,9 +148,11 @@ int mca_btl_self_register( struct mca_btl_base_module_t* btl,
 * @param btl (IN)      BTL module
 * @param size (IN)     Request segment size.
 */
-mca_btl_base_descriptor_t* mca_btl_self_alloc( struct mca_btl_base_module_t* btl,
-                                               uint8_t order,
-                                               size_t size )
+mca_btl_base_descriptor_t* mca_btl_self_alloc(
+        struct mca_btl_base_module_t* btl,
+        struct mca_btl_base_endpoint_t* endpoint,
+        uint8_t order,
+        size_t size )
 {
    mca_btl_self_frag_t* frag;
    int rc;
--- a/ompi/mca/btl/self/btl_self.h
+++ b/ompi/mca/btl/self/btl_self.h
@ -163,6 +163,7 @@ int mca_btl_self_register(
 */
 mca_btl_base_descriptor_t* mca_btl_self_alloc(
    struct mca_btl_base_module_t* btl,
+    struct mca_btl_base_endpoint_t* endpoint,
    uint8_t order,
    size_t size
 );
--- a/ompi/mca/btl/sm/btl_sm.c
+++ b/ompi/mca/btl/sm/btl_sm.c
@ -719,6 +719,7 @@ int mca_btl_sm_register_error_cb(
 */
 extern mca_btl_base_descriptor_t* mca_btl_sm_alloc(
    struct mca_btl_base_module_t* btl,
+    struct mca_btl_base_endpoint_t* endpoint,
    uint8_t order,
    size_t size)
 {
--- a/ompi/mca/btl/sm/btl_sm.h
+++ b/ompi/mca/btl/sm/btl_sm.h
@ -278,6 +278,7 @@ extern int mca_btl_sm_register(
 */
 extern mca_btl_base_descriptor_t* mca_btl_sm_alloc(
    struct mca_btl_base_module_t* btl,
+    struct mca_btl_base_endpoint_t* endpoint,
    uint8_t order,
    size_t size
 );
--- a/ompi/mca/btl/tcp/btl_tcp.c
+++ b/ompi/mca/btl/tcp/btl_tcp.c
@ -186,6 +186,7 @@ int mca_btl_tcp_register(

 mca_btl_base_descriptor_t* mca_btl_tcp_alloc(
    struct mca_btl_base_module_t* btl,
+    struct mca_btl_base_endpoint_t* endpoint,
    uint8_t order,
    size_t size)
 {
--- a/ompi/mca/btl/tcp/btl_tcp.h
+++ b/ompi/mca/btl/tcp/btl_tcp.h
@ -293,7 +293,8 @@ extern int mca_btl_tcp_register(
 */

 extern mca_btl_base_descriptor_t* mca_btl_tcp_alloc(
-    struct mca_btl_base_module_t* btl, 
+    struct mca_btl_base_module_t* btl,
+    struct mca_btl_base_endpoint_t* endpoint,
    uint8_t order,
    size_t size); 

--- a/ompi/mca/btl/template/btl_template.c
+++ b/ompi/mca/btl/template/btl_template.c
@ -165,6 +165,7 @@ int mca_btl_template_register(

 mca_btl_base_descriptor_t* mca_btl_template_alloc(
    struct mca_btl_base_module_t* btl,
+    struct mca_btl_base_endpoint_t* endpoint,
    uint8_t order,
    size_t size)
 {
--- a/ompi/mca/btl/template/btl_template.h
+++ b/ompi/mca/btl/template/btl_template.h
@ -257,7 +257,8 @@ extern int mca_btl_template_register(
 */

 extern mca_btl_base_descriptor_t* mca_btl_template_alloc(
-    struct mca_btl_base_module_t* btl, 
+    struct mca_btl_base_module_t* btl,
+    struct mca_btl_base_endpoint_t* endpoint,
    uint8_t order,
    size_t size); 

--- a/ompi/mca/btl/udapl/btl_udapl.c
+++ b/ompi/mca/btl/udapl/btl_udapl.c
@ -735,6 +735,7 @@ int mca_btl_udapl_register(

 mca_btl_base_descriptor_t* mca_btl_udapl_alloc(
    struct mca_btl_base_module_t* btl,
+    struct mca_btl_base_endpoint_t* endpoint,
    uint8_t order,
    size_t size)
 {
--- a/ompi/mca/btl/udapl/btl_udapl.h
+++ b/ompi/mca/btl/udapl/btl_udapl.h
@ -342,7 +342,8 @@ extern int mca_btl_udapl_register(
 */

 extern mca_btl_base_descriptor_t* mca_btl_udapl_alloc(
-    struct mca_btl_base_module_t* btl, 
+    struct mca_btl_base_module_t* btl,
+    struct mca_btl_base_endpoint_t* endpoint,
    uint8_t order,
    size_t size);