From 1bd31aa3ac7f33cdb34dd2055f341373d6f808bb Mon Sep 17 00:00:00 2001 From: George Bosilca Date: Wed, 9 Jan 2008 20:32:39 +0000 Subject: [PATCH] Cleanup the OMPI_DECLSPEC/OMPI_MODULE_DECLSPEC in the PMLs. This commit was SVN r17093. --- ompi/mca/pml/cm/pml_cm.h | 4 ++-- ompi/mca/pml/cm/pml_cm_recvreq.h | 4 ++-- ompi/mca/pml/cm/pml_cm_request.h | 2 +- ompi/mca/pml/cm/pml_cm_sendreq.h | 6 +++--- ompi/mca/pml/dr/pml_dr_comm.h | 4 ++-- ompi/mca/pml/dr/pml_dr_component.h | 2 +- ompi/mca/pml/dr/pml_dr_recvfrag.h | 22 ++++++++++------------ ompi/mca/pml/ob1/pml_ob1_component.h | 2 +- ompi/mca/pml/v/pml_v.h | 2 +- 9 files changed, 23 insertions(+), 25 deletions(-) diff --git a/ompi/mca/pml/cm/pml_cm.h b/ompi/mca/pml/cm/pml_cm.h index 2b2ad16be6..b7c7f8815a 100644 --- a/ompi/mca/pml/cm/pml_cm.h +++ b/ompi/mca/pml/cm/pml_cm.h @@ -28,7 +28,7 @@ BEGIN_C_DECLS -OMPI_DECLSPEC extern mca_pml_base_component_1_0_0_t mca_pml_cm_component; +OMPI_MODULE_DECLSPEC extern mca_pml_base_component_1_0_0_t mca_pml_cm_component; struct mca_mtl_request_t; @@ -36,7 +36,7 @@ struct mca_mtl_request_t; * These are called internally by the library when the send * is completed from its perspective. */ -OMPI_DECLSPEC extern void (*send_completion_callbacks[]) +extern void (*send_completion_callbacks[]) (struct mca_mtl_request_t *mtl_request); struct ompi_pml_cm_t { diff --git a/ompi/mca/pml/cm/pml_cm_recvreq.h b/ompi/mca/pml/cm/pml_cm_recvreq.h index fc0291ad71..26c1f117c3 100644 --- a/ompi/mca/pml/cm/pml_cm_recvreq.h +++ b/ompi/mca/pml/cm/pml_cm_recvreq.h @@ -28,7 +28,7 @@ struct mca_pml_cm_thin_recv_request_t { mca_mtl_request_t req_mtl; /**< the mtl specific memory. This field should be the last in the struct */ }; typedef struct mca_pml_cm_thin_recv_request_t mca_pml_cm_thin_recv_request_t; -OMPI_DECLSPEC OBJ_CLASS_DECLARATION(mca_pml_cm_thin_recv_request_t); +OBJ_CLASS_DECLARATION(mca_pml_cm_thin_recv_request_t); struct mca_pml_cm_hvy_recv_request_t { mca_pml_cm_request_t req_base; @@ -43,7 +43,7 @@ struct mca_pml_cm_hvy_recv_request_t { }; typedef struct mca_pml_cm_hvy_recv_request_t mca_pml_cm_hvy_recv_request_t; -OMPI_DECLSPEC OBJ_CLASS_DECLARATION(mca_pml_cm_hvy_recv_request_t); +OBJ_CLASS_DECLARATION(mca_pml_cm_hvy_recv_request_t); /** * Allocate a recv request from the modules free list. diff --git a/ompi/mca/pml/cm/pml_cm_request.h b/ompi/mca/pml/cm/pml_cm_request.h index 455cff15f3..628f0596f9 100644 --- a/ompi/mca/pml/cm/pml_cm_request.h +++ b/ompi/mca/pml/cm/pml_cm_request.h @@ -51,6 +51,6 @@ struct mca_pml_cm_request_t { /* END: These fields have to match the definition of the mca_pml_base_request_t */ }; typedef struct mca_pml_cm_request_t mca_pml_cm_request_t; -OMPI_DECLSPEC OBJ_CLASS_DECLARATION(mca_pml_cm_request_t); +OBJ_CLASS_DECLARATION(mca_pml_cm_request_t); #endif diff --git a/ompi/mca/pml/cm/pml_cm_sendreq.h b/ompi/mca/pml/cm/pml_cm_sendreq.h index 079bb18ff1..72b13d1232 100644 --- a/ompi/mca/pml/cm/pml_cm_sendreq.h +++ b/ompi/mca/pml/cm/pml_cm_sendreq.h @@ -31,7 +31,7 @@ struct mca_pml_cm_send_request_t { mca_pml_base_send_mode_t req_send_mode; }; typedef struct mca_pml_cm_send_request_t mca_pml_cm_send_request_t; -OMPI_DECLSPEC OBJ_CLASS_DECLARATION(mca_pml_cm_send_request_t); +OBJ_CLASS_DECLARATION(mca_pml_cm_send_request_t); struct mca_pml_cm_thin_send_request_t { @@ -39,7 +39,7 @@ struct mca_pml_cm_thin_send_request_t { mca_mtl_request_t req_mtl; /**< the mtl specific memory. This field should be the last in the struct */ }; typedef struct mca_pml_cm_thin_send_request_t mca_pml_cm_thin_send_request_t; -OMPI_DECLSPEC OBJ_CLASS_DECLARATION(mca_pml_cm_thin_send_request_t); +OBJ_CLASS_DECLARATION(mca_pml_cm_thin_send_request_t); struct mca_pml_cm_hvy_send_request_t { @@ -53,7 +53,7 @@ struct mca_pml_cm_hvy_send_request_t { mca_mtl_request_t req_mtl; /**< the mtl specific memory. This field should be the last in the struct */ }; typedef struct mca_pml_cm_hvy_send_request_t mca_pml_cm_hvy_send_request_t; -OMPI_DECLSPEC OBJ_CLASS_DECLARATION(mca_pml_cm_hvy_send_request_t); +OBJ_CLASS_DECLARATION(mca_pml_cm_hvy_send_request_t); #define MCA_PML_CM_THIN_SEND_REQUEST_ALLOC(sendreq, comm, dst, \ diff --git a/ompi/mca/pml/dr/pml_dr_comm.h b/ompi/mca/pml/dr/pml_dr_comm.h index 0d924db5f6..ed533d92e5 100644 --- a/ompi/mca/pml/dr/pml_dr_comm.h +++ b/ompi/mca/pml/dr/pml_dr_comm.h @@ -70,7 +70,7 @@ struct mca_pml_comm_t { }; typedef struct mca_pml_comm_t mca_pml_dr_comm_t; -OMPI_DECLSPEC OBJ_CLASS_DECLARATION(mca_pml_dr_comm_t); +OBJ_CLASS_DECLARATION(mca_pml_dr_comm_t); /** @@ -81,7 +81,7 @@ OMPI_DECLSPEC OBJ_CLASS_DECLARATION(mca_pml_dr_comm_t); * @return OMPI_SUCCESS or error status on failure. */ -OMPI_DECLSPEC extern int mca_pml_dr_comm_init(mca_pml_dr_comm_t* dr_comm, ompi_communicator_t* ompi_comm); +extern int mca_pml_dr_comm_init(mca_pml_dr_comm_t* dr_comm, ompi_communicator_t* ompi_comm); #if defined(c_plusplus) || defined(__cplusplus) diff --git a/ompi/mca/pml/dr/pml_dr_component.h b/ompi/mca/pml/dr/pml_dr_component.h index 281e00292d..5d367e4f97 100644 --- a/ompi/mca/pml/dr/pml_dr_component.h +++ b/ompi/mca/pml/dr/pml_dr_component.h @@ -27,7 +27,7 @@ extern "C" { /* * PML module functions. */ -OMPI_DECLSPEC extern mca_pml_base_component_1_0_0_t mca_pml_dr_component; +OMPI_MODULE_DECLSPEC extern mca_pml_base_component_1_0_0_t mca_pml_dr_component; #if defined(c_plusplus) || defined(__cplusplus) } diff --git a/ompi/mca/pml/dr/pml_dr_recvfrag.h b/ompi/mca/pml/dr/pml_dr_recvfrag.h index 39e9a3101d..3a7003c377 100644 --- a/ompi/mca/pml/dr/pml_dr_recvfrag.h +++ b/ompi/mca/pml/dr/pml_dr_recvfrag.h @@ -144,11 +144,10 @@ void mca_pml_dr_recv_frag_ack( * Callback from BTL on receipt of a recv_frag. */ -OMPI_DECLSPEC void mca_pml_dr_recv_frag_callback( - mca_btl_base_module_t *btl, - mca_btl_base_tag_t tag, - mca_btl_base_descriptor_t* descriptor, - void* cbdata); +void mca_pml_dr_recv_frag_callback( mca_btl_base_module_t *btl, + mca_btl_base_tag_t tag, + mca_btl_base_descriptor_t* descriptor, + void* cbdata); /** * Match incoming recv_frags against posted receives. @@ -160,13 +159,12 @@ OMPI_DECLSPEC void mca_pml_dr_recv_frag_callback( * @param additional_matches (OUT) List of additional matches * @return OMPI_SUCCESS or error status on failure. */ -OMPI_DECLSPEC bool mca_pml_dr_recv_frag_match( - mca_pml_dr_comm_t* comm, - mca_pml_dr_comm_proc_t* proc, - mca_btl_base_module_t* btl, - mca_pml_dr_match_hdr_t *hdr, - mca_btl_base_segment_t* segments, - size_t num_segments); +bool mca_pml_dr_recv_frag_match( mca_pml_dr_comm_t* comm, + mca_pml_dr_comm_proc_t* proc, + mca_btl_base_module_t* btl, + mca_pml_dr_match_hdr_t *hdr, + mca_btl_base_segment_t* segments, + size_t num_segments); #if defined(c_plusplus) || defined(__cplusplus) } diff --git a/ompi/mca/pml/ob1/pml_ob1_component.h b/ompi/mca/pml/ob1/pml_ob1_component.h index ef2fc29ecb..4648df2f5e 100644 --- a/ompi/mca/pml/ob1/pml_ob1_component.h +++ b/ompi/mca/pml/ob1/pml_ob1_component.h @@ -27,7 +27,7 @@ extern "C" { /* * PML module functions. */ -OMPI_DECLSPEC extern mca_pml_base_component_1_0_0_t mca_pml_ob1_component; +OMPI_MODULE_DECLSPEC extern mca_pml_base_component_1_0_0_t mca_pml_ob1_component; #if defined(c_plusplus) || defined(__cplusplus) } diff --git a/ompi/mca/pml/v/pml_v.h b/ompi/mca/pml/v/pml_v.h index 7db4807d0f..3ecd5af6c7 100644 --- a/ompi/mca/pml/v/pml_v.h +++ b/ompi/mca/pml/v/pml_v.h @@ -26,7 +26,7 @@ struct mca_pml_v_t { }; typedef struct mca_pml_v_t mca_pml_v_t; -OMPI_DECLSPEC extern mca_pml_v_t mca_pml_v; +OMPI_MODULE_DECLSPEC extern mca_pml_v_t mca_pml_v; OMPI_DECLSPEC extern mca_pml_base_component_1_0_0_t mca_pml_v_component; END_C_DECLS