← Back to branch summary

~james-page/ubuntu/precise/openmpi1.5/new

« back to all changes in this revision

Viewing changes to ompi/mca/btl/openib/btl_openib.c

  • Committer: Bazaar Package Importer
  • Author(s): Manuel Prinz
  • Date: 2009-04-23 14:01:21 UTC
  • mfrom: (1.1.8 upstream)
  • Revision ID: james.westby@ubuntu.com-20090423140121-vsi3pqa6g30j4qiy
Tags: 1.3.2-1
http://bugs.debian.org/520597
http://bugs.debian.org/515116
http://bugs.debian.org/510845
http://bugs.debian.org/517543
http://bugs.debian.org/519725
http://bugs.debian.org/512616
http://bugs.debian.org/522153
* New upstream release. (Closes: #520597, #515116)
  - Manpage and VampirTrace patches removed, included upstream.
* Fixed build issues on Alpha. Huge thanks to Arthur Loiret for providing
  access to his machines for testing! (Closes: #510845, #517543)
* Fixed build issues on Sparc. (Closes: #519725)
* Fixed manpage-has-errors-from-man lintian warnings.
* Faked SONAME change by renaming library package. (Closes: #512616)
* Made libopenmpi-dev depend on libibverbs-dev. (Closes: #522153)
* Support for "nocheck" build option in debian/rules.
* Updated Standards-Version in debian/control.
* Changed section of libopenmpi-dbg to "debug".
* Updated debian/copyright.

* Dirk Eddelbuettel removed himself from Uploaders. The team thanks Dirk
  for his long-term contribution and effort to get Open MPI back to life.
  I personally thank Dirk for encouraging me to become a Debian Developer
  and his support and mentoring on that way and beyond.

Show diffs side-by-side

added added

removed removed

Lines of Context:
ompi/mca/btl/openib/btl_openib.c
15
15
 * Copyright (c) 2006-2007 Los Alamos National Security, LLC.  All rights
16
16
 *                         reserved.
17
17
 * Copyright (c) 2006-2007 Voltaire All rights reserved.
 
18
 * Copyright (c) 2008      Sun Microsystems, Inc.  All rights reserved.
18
19
 * $COPYRIGHT$
19
20
 *
20
21
 * Additional copyrights may follow
106
107
        struct rlimit limit;
107
108
        char *str_limit = NULL;
108
109
 
 
110
#if HAVE_DECL_RLIMIT_MEMLOCK
109
111
        ret = getrlimit(RLIMIT_MEMLOCK, &limit);
 
112
#else
 
113
        ret = -1;
 
114
#endif
110
115
        if (0 != ret) {
111
116
            asprintf(&str_limit, "Unknown");
112
117
        } else if (limit.rlim_cur == RLIM_INFINITY) {
982
987
                        &openib_btl->qps[qp].u.srq_qp.pending_frags[0]);
983
988
                MCA_BTL_OPENIB_CLEAN_PENDING_FRAGS(
984
989
                        &openib_btl->qps[qp].u.srq_qp.pending_frags[1]);
985
 
                if (ibv_destroy_srq(openib_btl->qps[qp].u.srq_qp.srq)){
 
990
                if (NULL != openib_btl->qps[qp].u.srq_qp.srq &&
 
991
                        ibv_destroy_srq(openib_btl->qps[qp].u.srq_qp.srq)){
986
992
                    BTL_VERBOSE(("Failed to close SRQ %d", qp));
987
993
                    rc = OMPI_ERROR;
988
994
                }