diff --git a/ompi/mca/pml/bfo/pml_bfo.c b/ompi/mca/pml/bfo/pml_bfo.c index 0bfd85a023..2d76de1b49 100644 --- a/ompi/mca/pml/bfo/pml_bfo.c +++ b/ompi/mca/pml/bfo/pml_bfo.c @@ -652,11 +652,11 @@ void mca_pml_bfo_process_pending_rdma(void) void mca_pml_bfo_error_handler( struct mca_btl_base_module_t* btl, int32_t flags, - ompi_proc_t* errproc, char* btlname ) { + ompi_proc_t* errproc, char* btlinfo ) { /* BFO FAILOVER CODE - begin */ /* If we get a non-fatal error, try to failover */ if (flags & MCA_BTL_ERROR_FLAGS_NONFATAL) { - mca_pml_bfo_failover_error_handler(btl, flags, errproc, btlname); + mca_pml_bfo_failover_error_handler(btl, flags, errproc, btlinfo); /* BFO FAILOVER CODE - end */ } else { orte_errmgr.abort(-1, NULL); diff --git a/ompi/mca/pml/bfo/pml_bfo_rdmafrag.h b/ompi/mca/pml/bfo/pml_bfo_rdmafrag.h index 51dc4727b2..1e7923bf60 100644 --- a/ompi/mca/pml/bfo/pml_bfo_rdmafrag.h +++ b/ompi/mca/pml/bfo/pml_bfo_rdmafrag.h @@ -68,5 +68,6 @@ do { \ END_C_DECLS + #endif diff --git a/ompi/mca/pml/bfo/pml_bfo_recvfrag.c b/ompi/mca/pml/bfo/pml_bfo_recvfrag.c index 857866ca32..5b9bce1a53 100644 --- a/ompi/mca/pml/bfo/pml_bfo_recvfrag.c +++ b/ompi/mca/pml/bfo/pml_bfo_recvfrag.c @@ -28,9 +28,13 @@ #include "opal/class/opal_list.h" #include "opal/threads/mutex.h" #include "opal/prefetch.h" + #include "ompi/constants.h" #include "ompi/communicator/communicator.h" #include "ompi/mca/pml/pml.h" +#include "ompi/peruse/peruse-internal.h" +#include "ompi/memchecker.h" + #include "pml_bfo.h" #include "pml_bfo_comm.h" #include "pml_bfo_recvfrag.h" @@ -40,9 +44,6 @@ /* BFO FAILOVER CODE - begin */ #include "pml_bfo_failover.h" /* BFO FAILOVER CODE - end */ -#include "ompi/peruse/peruse-internal.h" -#include "ompi/memchecker.h" - OBJ_CLASS_INSTANCE( mca_pml_bfo_buffer_t, ompi_free_list_item_t, diff --git a/ompi/mca/pml/bfo/pml_bfo_recvfrag.h b/ompi/mca/pml/bfo/pml_bfo_recvfrag.h index fc94975d7b..4214832960 100644 --- a/ompi/mca/pml/bfo/pml_bfo_recvfrag.h +++ b/ompi/mca/pml/bfo/pml_bfo_recvfrag.h @@ -168,5 +168,6 @@ extern void mca_pml_bfo_recv_frag_callback_fin( mca_btl_base_module_t *btl, END_C_DECLS + #endif diff --git a/ompi/mca/pml/bfo/pml_bfo_recvreq.c b/ompi/mca/pml/bfo/pml_bfo_recvreq.c index bdc247f495..1a3ba3101f 100644 --- a/ompi/mca/pml/bfo/pml_bfo_recvreq.c +++ b/ompi/mca/pml/bfo/pml_bfo_recvreq.c @@ -345,7 +345,6 @@ static int mca_pml_bfo_recv_request_ack( recvreq->req_send_offset == bytes_received); } - /** * Return resources used by the RDMA */ @@ -522,9 +521,8 @@ void mca_pml_bfo_recv_request_progress_frag( mca_pml_bfo_recv_request_t* recvreq mca_btl_base_segment_t* segments, size_t num_segments ) { - size_t bytes_received = 0; + size_t bytes_received = 0, data_offset = 0; size_t bytes_delivered __opal_attribute_unused__; /* is being set to zero in MCA_PML_BFO_RECV_REQUEST_UNPACK */ - size_t data_offset = 0; mca_pml_bfo_hdr_t* hdr = (mca_pml_bfo_hdr_t*)segments->seg_addr.pval; MCA_PML_BFO_COMPUTE_SEGMENT_LENGTH( segments, num_segments, diff --git a/ompi/mca/pml/csum/pml_csum_rdma.c b/ompi/mca/pml/csum/pml_csum_rdma.c index 9c59579f2a..6b29611b61 100644 --- a/ompi/mca/pml/csum/pml_csum_rdma.c +++ b/ompi/mca/pml/csum/pml_csum_rdma.c @@ -88,7 +88,7 @@ size_t mca_pml_csum_rdma_btls( return 0; mca_pml_csum_calc_weighted_length(rdma_btls, num_btls_used, size, - weight_total); + weight_total); bml_endpoint->btl_rdma_index = (bml_endpoint->btl_rdma_index + 1) % num_btls; return num_btls_used; diff --git a/ompi/mca/pml/csum/pml_csum_recvfrag.c b/ompi/mca/pml/csum/pml_csum_recvfrag.c index 85bc0630d0..ebe3d304ae 100644 --- a/ompi/mca/pml/csum/pml_csum_recvfrag.c +++ b/ompi/mca/pml/csum/pml_csum_recvfrag.c @@ -28,7 +28,6 @@ */ #include "ompi_config.h" -#include "ompi/constants.h" #include "opal/class/opal_list.h" #include "opal/util/crc.h" @@ -41,6 +40,7 @@ #include "orte/mca/notifier/notifier.h" #include "orte/mca/errmgr/errmgr.h" +#include "ompi/constants.h" #include "ompi/communicator/communicator.h" #include "ompi/mca/pml/pml.h" #include "ompi/mca/pml/base/base.h" @@ -327,7 +327,7 @@ void mca_pml_csum_recv_frag_callback_rndv(mca_btl_base_module_t* btl, mca_btl_base_tag_t tag, mca_btl_base_descriptor_t* des, void* cbdata ) -{ +{ mca_btl_base_segment_t* segments = des->des_dst; mca_pml_csum_hdr_t* hdr = (mca_pml_csum_hdr_t*)segments->seg_addr.pval; uint16_t csum_received, csum; @@ -662,7 +662,7 @@ match_one(mca_btl_base_module_t *btl, if(OPAL_UNLIKELY(MCA_PML_REQUEST_PROBE == match->req_recv.req_base.req_type)) { /* complete the probe */ mca_pml_csum_recv_request_matched_probe(match, btl, segments, - num_segments); + num_segments); /* attempt to match actual request */ continue; } diff --git a/ompi/mca/pml/csum/pml_csum_recvreq.c b/ompi/mca/pml/csum/pml_csum_recvreq.c index 4caff8d296..9040cb7461 100644 --- a/ompi/mca/pml/csum/pml_csum_recvreq.c +++ b/ompi/mca/pml/csum/pml_csum_recvreq.c @@ -345,8 +345,8 @@ static int mca_pml_csum_recv_request_ack( /* let know to shedule function there is no need to put ACK flag */ recvreq->req_ack_sent = true; return mca_pml_csum_recv_request_ack_send(proc, hdr->hdr_src_req.lval, - recvreq, recvreq->req_send_offset, - recvreq->req_send_offset == bytes_received); + recvreq, recvreq->req_send_offset, + recvreq->req_send_offset == bytes_received); } /** @@ -668,9 +668,8 @@ void mca_pml_csum_recv_request_progress_match( mca_pml_csum_recv_request_t* recv mca_btl_base_segment_t* segments, size_t num_segments ) { - size_t bytes_received = 0; + size_t bytes_received = 0, data_offset = 0; size_t bytes_delivered __opal_attribute_unused__; /* is being set to zero in MCA_PML_CSUM_RECV_REQUEST_UNPACK */ - size_t data_offset = 0; mca_pml_csum_hdr_t* hdr = (mca_pml_csum_hdr_t*)segments->seg_addr.pval; uint32_t csum = OPAL_CSUM_ZERO; diff --git a/ompi/mca/pml/ob1/pml_ob1.c b/ompi/mca/pml/ob1/pml_ob1.c index 2a6f0d0636..347724e813 100644 --- a/ompi/mca/pml/ob1/pml_ob1.c +++ b/ompi/mca/pml/ob1/pml_ob1.c @@ -606,7 +606,7 @@ void mca_pml_ob1_process_pending_rdma(void) void mca_pml_ob1_error_handler( struct mca_btl_base_module_t* btl, int32_t flags, - ompi_proc_t* errproc, char* btlname ) { + ompi_proc_t* errproc, char* btlinfo ) { orte_errmgr.abort(-1, NULL); } diff --git a/ompi/mca/pml/ob1/pml_ob1_component.c b/ompi/mca/pml/ob1/pml_ob1_component.c index 27be72e33c..d9b8b6f860 100644 --- a/ompi/mca/pml/ob1/pml_ob1_component.c +++ b/ompi/mca/pml/ob1/pml_ob1_component.c @@ -168,9 +168,9 @@ mca_pml_ob1_component_init( int* priority, bool enable_progress_threads, bool enable_mpi_threads ) { - opal_output_verbose( 10, mca_pml_ob1_output, + opal_output_verbose( 10, mca_pml_ob1_output, "in ob1, my priority is %d\n", mca_pml_ob1.priority); - + if((*priority) > mca_pml_ob1.priority) { *priority = mca_pml_ob1.priority; return NULL; diff --git a/ompi/mca/pml/ob1/pml_ob1_rdmafrag.h b/ompi/mca/pml/ob1/pml_ob1_rdmafrag.h index f1c9fefa0a..822863761c 100644 --- a/ompi/mca/pml/ob1/pml_ob1_rdmafrag.h +++ b/ompi/mca/pml/ob1/pml_ob1_rdmafrag.h @@ -66,5 +66,6 @@ do { \ END_C_DECLS + #endif diff --git a/ompi/mca/pml/ob1/pml_ob1_recvfrag.c b/ompi/mca/pml/ob1/pml_ob1_recvfrag.c index 0522b2dc45..3cb942a672 100644 --- a/ompi/mca/pml/ob1/pml_ob1_recvfrag.c +++ b/ompi/mca/pml/ob1/pml_ob1_recvfrag.c @@ -11,7 +11,7 @@ * All rights reserved. * Copyright (c) 2008 UT-Battelle, LLC. All rights reserved. * Copyright (c) 2006-2008 University of Houston. All rights reserved. - * Copyright (c) 2009 Sun Microsystems, Inc. All rights reserved. + * Copyright (c) 2009-2010 Oracle and/or its affiliates. All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -28,18 +28,19 @@ #include "opal/class/opal_list.h" #include "opal/threads/mutex.h" #include "opal/prefetch.h" + #include "ompi/constants.h" #include "ompi/communicator/communicator.h" #include "ompi/mca/pml/pml.h" +#include "ompi/peruse/peruse-internal.h" +#include "ompi/memchecker.h" + #include "pml_ob1.h" #include "pml_ob1_comm.h" #include "pml_ob1_recvfrag.h" #include "pml_ob1_recvreq.h" #include "pml_ob1_sendreq.h" #include "pml_ob1_hdr.h" -#include "ompi/peruse/peruse-internal.h" -#include "ompi/memchecker.h" - OBJ_CLASS_INSTANCE( mca_pml_ob1_buffer_t, ompi_free_list_item_t, @@ -101,7 +102,7 @@ void mca_pml_ob1_recv_frag_callback_match(mca_btl_base_module_t* btl, mca_btl_base_tag_t tag, mca_btl_base_descriptor_t* des, void* cbdata ) -{ +{ mca_btl_base_segment_t* segments = des->des_dst; mca_pml_ob1_match_hdr_t* hdr = (mca_pml_ob1_match_hdr_t*)segments->seg_addr.pval; ompi_communicator_t *comm_ptr; @@ -185,7 +186,7 @@ void mca_pml_ob1_recv_frag_callback_match(mca_btl_base_module_t* btl, /* release matching lock before processing fragment */ OPAL_THREAD_UNLOCK(&comm->matching_lock); - + if(OPAL_LIKELY(match)) { bytes_received = segments->seg_len - OMPI_PML_OB1_MATCH_HDR_LEN; match->req_recv.req_bytes_packed = bytes_received; @@ -247,7 +248,7 @@ void mca_pml_ob1_recv_frag_callback_rndv(mca_btl_base_module_t* btl, mca_btl_base_tag_t tag, mca_btl_base_descriptor_t* des, void* cbdata ) -{ +{ mca_btl_base_segment_t* segments = des->des_dst; mca_pml_ob1_hdr_t* hdr = (mca_pml_ob1_hdr_t*)segments->seg_addr.pval; @@ -264,7 +265,7 @@ void mca_pml_ob1_recv_frag_callback_rget(mca_btl_base_module_t* btl, mca_btl_base_tag_t tag, mca_btl_base_descriptor_t* des, void* cbdata ) -{ +{ mca_btl_base_segment_t* segments = des->des_dst; mca_pml_ob1_hdr_t* hdr = (mca_pml_ob1_hdr_t*)segments->seg_addr.pval; @@ -283,7 +284,7 @@ void mca_pml_ob1_recv_frag_callback_ack(mca_btl_base_module_t* btl, mca_btl_base_tag_t tag, mca_btl_base_descriptor_t* des, void* cbdata ) -{ +{ mca_btl_base_segment_t* segments = des->des_dst; mca_pml_ob1_hdr_t* hdr = (mca_pml_ob1_hdr_t*)segments->seg_addr.pval; mca_pml_ob1_send_request_t* sendreq; @@ -328,7 +329,7 @@ void mca_pml_ob1_recv_frag_callback_ack(mca_btl_base_module_t* btl, void mca_pml_ob1_recv_frag_callback_frag(mca_btl_base_module_t* btl, mca_btl_base_tag_t tag, mca_btl_base_descriptor_t* des, - void* cbdata ) { + void* cbdata ) { mca_btl_base_segment_t* segments = des->des_dst; mca_pml_ob1_hdr_t* hdr = (mca_pml_ob1_hdr_t*)segments->seg_addr.pval; mca_pml_ob1_recv_request_t* recvreq; @@ -347,7 +348,7 @@ void mca_pml_ob1_recv_frag_callback_frag(mca_btl_base_module_t* btl, void mca_pml_ob1_recv_frag_callback_put(mca_btl_base_module_t* btl, mca_btl_base_tag_t tag, mca_btl_base_descriptor_t* des, - void* cbdata ) { + void* cbdata ) { mca_btl_base_segment_t* segments = des->des_dst; mca_pml_ob1_hdr_t* hdr = (mca_pml_ob1_hdr_t*)segments->seg_addr.pval; mca_pml_ob1_send_request_t* sendreq; @@ -367,7 +368,7 @@ void mca_pml_ob1_recv_frag_callback_put(mca_btl_base_module_t* btl, void mca_pml_ob1_recv_frag_callback_fin(mca_btl_base_module_t* btl, mca_btl_base_tag_t tag, mca_btl_base_descriptor_t* des, - void* cbdata ) { + void* cbdata ) { mca_btl_base_segment_t* segments = des->des_dst; mca_pml_ob1_hdr_t* hdr = (mca_pml_ob1_hdr_t*)segments->seg_addr.pval; mca_btl_base_descriptor_t* rdma; diff --git a/ompi/mca/pml/ob1/pml_ob1_recvfrag.h b/ompi/mca/pml/ob1/pml_ob1_recvfrag.h index d769b128ba..ad4374b4ec 100644 --- a/ompi/mca/pml/ob1/pml_ob1_recvfrag.h +++ b/ompi/mca/pml/ob1/pml_ob1_recvfrag.h @@ -167,5 +167,6 @@ extern void mca_pml_ob1_recv_frag_callback_fin( mca_btl_base_module_t *btl, END_C_DECLS + #endif diff --git a/ompi/mca/pml/ob1/pml_ob1_recvreq.c b/ompi/mca/pml/ob1/pml_ob1_recvreq.c index 09061f53b3..2648ba4a28 100644 --- a/ompi/mca/pml/ob1/pml_ob1_recvreq.c +++ b/ompi/mca/pml/ob1/pml_ob1_recvreq.c @@ -308,7 +308,6 @@ static int mca_pml_ob1_recv_request_ack( recvreq->req_send_offset == bytes_received); } - /** * Return resources used by the RDMA */ @@ -413,9 +412,8 @@ void mca_pml_ob1_recv_request_progress_frag( mca_pml_ob1_recv_request_t* recvreq mca_btl_base_segment_t* segments, size_t num_segments ) { - size_t bytes_received = 0; + size_t bytes_received = 0, data_offset = 0; size_t bytes_delivered __opal_attribute_unused__; /* is being set to zero in MCA_PML_OB1_RECV_REQUEST_UNPACK */ - size_t data_offset = 0; mca_pml_ob1_hdr_t* hdr = (mca_pml_ob1_hdr_t*)segments->seg_addr.pval; MCA_PML_OB1_COMPUTE_SEGMENT_LENGTH( segments, num_segments,