From 41b6230be36405a245f06c6cdfc77c9b54700314 Mon Sep 17 00:00:00 2001 From: yosefe Date: Tue, 27 Oct 2015 18:54:09 +0200 Subject: [PATCH 1/2] pml_ucx: fix debug macros, and initialize mpi request properly. --- ompi/mca/pml/ucx/pml_ucx.h | 10 ++++++---- ompi/mca/pml/ucx/pml_ucx_request.c | 4 ++-- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/ompi/mca/pml/ucx/pml_ucx.h b/ompi/mca/pml/ucx/pml_ucx.h index 8a696e8111a..d684ecb4628 100644 --- a/ompi/mca/pml/ucx/pml_ucx.h +++ b/ompi/mca/pml/ucx/pml_ucx.h @@ -69,13 +69,15 @@ extern mca_pml_ucx_module_t ompi_pml_ucx; _PML_UCX_QUOTE(_x) #define PML_UCX_ERROR(...) \ - opal_output_verbose(0, ompi_pml_ucx.output, "Error: " __FILE__ ":" \ - PML_UCX_QUOTE(__LINE__) __VA_ARGS__) + opal_output_verbose(0, ompi_pml_ucx.output, \ + __FILE__ ":" PML_UCX_QUOTE(__LINE__) \ + " Error: " __VA_ARGS__) #define PML_UCX_VERBOSE(_level, ... ) \ if (((_level) <= PML_UCX_MAX_VERBOSE) && ((_level) <= ompi_pml_ucx.verbose)) { \ - opal_output_verbose(_level, ompi_pml_ucx.output, __FILE__ ":" \ - PML_UCX_QUOTE(__LINE__) __VA_ARGS__); \ + opal_output_verbose(_level, ompi_pml_ucx.output, \ + __FILE__ ":" PML_UCX_QUOTE(__LINE__) " " \ + __VA_ARGS__); \ } int mca_pml_ucx_open(void); diff --git a/ompi/mca/pml/ucx/pml_ucx_request.c b/ompi/mca/pml/ucx/pml_ucx_request.c index e1ad331c90b..2fca2a6144b 100644 --- a/ompi/mca/pml/ucx/pml_ucx_request.c +++ b/ompi/mca/pml/ucx/pml_ucx_request.c @@ -108,11 +108,10 @@ static void mca_pml_ucx_request_init_common(ompi_request_t* ompi_req, ompi_request_free_fn_t req_free, ompi_request_cancel_fn_t req_cancel) { + OBJ_CONSTRUCT(ompi_req, ompi_request_t); OMPI_REQUEST_INIT(ompi_req, req_persistent); ompi_req->req_type = OMPI_REQUEST_PML; ompi_req->req_state = state; - ompi_req->req_complete_cb = NULL; - ompi_req->req_complete_cb_data = NULL; ompi_req->req_free = req_free; ompi_req->req_cancel = req_cancel; } @@ -128,6 +127,7 @@ void mca_pml_ucx_request_cleanup(void *request) { ompi_request_t* ompi_req = request; OMPI_REQUEST_FINI(ompi_req); + OBJ_DESTRUCT(ompi_req); } static int mca_pml_ucx_persistent_request_free(ompi_request_t **rptr) From ae738d0434f8d54fee16c167f0507dae9d572361 Mon Sep 17 00:00:00 2001 From: yosefe Date: Wed, 28 Oct 2015 18:34:36 +0200 Subject: [PATCH 2/2] pml_ucx: add pmi fence in del_procs --- ompi/mca/pml/ucx/pml_ucx.c | 1 + 1 file changed, 1 insertion(+) diff --git a/ompi/mca/pml/ucx/pml_ucx.c b/ompi/mca/pml/ucx/pml_ucx.c index 6f01a2007e5..556f5997c01 100644 --- a/ompi/mca/pml/ucx/pml_ucx.c +++ b/ompi/mca/pml/ucx/pml_ucx.c @@ -257,6 +257,7 @@ int mca_pml_ucx_del_procs(struct ompi_proc_t **procs, size_t nprocs) } procs[i]->proc_endpoints[OMPI_PROC_ENDPOINT_TAG_PML] = NULL; } + opal_pmix.fence(NULL, 0); return OMPI_SUCCESS; }