From 74852b4d218e824e4232e4a576a6a334b98c3a79 Mon Sep 17 00:00:00 2001 From: Devendar Bureddy Date: Tue, 22 Jul 2014 18:47:34 +0000 Subject: [PATCH] HCOLL: fix misplaced hcoll_init return value check. cmr=v1.8.2:reviewer=jladd This commit was SVN r32282. --- ompi/mca/coll/hcoll/coll_hcoll_module.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/ompi/mca/coll/hcoll/coll_hcoll_module.c b/ompi/mca/coll/hcoll/coll_hcoll_module.c index 1fdfe38d28..e2735d11e7 100644 --- a/ompi/mca/coll/hcoll/coll_hcoll_module.c +++ b/ompi/mca/coll/hcoll/coll_hcoll_module.c @@ -237,12 +237,6 @@ mca_coll_hcoll_comm_query(struct ompi_communicator_t *comm, int *priority) HCOL_VERBOSE(10,"Calling hcoll_init();"); rc = hcoll_init(); - if (cm->using_mem_hooks && hcoll_check_mem_release_cb_needed()) { - opal_mem_hooks_register_release(mca_coll_hcoll_mem_release_cb, NULL); - } else { - cm->using_mem_hooks = 0; - } - if (HCOLL_SUCCESS != rc){ cm->hcoll_enable = 0; opal_progress_unregister(mca_coll_hcoll_progress); @@ -250,6 +244,12 @@ mca_coll_hcoll_comm_query(struct ompi_communicator_t *comm, int *priority) return NULL; } + if (cm->using_mem_hooks && hcoll_check_mem_release_cb_needed()) { + opal_mem_hooks_register_release(mca_coll_hcoll_mem_release_cb, NULL); + } else { + cm->using_mem_hooks = 0; + } + copy_fn.attr_communicator_copy_fn = (MPI_Comm_internal_copy_attr_function*) MPI_COMM_NULL_COPY_FN; del_fn.attr_communicator_delete_fn = hcoll_comm_attr_del_fn; err = ompi_attr_create_keyval(COMM_ATTR, copy_fn, del_fn, &hcoll_comm_attr_keyval, NULL ,0, NULL);