diff --git a/src/mca/ptl/ptl.h b/src/mca/ptl/ptl.h index 5dc1863585..29c9322af0 100644 --- a/src/mca/ptl/ptl.h +++ b/src/mca/ptl/ptl.h @@ -313,7 +313,7 @@ typedef int (*mca_ptl_base_del_procs_fn_t)( * same PTL. When the request is re-used from the cache, the init function is NOT * called for subsequent sends. */ -typedef void (*mca_ptl_base_request_init_fn_t)( +typedef int (*mca_ptl_base_request_init_fn_t)( struct mca_ptl_t* ptl, struct mca_pml_base_send_request_t* request ); diff --git a/src/mca/ptl/self/src/ptl_self.c b/src/mca/ptl/self/src/ptl_self.c index 12306d3451..bf8c240e75 100644 --- a/src/mca/ptl/self/src/ptl_self.c +++ b/src/mca/ptl/self/src/ptl_self.c @@ -76,9 +76,10 @@ int mca_ptl_self_finalize(struct mca_ptl_t* ptl) return OMPI_SUCCESS; } -void mca_ptl_self_request_init(struct mca_ptl_t* ptl, mca_pml_base_send_request_t* request) +int mca_ptl_self_request_init(struct mca_ptl_t* ptl, mca_pml_base_send_request_t* request) { OBJ_CONSTRUCT(request+1, mca_ptl_base_recv_frag_t); + return OMPI_SUCCESS; } void mca_ptl_self_request_fini(struct mca_ptl_t* ptl, mca_pml_base_send_request_t* request) diff --git a/src/mca/ptl/self/src/ptl_self.h b/src/mca/ptl/self/src/ptl_self.h index 6acd42ce63..15ce0edecf 100644 --- a/src/mca/ptl/self/src/ptl_self.h +++ b/src/mca/ptl/self/src/ptl_self.h @@ -77,7 +77,7 @@ extern mca_ptl_t** mca_ptl_self_module_init( int mca_ptl_self_add_proc(struct mca_ptl_t* ptl, size_t nprocs, struct ompi_proc_t **ompi_proc, struct mca_ptl_base_peer_t** peer_ret, ompi_bitmap_t* reachable); int mca_ptl_self_del_proc(struct mca_ptl_t* ptl, size_t nprocs, struct ompi_proc_t **proc, struct mca_ptl_base_peer_t** ptl_peer); int mca_ptl_self_finalize(struct mca_ptl_t* ptl); -void mca_ptl_self_request_init(struct mca_ptl_t* ptl, struct mca_pml_base_send_request_t* request); +int mca_ptl_self_request_init(struct mca_ptl_t* ptl, struct mca_pml_base_send_request_t* request); void mca_ptl_self_request_fini(struct mca_ptl_t* ptl, struct mca_pml_base_send_request_t* request); int mca_ptl_self_send( struct mca_ptl_t* ptl, struct mca_ptl_base_peer_t* ptl_base_peer, struct mca_pml_base_send_request_t* request, size_t offset, size_t size, int flags ); diff --git a/src/mca/ptl/tcp/src/ptl_tcp.c b/src/mca/ptl/tcp/src/ptl_tcp.c index 3c90835d6b..ec59375ff6 100644 --- a/src/mca/ptl/tcp/src/ptl_tcp.c +++ b/src/mca/ptl/tcp/src/ptl_tcp.c @@ -111,9 +111,10 @@ int mca_ptl_tcp_finalize(struct mca_ptl_t* ptl) return OMPI_SUCCESS; } -void mca_ptl_tcp_request_init(struct mca_ptl_t* ptl, struct mca_pml_base_send_request_t* request) +int mca_ptl_tcp_request_init(struct mca_ptl_t* ptl, struct mca_pml_base_send_request_t* request) { OBJ_CONSTRUCT(request+1, mca_ptl_tcp_send_frag_t); + return OMPI_SUCCESS; } diff --git a/src/mca/ptl/tcp/src/ptl_tcp.h b/src/mca/ptl/tcp/src/ptl_tcp.h index f59f22577c..7a06f6a23d 100644 --- a/src/mca/ptl/tcp/src/ptl_tcp.h +++ b/src/mca/ptl/tcp/src/ptl_tcp.h @@ -172,7 +172,7 @@ extern int mca_ptl_tcp_del_procs( * @param request (IN) Pointer to allocated request. * */ -extern void mca_ptl_tcp_request_init( +extern int mca_ptl_tcp_request_init( struct mca_ptl_t* ptl, struct mca_pml_base_send_request_t* );