From e809a442e7a28c899114b2b14939f07b4bc9bff0 Mon Sep 17 00:00:00 2001 From: Galen Shipman Date: Wed, 16 Aug 2006 20:56:22 +0000 Subject: [PATCH] add the error handler registration to OB1.. This commit was SVN r11234. --- ompi/mca/pml/dr/pml_dr.c | 10 +++++----- ompi/mca/pml/ob1/pml_ob1.c | 18 +++++++++++++++++- 2 files changed, 22 insertions(+), 6 deletions(-) diff --git a/ompi/mca/pml/dr/pml_dr.c b/ompi/mca/pml/dr/pml_dr.c index 30a7669cc6..20ce52e134 100644 --- a/ompi/mca/pml/dr/pml_dr.c +++ b/ompi/mca/pml/dr/pml_dr.c @@ -110,11 +110,6 @@ int mca_pml_dr_del_comm(ompi_communicator_t* comm) -void mca_pml_dr_error_handler( - struct mca_btl_base_module_t* btl, - int32_t flags) { - orte_errmgr.abort(); -} /* * For each proc setup a datastructure that indicates the PTLs @@ -250,3 +245,8 @@ int mca_pml_dr_dump( +void mca_pml_dr_error_handler( + struct mca_btl_base_module_t* btl, + int32_t flags) { + orte_errmgr.abort(); +} diff --git a/ompi/mca/pml/ob1/pml_ob1.c b/ompi/mca/pml/ob1/pml_ob1.c index 6c75180d76..0ac4917fff 100644 --- a/ompi/mca/pml/ob1/pml_ob1.c +++ b/ompi/mca/pml/ob1/pml_ob1.c @@ -35,6 +35,7 @@ #include "pml_ob1_recvreq.h" #include "pml_ob1_rdmafrag.h" #include "ompi/mca/bml/base/base.h" +#include "orte/mca/errmgr/errmgr.h" mca_pml_ob1_t mca_pml_ob1 = { { @@ -59,6 +60,11 @@ mca_pml_ob1_t mca_pml_ob1 = { } }; + +void mca_pml_ob1_error_handler( + struct mca_btl_base_module_t* btl, + int32_t flags); + int mca_pml_ob1_enable(bool enable) { if( false == enable ) return OMPI_SUCCESS; @@ -144,7 +150,10 @@ int mca_pml_ob1_add_procs(ompi_proc_t** procs, size_t nprocs) MCA_BTL_TAG_PML, mca_pml_ob1_recv_frag_callback, NULL); - + + /* register error handlers */ + rc = mca_bml.bml_register_error(mca_pml_ob1_error_handler); + /* initialize free list of receive buffers */ ompi_free_list_init( &mca_pml_ob1.buffers, @@ -346,3 +355,10 @@ void mca_pml_ob1_process_pending_rdma(void) break; } } + + +void mca_pml_ob1_error_handler( + struct mca_btl_base_module_t* btl, + int32_t flags) { + orte_errmgr.abort(); +}