Open MPI logo

Open MPI Development Mailing List Archives

  |   Home   |   Support   |   FAQ   |   all Development mailing list

Subject: Re: [OMPI devel] [OMPI svn-full] svn:open-mpi r29293 - trunk/ompi/mca/coll/hcoll
From: Tim Mattox (tmattox_at_[hidden])
Date: 2013-09-30 11:05:43


FYI - The description does not seem to match the contents of this change.

On Mon, Sep 30, 2013 at 2:18 AM, <svn-commit-mailer_at_[hidden]> wrote:
> Author: miked (Mike Dubman)
> Date: 2013-09-30 02:18:12 EDT (Mon, 30 Sep 2013)
> New Revision: 29293
> URL: https://svn.open-mpi.org/trac/ompi/changeset/29293
>
> Log:
> fix memory corruption
> cmr:v1.7.3:reviewer=ompi-rm1.7
>
> Text files modified:
> trunk/ompi/mca/coll/hcoll/coll_hcoll_rte.c | 15 ---------------
> 1 files changed, 0 insertions(+), 15 deletions(-)
>
> Modified: trunk/ompi/mca/coll/hcoll/coll_hcoll_rte.c
> ==============================================================================
> --- trunk/ompi/mca/coll/hcoll/coll_hcoll_rte.c Sun Sep 29 17:52:52 2013 (r29292)
> +++ trunk/ompi/mca/coll/hcoll/coll_hcoll_rte.c 2013-09-30 02:18:12 EDT (Mon, 30 Sep 2013) (r29293)
> @@ -36,8 +36,6 @@
> #include "ompi/mca/pml/pml.h"
>
>
> -#define RTE_DEBUG 0
> -
> #include "hcoll_dte.h"
> #include "hcoll_api.h"
> #include "hcoll_constants.h"
> @@ -167,9 +165,6 @@
> {
> ompi_communicator_t *comm = (ompi_communicator_t *)grp_h;
>
> -#if RTE_DEBUG
> - assert(ec_h.group == grp_h);
> -#endif
> if (NULL == ec_h.handle && -1 != ec_h.rank) {
> fprintf(stderr,"***Error in hcolrte_rml_recv_nb: wrong null argument: "
> "ec_h.handle = %p, ec_h.rank = %d\n",ec_h.handle,ec_h.rank);
> @@ -241,10 +236,6 @@
> {
> ompi_communicator_t *comm = (ompi_communicator_t *)grp_h;
>
> -#if RTE_DEBUG
> - assert(ec_h.group == grp_h);
> -#endif
> -
> if (! ec_h.handle) {
> fprintf(stderr,"***Error in hcolrte_rml_send_nb: wrong null argument: "
> "ec_h.handle = %p, ec_h.rank = %d\n",ec_h.handle,ec_h.rank);
> @@ -338,9 +329,6 @@
> ompi_communicator_t *comm = (ompi_communicator_t *)grp_h;
> for (i=0; i<num_ec; i++){
> ompi_proc_t *proc = ompi_comm_peer_lookup(comm,ec_indexes[i]);
> -#if RTE_DEBUG
> - ec_handles[i].group = grp_h;
> -#endif
> ec_handles[i].rank = ec_indexes[i];
> ec_handles[i].handle = (void *)proc;
> }
> @@ -354,9 +342,6 @@
> ompi_proc_t *my_proc = ompi_comm_peer_lookup(comm,my_rank);
> ec_handle->handle = (void *)my_proc;
> ec_handle->rank = my_rank;
> -#if RTE_DEBUG
> - ec_handle->group = grp_h;
> -#endif
> return HCOLL_SUCCESS;
> }
>
> _______________________________________________
> svn-full mailing list
> svn-full_at_[hidden]
> http://www.open-mpi.org/mailman/listinfo.cgi/svn-full

-- 
Tim Mattox, Ph.D. - tmattox_at_[hidden]