Use sleep by Arseny

Author: kelvich

contrib/mmts/multimaster.c

@@ -460,15 +460,18 @@ timestamp_t MtmGetCurrentTime(void)
 
 void MtmSleep(timestamp_t interval)
 {
-	struct timespec ts;
-	struct timespec rem;
-	ts.tv_sec = interval/USECS_PER_SEC;
-	ts.tv_nsec = interval%USECS_PER_SEC*1000;
+	timestamp_t waketm = MtmGetCurrentTime() + interval;
+	for (;;)
+	{
+		timestamp_t sleepfor = waketm - MtmGetCurrentTime();
 
-	while (nanosleep(&ts, &rem) < 0) {
-		Assert(errno == EINTR);
-		CHECK_FOR_INTERRUPTS();
-		ts = rem;
+		pg_usleep(sleepfor);
+		if (MtmGetCurrentTime() < waketm)
+		{
+			Assert(errno == EINTR);
+			continue;
+		}
+		break;
 	}
 }
 

src/backend/access/transam/global_snapshot.c

@@ -152,17 +152,19 @@ dtm_get_current_time()
 static void
 dtm_sleep(timestamp_t interval)
 {
-	struct timespec ts;
-	struct timespec rem;
-
-	ts.tv_sec = 0;
-	ts.tv_nsec = interval * 1000;
-
-	while (nanosleep(&ts, &rem) < 0)
+	timestamp_t waketm = dtm_get_current_time() + interval;
+	for (;;)
 	{
-		totalSleepInterrupts += 1;
-		Assert(errno == EINTR);
-		ts = rem;
+		timestamp_t sleepfor = waketm - dtm_get_current_time();
+
+		pg_usleep(sleepfor);
+		if (dtm_get_current_time() < waketm)
+		{
+			totalSleepInterrupts += 1;
+			Assert(errno == EINTR);
+			continue;
+		}
+		break;
 	}
 }