GetCUrCId

knizhnik · knizhnik · commit cf7b1356c2d3 · 2015-12-29T20:42:39.000+03:00
diff --git a/contrib/multimaster/dtmd/src/server.c b/contrib/multimaster/dtmd/src/server.c
@@ -485,8 +485,11 @@ void server_loop(server_t server) {
 		int numready;
 #ifdef USE_EPOLL
         struct epoll_event events[MAX_EVENTS];
-        numready = epoll_wait(server->epollfd, events, MAX_EVENTS, -1);
+        numready = epoll_wait(server->epollfd, events, MAX_EVENTS, -1);        
 		if (numready < 0) {
+            if (errno == EINTR) { 
+                continue;
+            }
 			shout("failed to select: %s\n", strerror(errno));
 			return;
 		}
diff --git a/contrib/multimaster/multimaster.c b/contrib/multimaster/multimaster.c
@@ -617,10 +617,11 @@ static Snapshot DtmGetSnapshot(Snapshot snapshot)
 {
 	if (TransactionIdIsValid(DtmNextXid) && snapshot != &CatalogSnapshotData)
 	{
-		if (!DtmHasGlobalSnapshot && (snapshot != DtmLastSnapshot || DtmCurcid != snapshot->curcid)) {
+        int cid = GetCurrentCommandId(false);
+		if (!DtmHasGlobalSnapshot && (snapshot != DtmLastSnapshot || DtmCurcid != cid) {
 			DtmGlobalGetSnapshot(DtmNextXid, &DtmSnapshot, &dtm->minXid);
         }
-		DtmCurcid = snapshot->curcid;
+		DtmCurcid = cid;
 		DtmLastSnapshot = snapshot;
 		DtmMergeWithGlobalSnapshot(snapshot);
 		if (!IsolationUsesXactSnapshot())

Original file line number	Diff line number	Diff line change
`@@ -617,10 +617,11 @@ static Snapshot DtmGetSnapshot(Snapshot snapshot)`
`617`	`617`	`{`
`618`	`618`	`if (TransactionIdIsValid(DtmNextXid) && snapshot != &CatalogSnapshotData)`
`619`	`619`	`{`
`620`		`- if (!DtmHasGlobalSnapshot && (snapshot != DtmLastSnapshot \|\| DtmCurcid != snapshot->curcid)) {`
	`620`	`+ int cid = GetCurrentCommandId(false);`
	`621`	`+ if (!DtmHasGlobalSnapshot && (snapshot != DtmLastSnapshot \|\| DtmCurcid != cid) {`
`621`	`622`	`DtmGlobalGetSnapshot(DtmNextXid, &DtmSnapshot, &dtm->minXid);`
`622`	`623`	`}`
`623`		`- DtmCurcid = snapshot->curcid;`
	`624`	`+ DtmCurcid = cid;`
`624`	`625`	`DtmLastSnapshot = snapshot;`
`625`	`626`	`DtmMergeWithGlobalSnapshot(snapshot);`
`626`	`627`	`if (!IsolationUsesXactSnapshot())`