Actualize DTM bench.

kvap · kvap · commit 2e18a4da21f4 · 2015-10-13T14:16:59.000+03:00
diff --git a/contrib/pg_dtm/libdtm/src/bench.c b/contrib/pg_dtm/libdtm/src/bench.c
@@ -6,37 +6,31 @@
 
 #define unless(x) if (!(x))
 
-#define NODES 1
-
-
 int main(int argc, char **argv) {
-	GlobalTransactionId gtid;
-	TransactionId base = 42;
-	int transactions = 10000;
-	int i;
-	gtid.nNodes = NODES;
-	gtid.xids = malloc(sizeof(TransactionId) * gtid.nNodes);
-	gtid.nodes = malloc(sizeof(NodeId) * gtid.nNodes);
-
-	DTMConn conn = DtmConnect("localhost", 5431);
-	if (!conn) {
-		exit(1);
-	}
+	DtmGlobalConfig("localhost", 5002, "/tmp");
 
+	int i;
 	for (i = 0; i < transactions; i++) {
-
-		int n;
-		for (n = 0; n < gtid.nNodes; n++) {
-			gtid.xids[n] = base + n;
-			gtid.nodes[n] = n;
+		TransactionId xid, gxmin;
+		Snapshot snapshot;
+		xid = DtmGlobalStartTransaction(snapshot, &gxmin);
+		if (xid == INVALID_XID) {
+			fprintf(stdout, "global transaction not started\n");
+			exit(EXIT_FAILURE);
 		}
 
-		if (!DtmGlobalStartTransaction(conn, &gtid)) {
-			fprintf(stdout, "global transaction not started\n");
+		DtmGlobalGetSnapshot(xid, snapshot, &gxmin);
+
+		bool wait = true;
+
+		XidStatus s = DtmGlobalSetTransStatus(xid, TRANSACTION_STATUS_COMMITTED, wait);
+		if (s != TRANSACTION_STATUS_COMMITTED) {
+			fprintf(stdout, "global transaction not committed\n");
 			exit(EXIT_FAILURE);
 		}
 
-		if (!DtmGlobalSetTransStatus(conn, 0, base + 0, TRANSACTION_STATUS_COMMITTED)) {
+		s = DtmGlobalGetTransStatus(xid, wait);
+		if (s != TRANSACTION_STATUS_COMMITTED) {
 			fprintf(stdout, "global transaction not committed\n");
 			exit(EXIT_FAILURE);
 		}
@@ -48,7 +42,5 @@ int main(int argc, char **argv) {
 		base++;
 	}
 
-
-	DtmDisconnect(conn);
 	return EXIT_SUCCESS;
 }
