GetCUrCId

Author: knizhnik

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;
 		}

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())