Some more spaces, tabs, include file ordering changes.
No real code changes here. This commit was SVN r23789.
Этот коммит содержится в:
Rolf vandeVaart
родитель
db7f7e0fad
Коммит
0331889495
@ -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);
|
||||
|
||||
@ -68,5 +68,6 @@ do { \
|
||||
|
||||
|
||||
END_C_DECLS
|
||||
|
||||
#endif
|
||||
|
||||
|
||||
@ -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,
|
||||
|
||||
@ -168,5 +168,6 @@ extern void mca_pml_bfo_recv_frag_callback_fin( mca_btl_base_module_t *btl,
|
||||
|
||||
|
||||
END_C_DECLS
|
||||
|
||||
#endif
|
||||
|
||||
|
||||
@ -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,
|
||||
|
||||
@ -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"
|
||||
|
||||
@ -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;
|
||||
|
||||
|
||||
@ -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);
|
||||
}
|
||||
|
||||
|
||||
@ -66,5 +66,6 @@ do { \
|
||||
|
||||
|
||||
END_C_DECLS
|
||||
|
||||
#endif
|
||||
|
||||
|
||||
@ -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,
|
||||
|
||||
@ -167,5 +167,6 @@ extern void mca_pml_ob1_recv_frag_callback_fin( mca_btl_base_module_t *btl,
|
||||
|
||||
|
||||
END_C_DECLS
|
||||
|
||||
#endif
|
||||
|
||||
|
||||
@ -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,
|
||||
|
||||
Загрузка…
x
Ссылка в новой задаче
Block a user