← Back to branch summary

~ubuntu-branches/ubuntu/vivid/mpich/vivid-proposed

« back to all changes in this revision

Viewing changes to src/mpid/pamid/src/pt2pt/mpidi_recvmsg.c

  • Committer: Package Import Robot
  • Author(s): Anton Gladky
  • Date: 2014-04-01 20:24:20 UTC
  • mfrom: (5.2.4 sid)
  • Revision ID: package-import@ubuntu.com-20140401202420-t5ey1ia2klt5dkq3
Tags: 3.1-4
http://bugs.debian.org/743047
* [c3e3398] Disable test_primitives, which is unreliable on some platforms.
            (Closes: #743047)
* [265a699] Add minimal autotest.

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/mpid/pamid/src/pt2pt/mpidi_recvmsg.c
36
36
  /* The recvnew callback will acknowledge the posted messages    */
37
37
  /* Recv functions will ack the messages that are unexpected     */
38
38
  /* ------------------------------------------------------------ */
39
 
#ifdef MPIDI_TRACE
40
 
  MPIDI_In_cntr[(rreq->mpid.partner_id)].R[(rreq->mpid.idx)].matchedInUQ=1;
41
 
#endif
 
39
  TRACE_SET_R_BIT((rreq->mpid.partner_id),(rreq->mpid.idx),fl.f.matchedInUQ);
42
40
 
43
41
  if (MPIDI_Request_isRzv(rreq))
44
42
    {
84
82
      /* -------------------------------- */
85
83
      if (rreq->mpid.uebuf != NULL)
86
84
        {
87
 
          if (likely(rreq->status.cancelled == FALSE))
 
85
          if (likely(MPIR_STATUS_GET_CANCEL_BIT(rreq->status) == FALSE))
88
86
            {
89
87
              MPIDI_msg_sz_t _count=0;
90
88
              MPIDI_Buffer_copy(rreq->mpid.uebuf,
96
94
                                datatype,
97
95
                                &_count,
98
96
                                &rreq->status.MPI_ERROR);
99
 
              rreq->status.count = _count;
 
97
              MPIR_STATUS_SET_COUNT(rreq->status, _count);
100
98
            }
101
99
        }
102
100
      else
103
101
        {
104
102
          MPID_assert(rreq->mpid.uebuflen == 0);
105
 
          rreq->status.count = 0;
 
103
          MPIR_STATUS_SET_COUNT(rreq->status, 0);
106
104
        }
107
105
     }
108
106
     else
123
121
          MPIDI_Request_uncomplete(rreq);
124
122
          MPIDI_Send_post(MPIDI_SyncAck_handoff, rreq);
125
123
        }
126
 
      if(rreq->status.cancelled == FALSE)
 
124
      if (MPIR_STATUS_GET_CANCEL_BIT(rreq->status) == FALSE)
127
125
        {
128
126
          MPIDI_Request_setCA(rreq, MPIDI_CA_UNPACK_UEBUF_AND_COMPLETE);
129
127
        }