Disable fsync in DTMD. Use TCP_NODELAY in libdtm. Do not use postgres parts in tests of libdtm.

kvap · kvap · commit 776e0cb7e68e · 2015-09-10T17:04:13.000+03:00
diff --git a/contrib/pg_xtm/dtmd/src/clogfile.c b/contrib/pg_xtm/dtmd/src/clogfile.c
@@ -100,9 +100,11 @@ bool clogfile_set_status(clogfile_t *clogfile, xid_t xid, int status) {
 	char *p = ((char*)clogfile->data + offset);
 	*p &= ~(COMMIT_MASK << (BITS_PER_COMMIT * suboffset));   // AND-out the old status
 	*p |= status << (BITS_PER_COMMIT * suboffset); // OR-in the new status
+	#ifdef SYNC
 	if (msync(clogfile->data, BYTES_PER_FILE, MS_SYNC)) {
 		shout("cannot msync clog file '%s': %s\n", clogfile->path, strerror(errno));
 		return false;
 	}
+	#endif
 	return true;
 }
diff --git a/contrib/pg_xtm/dtmd/src/eventwrap.c b/contrib/pg_xtm/dtmd/src/eventwrap.c
@@ -70,6 +70,7 @@ static void on_connect(uv_stream_t *server, int status) {
 		free(client);
 		return;
 	}
+	uv_tcp_nodelay(client, 1);
 	onconnect_cb(&client->data);
 	uv_read_start((uv_stream_t*)client, on_alloc, on_read);
 }
diff --git a/contrib/pg_xtm/libdtm.c b/contrib/pg_xtm/libdtm.c
@@ -1,4 +1,5 @@
 #include <sys/socket.h>
+#include <netinet/tcp.h>
 #include <netdb.h>
 #include <string.h>
 #include <stdio.h>
@@ -96,6 +97,11 @@ DTMConn DtmConnect(char *host, int port) {
 			continue;
 		}
 
+		#ifdef NODELAY
+		int one = 1;
+		setsockopt(sock, IPPROTO_TCP, TCP_NODELAY, &one, sizeof(one));
+		#endif
+
 		if (connect(sock, a->ai_addr, a->ai_addrlen) == -1) {
 			perror("failed to connect to an address");
 			close(sock);
@@ -161,10 +167,14 @@ bool DtmGlobalStartTransaction(DTMConn dtm, GlobalTransactionId *gtid) {
 	return ok;
 }
 
-void DtmInitSnapshot(Snapshot snapshot)
-{
-	if (snapshot->xip == NULL)
-	{
+void DtmInitSnapshot(Snapshot snapshot, int nactive) {
+	#ifdef TEST
+	if (snapshot->xip == NULL) {
+		snapshot->xip = malloc(nactive * sizeof(TransactionId));
+		// FIXME: is this enough for tests?
+	}
+	#else
+	if (snapshot->xip == NULL) {
 		/*
 		 * First call for this snapshot. Snapshot is same size whether or not
 		 * we are in recovery, see later comments.
@@ -183,6 +193,7 @@ void DtmInitSnapshot(Snapshot snapshot)
 					(errcode(ERRCODE_OUT_OF_MEMORY),
 					 errmsg("out of memory")));
 	}
+	#endif
 }
 
 // Asks DTM for a fresh snapshot. Returns 'true' on success, or 'false'
@@ -213,7 +224,7 @@ bool DtmGlobalGetSnapshot(DTMConn dtm, NodeId nodeid, TransactionId xid, Snapsho
 	s->xcnt = number;
 	Assert(s->xcnt == number); // the number should definitely fit into xcnt field size
 
-	DtmInitSnapshot(s);
+	DtmInitSnapshot(s, s->xcnt);
 	for (i = 0; i < s->xcnt; i++) {
 		if (!dtm_read_hex16(dtm, &number)) return false;
 		s->xip[i] = number;
diff --git a/contrib/pg_xtm/libdtm.h b/contrib/pg_xtm/libdtm.h
@@ -20,7 +20,7 @@ DTMConn DtmConnect(char *host, int port);
 // bad things will happen.
 void DtmDisconnect(DTMConn dtm);
 
-void DtmInitSnapshot(Snapshot snapshot);
+void DtmInitSnapshot(Snapshot snapshot, int nactive);
 
 typedef struct {
     TransactionId* xids;
diff --git a/contrib/pg_xtm/libdtm/Makefile b/contrib/pg_xtm/libdtm/Makefile
@@ -1,4 +1,4 @@
-CC=clang -DTEST
+CC=clang -DTEST -DNODELAY
 CFLAGS=-g -Wall -I"../../../src/include"
 
 

Original file line number	Diff line number	Diff line change
`@@ -100,9 +100,11 @@ bool clogfile_set_status(clogfile_t *clogfile, xid_t xid, int status) {`
`100`	`100`	`char p = ((char)clogfile->data + offset);`
`101`	`101`	`p &= ~(COMMIT_MASK << (BITS_PER_COMMIT suboffset)); // AND-out the old status`
`102`	`102`	`p \|= status << (BITS_PER_COMMIT suboffset); // OR-in the new status`
	`103`	`+ #ifdef SYNC`
`103`	`104`	`if (msync(clogfile->data, BYTES_PER_FILE, MS_SYNC)) {`
`104`	`105`	`shout("cannot msync clog file '%s': %s\n", clogfile->path, strerror(errno));`
`105`	`106`	`return false;`
`106`	`107`	`}`
	`108`	`+ #endif`
`107`	`109`	`return true;`
`108`	`110`	`}`
Original file line number	Diff line number	Diff line change
`@@ -70,6 +70,7 @@ static void on_connect(uv_stream_t *server, int status) {`
`70`	`70`	`free(client);`
`71`	`71`	`return;`
`72`	`72`	`}`
	`73`	`+ uv_tcp_nodelay(client, 1);`
`73`	`74`	`onconnect_cb(&client->data);`
`74`	`75`	`uv_read_start((uv_stream_t*)client, on_alloc, on_read);`
`75`	`76`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-CC=clang -DTEST`
	`1`	`+CC=clang -DTEST -DNODELAY`
`2`	`2`	`CFLAGS=-g -Wall -I"../../../src/include"`
`3`	`3`
`4`	`4`