← Back to branch summary

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

« back to all changes in this revision

Viewing changes to ompi/mca/pml/ob1/pml_ob1_recvreq.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/pml/ob1/pml_ob1_recvreq.c
216
216
    /* allocate descriptor */
217
217
    mca_bml_base_alloc(bml_btl, &des, MCA_BTL_NO_ORDER,
218
218
                       sizeof(mca_pml_ob1_ack_hdr_t),
219
 
                       MCA_BTL_DES_FLAGS_PRIORITY | MCA_BTL_DES_FLAGS_BTL_OWNERSHIP);
 
219
                       MCA_BTL_DES_FLAGS_PRIORITY | MCA_BTL_DES_FLAGS_BTL_OWNERSHIP | MCA_BTL_DES_SEND_ALWAYS_CALLBACK);
220
220
    if( OPAL_UNLIKELY(NULL == des) ) {
221
221
        return OMPI_ERR_OUT_OF_RESOURCE; 
222
222
    }
236
236
 
237
237
    rc = mca_bml_base_send(bml_btl, des, MCA_PML_OB1_HDR_TYPE_ACK);
238
238
    if( OPAL_LIKELY( rc >= 0 ) ) {
239
 
        if( OPAL_LIKELY( 1 == rc ) ) {
240
 
            MCA_PML_OB1_PROGRESS_PENDING(bml_btl);
241
 
        }
242
239
        return OMPI_SUCCESS;
243
240
    }
244
241
    mca_bml_base_free(bml_btl, des);
365
362
                              MCA_BTL_NO_ORDER,
366
363
                              0,
367
364
                              &frag->rdma_length,
368
 
                              MCA_BTL_DES_FLAGS_BTL_OWNERSHIP,
 
365
                              MCA_BTL_DES_FLAGS_BTL_OWNERSHIP | MCA_BTL_DES_SEND_ALWAYS_CALLBACK,
369
366
                              &descriptor );
370
367
    if( OPAL_UNLIKELY(NULL == descriptor) ) {
371
368
        frag->rdma_length = save_size;
777
774
        }
778
775
 
779
776
        mca_bml_base_alloc(bml_btl, &ctl, MCA_BTL_NO_ORDER, hdr_size,
780
 
                           MCA_BTL_DES_FLAGS_PRIORITY | MCA_BTL_DES_FLAGS_BTL_OWNERSHIP);
 
777
                           MCA_BTL_DES_FLAGS_PRIORITY | MCA_BTL_DES_FLAGS_BTL_OWNERSHIP | MCA_BTL_DES_SEND_ALWAYS_CALLBACK);
781
778
 
782
779
        if( OPAL_UNLIKELY(NULL == ctl) ) {
783
780
            mca_bml_base_free(bml_btl,dst);
817
814
            OPAL_THREAD_ADD_SIZE_T(&recvreq->req_pipeline_depth, 1);
818
815
            recvreq->req_rdma[rdma_idx].length -= size;
819
816
            bytes_remaining -= size;
820
 
            if( OPAL_LIKELY( 1 == rc ) ) {
821
 
                /* The send is completed, trigger the callback */
822
 
                MCA_PML_OB1_PROGRESS_PENDING(bml_btl);
823
 
            }
824
817
        } else {
825
818
            mca_bml_base_free(bml_btl,ctl);
826
819
            mca_bml_base_free(bml_btl,dst);