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 r26790 - trunk/ompi/mca/btl/openib/connect
From: Jeff Squyres (jsquyres_at_[hidden])
Date: 2012-07-13 11:14:18


Don't forget to CMR to v1.7.

On Jul 13, 2012, at 11:14 AM, <svn-commit-mailer_at_[hidden]> wrote:

> Author: hjelmn (Nathan Hjelm)
> Date: 2012-07-13 11:14:48 EDT (Fri, 13 Jul 2012)
> New Revision: 26790
> URL: https://svn.open-mpi.org/trac/ompi/changeset/26790
>
> Log:
> remove assertion in udcm
>
> Text files modified:
> trunk/ompi/mca/btl/openib/connect/btl_openib_connect_udcm.c | 4 +++-
> 1 files changed, 3 insertions(+), 1 deletions(-)
>
> Modified: trunk/ompi/mca/btl/openib/connect/btl_openib_connect_udcm.c
> ==============================================================================
> --- trunk/ompi/mca/btl/openib/connect/btl_openib_connect_udcm.c Fri Jul 13 08:11:41 2012 (r26789)
> +++ trunk/ompi/mca/btl/openib/connect/btl_openib_connect_udcm.c 2012-07-13 11:14:48 EDT (Fri, 13 Jul 2012) (r26790)
> @@ -1847,7 +1847,9 @@
> void *event_context;
> int rc;
>
> - assert (NULL != m && NULL != m->cm_channel);
> + if (OPAL_UNLIKELY(NULL == m || NULL == m->cm_channel)) {
> + return NULL;
> + }
>
> rc = ibv_get_cq_event (m->cm_channel, &event_cq, &event_context);
>
> _______________________________________________
> svn-full mailing list
> svn-full_at_[hidden]
> http://www.open-mpi.org/mailman/listinfo.cgi/svn-full

-- 
Jeff Squyres
jsquyres_at_[hidden]
For corporate legal information go to: http://www.cisco.com/web/about/doing_business/legal/cri/