@@ -164,7 +164,7 @@ static cid_t dtm_sync(cid_t global_cid)
164164dtm_sleep (global_cid - local_cid );
165165#if TRACE_SLEEP_TIME
166166totalSleepTime += dtm_get_current_time ()- now ;
167- if (now > prevReportTime + USEC * 10 ) {
167+ if (now > prevReportTime + USEC ) {
168168prevReportTime = now ;
169169if (firstReportTime == 0 ) {
170170firstReportTime = now ;
@@ -445,17 +445,20 @@ static TransactionId DtmAdjustOldestXid(TransactionId xid)
445445{
446446if (TransactionIdIsValid (xid )) {
447447DtmTransStatus * ts ,* prev = NULL ;
448- timestamp_t cutoff_time = dtm_get_current_time ()- DtmVacuumDelay * USEC ;
448+ timestamp_t now = dtm_get_current_time ();
449+ timestamp_t cutoff_time = now - DtmVacuumDelay * USEC ;
449450SpinLockAcquire (& local -> lock );
450451ts = (DtmTransStatus * )hash_search (xid2status ,& xid ,HASH_FIND ,NULL );
451452if (ts != NULL ) {
452453cutoff_time = ts -> cid - DtmVacuumDelay * USEC ;
453- }
454- for (ts = local -> trans_list_head ;ts != NULL && ts -> cid < cutoff_time ;prev = ts ,ts = ts -> next ) {
455- if (prev != NULL ) {
456- hash_search (xid2status ,& prev -> xid ,HASH_REMOVE ,NULL );
457- }
458- }
454+
455+ for (ts = local -> trans_list_head ;ts != NULL && ts -> cid < cutoff_time ;prev = ts ,ts = ts -> next ) {
456+ if (prev != NULL ) {
457+ /* intf(stderr, "Remove xid %d from hash at %lu\n", prev->xid, now); */
458+ hash_search (xid2status ,& prev -> xid ,HASH_REMOVE ,NULL );
459+ }
460+ }
461+ }
459462if (prev != NULL ) {
460463local -> trans_list_head = prev ;
461464xid = prev -> xid ;
@@ -487,7 +490,7 @@ bool DtmXidInMVCCSnapshot(TransactionId xid, Snapshot snapshot)
487490static timestamp_t firstReportTime ;
488491static timestamp_t prevReportTime ;
489492static timestamp_t totalSleepTime ;
490- static timestamp_t maxSleepTime ;
493+ static timestamp_t mnxSleepTime ;
491494#endif
492495timestamp_t delay = MIN_WAIT_TIMEOUT ;
493496Assert (xid != InvalidTransactionId );