[mpich-commits] [mpich] MPICH primary repository branch, master, updated. v3.0.4-98-g268d3b5

[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  268d3b5b36c67413d703d4ebd32409f1b4f61b75 (commit)
       via  583cd8b4fcc8bcedb650c06095d06e9eba6ff0ac (commit)
      from  0f8237efdede048d38401d12d124fb9155988538 (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/268d3b5b36c67413d703d4ebd32409f1b4f61b75

commit 268d3b5b36c67413d703d4ebd32409f1b4f61b75
Merge: 0f8237e 583cd8b
Author: Dave Goodell <goodell at mcs.anl.gov>
Date:   Thu Apr 25 16:14:24 2013 -0500

    Merge branch 'ibm-integ' into master


http://git.mpich.org/mpich.git/commitdiff/583cd8b4fcc8bcedb650c06095d06e9eba6ff0ac

commit 583cd8b4fcc8bcedb650c06095d06e9eba6ff0ac
Author: Su Huang <suhuang at us.ibm.com>
Date:   Wed Sep 12 14:42:37 2012 -0400

    MPIDI_TRACE tool enhancement
    
    (ibm) D185675
    (ibm) 3728f432f99fc499955a2c9d830a5026e5f87948
    
    Signed-off-by: Michael Blocksome <blocksom at us.ibm.com>

diff --git a/src/mpid/pamid/src/mpid_recvq.h b/src/mpid/pamid/src/mpid_recvq.h
index b566f21..ba5a57c 100644
--- a/src/mpid/pamid/src/mpid_recvq.h
+++ b/src/mpid/pamid/src/mpid_recvq.h
@@ -199,12 +199,6 @@ typedef struct MPIDI_In_cntr {
   uint               n_OutOfOrderMsgs:16; /* the number of out-of-order messages received */
   uint               nMsgs;               /* the number of received messages */
   MPID_Request       *OutOfOrderList;     /* link list of out-of-order messages */
-#ifdef MPIDI_TRACE
-  recv_status *R;
-  int  totPR;
-  int  nRdmaMsgs;
-  posted_recv *PR;
-#endif
 } MPIDI_In_cntr_t;
 
 /**
@@ -213,9 +207,6 @@ typedef struct MPIDI_In_cntr {
 typedef struct MPIDI_Out_cntr {
   uint         unmatched:16;             /* the number of un-matched messages */
   uint         nMsgs;                    /* the number of out-going messages */
-#ifdef MPIDI_TRACE
-  send_status *S;
-#endif
 } MPIDI_Out_cntr_t;
 
 /* global data to keep track of pair-wise communication, storage malloced
@@ -250,8 +241,8 @@ MPIDI_Recvq_FDP(size_t source, pami_task_t pami_source, int tag, int context_id,
   int idx;
   idx=(msg_seqno & SEQMASK);
   recv_status  *rstatus;
-  memset(&MPIDI_In_cntr[pami_source].R[idx],0,sizeof(recv_status));
-  rstatus=&MPIDI_In_cntr[pami_source].R[idx];
+  memset(&MPIDI_Trace_buf[pami_source].R[idx],0,sizeof(recv_status));
+  rstatus=&MPIDI_Trace_buf[pami_source].R[idx];
 #endif
 
   rreq = MPIDI_Recvq.posted_head;
diff --git a/src/mpid/pamid/src/pt2pt/mpidi_callback_util.c b/src/mpid/pamid/src/pt2pt/mpidi_callback_util.c
index 8a82e64..3f80fae 100644
--- a/src/mpid/pamid/src/pt2pt/mpidi_callback_util.c
+++ b/src/mpid/pamid/src/pt2pt/mpidi_callback_util.c
@@ -34,10 +34,6 @@ MPIDI_Callback_process_unexp(MPID_Request *newreq,
                              unsigned              isSync)
 {
   MPID_Request *rreq = NULL;
-#ifdef MPIDI_TRACE
-  int  idx=(msginfo->MPIseqno & SEQMASK);
-  int  source=PAMIX_Endpoint_query(sender);
-#endif
 
   /* ---------------------------------------------------- */
   /*  Fallback position:                                  */
@@ -78,13 +74,15 @@ MPIDI_Callback_process_unexp(MPID_Request *newreq,
 
   MPID_assert(!sndlen || rreq->mpid.uebuf != NULL);
 #ifdef MPIDI_TRACE
-   memset(&MPIDI_In_cntr[source].R[idx],0,sizeof(recv_status));
-   MPIDI_In_cntr[source].R[idx].msgid=msginfo->MPIseqno;
-   MPIDI_In_cntr[source].R[idx].rtag=tag;
-   MPIDI_In_cntr[source].R[idx].rctx=msginfo->MPIctxt;
-   MPIDI_In_cntr[source].R[idx].rlen=sndlen;
-   MPIDI_In_cntr[source].R[idx].sync=isSync;
-   MPIDI_In_cntr[source].R[idx].rsource=source;
+   int  idx=(msginfo->MPIseqno & SEQMASK);
+   int  source=PAMIX_Endpoint_query(sender);
+   memset(&MPIDI_Trace_buf[source].R[idx],0,sizeof(recv_status));
+   MPIDI_Trace_buf[source].R[idx].msgid=msginfo->MPIseqno;
+   MPIDI_Trace_buf[source].R[idx].rtag=tag;
+   MPIDI_Trace_buf[source].R[idx].rctx=msginfo->MPIctxt;
+   MPIDI_Trace_buf[source].R[idx].rlen=sndlen;
+   MPIDI_Trace_buf[source].R[idx].sync=isSync;
+   MPIDI_Trace_buf[source].R[idx].rsource=source;
    rreq->mpid.idx=idx;
 #endif
 

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

Summary of changes:
 src/mpid/pamid/src/mpid_recvq.h                |   13 ++-----------
 src/mpid/pamid/src/pt2pt/mpidi_callback_util.c |   20 +++++++++-----------
 2 files changed, 11 insertions(+), 22 deletions(-)


hooks/post-receive
-- 
MPICH primary repository