[mpich-commits] [mpich] MPICH primary repository branch, master, updated. v3.1rc2-31-g6d524b9

[mysql vizuser]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "MPICH primary repository".

The branch, master has been updated
       via  6d524b90f39ceea648fcb0b668d059a2928bf191 (commit)
      from  ce893cc0e57cc21fe36e83cb4b8e1c1d92aa9eb2 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://git.mpich.org/mpich.git/commitdiff/6d524b90f39ceea648fcb0b668d059a2928bf191

commit 6d524b90f39ceea648fcb0b668d059a2928bf191
Author: Su Huang <suhuang at us.ibm.com>
Date:   Thu Sep 26 08:32:27 2013 -0400

    PAMID: update PE trace code to support MPI_ANY_SOURCE
    
    (ibm) D192947
    
    Signed-off-by: Michael Blocksome <blocksom at us.ibm.com>

diff --git a/src/mpid/pamid/include/mpidi_trace.h b/src/mpid/pamid/include/mpidi_trace.h
index 97f6b96..bc21bb5 100644
--- a/src/mpid/pamid/include/mpidi_trace.h
+++ b/src/mpid/pamid/include/mpidi_trace.h
@@ -236,6 +236,14 @@ MPIDI_Trace_buf_t  *MPIDI_Trace_buf;
 #define TRACE_SET_S_BIT(dd,ii,mbr) MPIDI_Trace_buf[(dd)].S[(ii)].mbr=1;
 #define TRACE_SET_R_BIT(dd,ii,mbr) MPIDI_Trace_buf[(dd)].R[(ii)].mbr=1;
 #define TRACE_SET_S_VAL(dd,ii,mbr,val) MPIDI_Trace_buf[(dd)].S[(ii)].mbr=val;
+#define TRACE_SET_R_VALX(dd,rr,mbr,val) {                        \
+    pami_task_t dd1;                                             \
+    if (dd < 0)                                                  \
+       dd1=rr->mpid.partner_id;                                  \
+    else                                                         \
+       dd1=dd;                                                   \
+    MPIDI_Trace_buf[(dd1)].R[(rr->mpid.PR_idx)].mbr=val;         \
+}
 #define TRACE_SET_R_VAL(dd,ii,mbr,val) MPIDI_Trace_buf[(dd)].R[(ii)].mbr=val;
 #define TRACE_SET_REQ_VAL(ww,val1) ww=val1;
 #define TRACE_MEMSET_R(tt,nbr,str)  (memset(&MPIDI_Trace_buf[tt].R[(nbr & SEQMASK)],0,sizeof(str)));
@@ -249,6 +257,7 @@ int posted_recv;
 #define TRACE_SET_S_BIT(dd,ii,mbr) 0 
 #define TRACE_SET_R_BIT(dd,ii,mbr) 0 
 #define TRACE_SET_S_VAL(dd,ii,mbr,val) 0 
+#define TRACE_SET_R_VALX(dd,rr,mbr,val) 0
 #define TRACE_SET_R_VAL(dd,ii,mbr,val) 0 
 #define TRACE_SET_REQ_VAL(ww,val1) 0 
 #define TRACE_MEMSET_R(tt,nbr,str)  0 
diff --git a/src/mpid/pamid/src/pt2pt/mpidi_recv.h b/src/mpid/pamid/src/pt2pt/mpidi_recv.h
index 5bb63df..aaa029b 100644
--- a/src/mpid/pamid/src/pt2pt/mpidi_recv.h
+++ b/src/mpid/pamid/src/pt2pt/mpidi_recv.h
@@ -206,7 +206,7 @@ MPIDI_Recv(void          * buf,
 
   if (unlikely(found))
     {
-      TRACE_SET_R_VAL(pami_source,(rreq->mpid.PR_idx),len,rreq->mpid.uebuflen);
+      TRACE_SET_R_VALX(pami_source,rreq,len,rreq->mpid.uebuflen);
       MPIDI_RecvMsg_Unexp(rreq, buf, count, datatype);
       mpi_errno = rreq->status.MPI_ERROR;
       if (TOKEN_FLOW_CONTROL_ON) {

-----------------------------------------------------------------------

Summary of changes:
 src/mpid/pamid/include/mpidi_trace.h  |    9 +++++++++
 src/mpid/pamid/src/pt2pt/mpidi_recv.h |    2 +-
 2 files changed, 10 insertions(+), 1 deletions(-)


hooks/post-receive
-- 
MPICH primary repository