Commitcf7b135

committed

GetCUrCId

1 parent62a3bb5 commitcf7b135Copy full SHA for cf7b135

File tree

-3

lines changed

-3

lines changed

Lines changed: 4 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -485,8 +485,11 @@ void server_loop(server_t server) {`
`485`	`485`	`intnumready;`
`486`	`486`	`#ifdefUSE_EPOLL`
`487`	`487`	`structepoll_eventevents[MAX_EVENTS];`
`488`		`-numready=epoll_wait(server->epollfd,events,MAX_EVENTS,-1);`
	`488`	`+numready=epoll_wait(server->epollfd,events,MAX_EVENTS,-1);`
`489`	`489`	`if (numready<0) {`
	`490`	`+if (errno==EINTR) {`
	`491`	`+continue;`
	`492`	`+ }`
`490`	`493`	`shout("failed to select: %s\n",strerror(errno));`
`491`	`494`	`return;`
`492`	`495`	`}`

Lines changed: 3 additions & 2 deletions

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`	`+intcid=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())`

Comments

(0)