Reduce tracing

knizhnik · knizhnik · commit b9db6dfcd145 · 2015-09-16T18:55:42.000+03:00
diff --git a/contrib/pg_xtm/pg_dtm.c b/contrib/pg_xtm/pg_dtm.c
@@ -57,7 +57,8 @@ static bool DtmGlobalTransaction = false;
 static TransactionManager DtmTM = { DtmGetTransactionStatus, DtmSetTransactionStatus, DtmGetSnapshot, DtmTransactionIsInProgress };
 static DTMConn DtmConn;
 
-#define XTM_TRACE(fmt, ...) fprintf(stderr, fmt, ## __VA_ARGS__)
+#define XTM_TRACE(fmt, ...) 
+//#define XTM_TRACE(fmt, ...) fprintf(stderr, fmt, ## __VA_ARGS__)
 #define XTM_CONNECT_ATTEMPTS 10
 
 static void DtmEnsureConnection(void)
@@ -81,8 +82,8 @@ static void DumpSnapshot(Snapshot s, char *name)
 	char *cursor = buf;
 	cursor += sprintf(
 		cursor,
-		"snapshot %s: xmin=%d, xmax=%d, active=[",
-		name, s->xmin, s->xmax
+		"snapshot %s for transaction %d: xmin=%d, xmax=%d, active=[",
+		name, GetCurrentTransactionId(), s->xmin, s->xmax
 	);
 	for (i = 0; i < s->xcnt; i++) {
 		if (i == 0) {
@@ -92,7 +93,7 @@ static void DumpSnapshot(Snapshot s, char *name)
 		}
 	}
 	cursor += sprintf(cursor, "]");
-	XTM_TRACE("%s\n", buf);
+	printf("%s\n", buf);
 }
 
 static void DtmCopySnapshot(Snapshot dst, Snapshot src)
@@ -101,7 +102,6 @@ static void DtmCopySnapshot(Snapshot dst, Snapshot src)
     static TransactionId* buf;
     TransactionId prev = InvalidTransactionId;
 
-    XTM_TRACE("XTM: DtmCopySnapshot for transaction%u\n", GetCurrentTransactionId());
     DumpSnapshot(dst, "local");
     DumpSnapshot(src, "DTM");
 
@@ -127,7 +127,7 @@ static void DtmCopySnapshot(Snapshot dst, Snapshot src)
         }
     }
     dst->xcnt = j;
-    DumpSnapshot(dst, "Merged");
+    DumpSnapshot(dst, "merged");
 }
 
 static void DtmUpdateRecentXmin(void)
@@ -157,7 +157,7 @@ static Snapshot DtmGetSnapshot(Snapshot snapshot)
     snapshot = GetLocalSnapshotData(snapshot);        
     if (DtmHasSnapshot) {  
         DtmCopySnapshot(snapshot, &DtmSnapshot);
-        //DtmUpdateRecentXmin();
+        DtmUpdateRecentXmin();
     }
     return snapshot;
 }
diff --git a/contrib/pg_xtm/tests/transfers.go b/contrib/pg_xtm/tests/transfers.go
@@ -144,13 +144,13 @@ func inspect(wg *sync.WaitGroup) {
     var prevSum int32 = 0 
     var xids []int32 = make([]int32, 2)
 
+    for running {
         conn1, err := pgx.Connect(cfg1)
         checkErr(err)
 
         conn2, err := pgx.Connect(cfg2)
         checkErr(err)
 
-    for running {
         exec(conn1, "begin")
         exec(conn2, "begin")
  
@@ -172,12 +172,12 @@ func inspect(wg *sync.WaitGroup) {
 
         sum = sum1 + sum2
         if (sum != prevSum) {
-            fmt.Println("Total = ", sum)
+            fmt.Println("Total = ", sum, "xids=", xids)
             prevSum = sum
         }        
-    }
         conn1.Close()
         conn2.Close()
+    }
     wg.Done()
 }
 
