Merge branch 'charm' of charmgit:charm into charm
authorGengbin Zheng <gzheng@illinois.edu>
Sun, 1 Apr 2012 07:23:26 +0000 (02:23 -0500)
committerGengbin Zheng <gzheng@illinois.edu>
Sun, 1 Apr 2012 07:23:26 +0000 (02:23 -0500)
src/arch/gemini_gni/machine.c

index e05abd087a38100baf038a7367c4a7f92667cfa3..08928d3384d0b2b7d3ef9d7bcacc6e91c4267191 100644 (file)
@@ -2972,14 +2972,18 @@ static void  SendRdmaMsg()
             RDMA_TRY_SEND(pd->type)
 #endif
 #if CMK_SMP_TRACE_COMMTHREAD
-            int oldpe = -1;
-            int oldeventid = -1;
-            START_EVENT();
-            if(pd->type == GNI_POST_RDMA_PUT || pd->type == GNI_POST_FMA_PUT)
-            { 
-                TRACE_COMM_GET_MSGID((void*)pd->local_addr, &oldpe, &oldeventid);
-                TRACE_COMM_SET_COMM_MSGID((void*)pd->local_addr);
-            }
+//            int oldpe = -1;
+//            int oldeventid = -1;
+//            if(pd->type == GNI_POST_RDMA_PUT || pd->type == GNI_POST_FMA_PUT)
+//            { 
+//                TRACE_COMM_GET_MSGID((void*)pd->local_addr, &oldpe, &oldeventid);
+//                TRACE_COMM_SET_COMM_MSGID((void*)pd->local_addr);
+//            }
+              if(IS_PUT(pd->type) )
+              { 
+                  START_EVENT();
+                  TRACE_COMM_CREATION(CpvAccess(projTraceStart), (void*)pd->local_addr);
+              }
 #endif
 
             if(pd->type == GNI_POST_RDMA_GET || pd->type == GNI_POST_RDMA_PUT) 
@@ -2993,10 +2997,10 @@ static void  SendRdmaMsg()
             CMI_GNI_UNLOCK(lock);
             
 #if CMK_SMP_TRACE_COMMTHREAD
-            if(pd->type == GNI_POST_RDMA_PUT || pd->type == GNI_POST_FMA_PUT)
-            { 
-                if (oldpe != -1)  TRACE_COMM_SET_MSGID((void*)pd->local_addr, oldpe, oldeventid);
-            }
+//            if(pd->type == GNI_POST_RDMA_PUT || pd->type == GNI_POST_FMA_PUT)
+//            { 
+//                if (oldpe != -1)  TRACE_COMM_SET_MSGID((void*)pd->local_addr, oldpe, oldeventid);
+//            }
 #endif
             if(status == GNI_RC_SUCCESS)    //post good
             {
@@ -3018,10 +3022,6 @@ static void  SendRdmaMsg()
                 {
 #if CMK_SMP_TRACE_COMMTHREAD 
                     pd->sync_flag_value = 1000000 * CmiWallTimer(); //microsecond
-                    if(pd->type == GNI_POST_RDMA_PUT || pd->type == GNI_POST_FMA_PUT)
-                    { 
-                        TRACE_COMM_CREATION(CpvAccess(projTraceStart), (void*)pd->local_addr);
-                    }
 #endif
                     IncreaseMsgInRecv(((void*)(pd->local_addr)));
                 }