diff options
Diffstat (limited to 'src/bin/pg_basebackup/streamutil.c')
| -rw-r--r-- | src/bin/pg_basebackup/streamutil.c | 20 |
1 files changed, 9 insertions, 11 deletions
diff --git a/src/bin/pg_basebackup/streamutil.c b/src/bin/pg_basebackup/streamutil.c index 35143f5de76..90d93cbed16 100644 --- a/src/bin/pg_basebackup/streamutil.c +++ b/src/bin/pg_basebackup/streamutil.c @@ -433,20 +433,18 @@ DropReplicationSlot(PGconn *conn, const char *slot_name) /* * Frontend version of GetCurrentTimestamp(), since we are not linked with - * backend code. The replication protocol always uses integer timestamps, - * regardless of the server setting. + * backend code. */ -int64 +TimestampTz feGetCurrentTimestamp(void) { - int64 result; + TimestampTz result; struct timeval tp; gettimeofday(&tp, NULL); - result = (int64) tp.tv_sec - + result = (TimestampTz) tp.tv_sec - ((POSTGRES_EPOCH_JDATE - UNIX_EPOCH_JDATE) * SECS_PER_DAY); - result = (result * USECS_PER_SEC) + tp.tv_usec; return result; @@ -457,10 +455,10 @@ feGetCurrentTimestamp(void) * backend code. */ void -feTimestampDifference(int64 start_time, int64 stop_time, +feTimestampDifference(TimestampTz start_time, TimestampTz stop_time, long *secs, int *microsecs) { - int64 diff = stop_time - start_time; + TimestampTz diff = stop_time - start_time; if (diff <= 0) { @@ -479,11 +477,11 @@ feTimestampDifference(int64 start_time, int64 stop_time, * linked with backend code. */ bool -feTimestampDifferenceExceeds(int64 start_time, - int64 stop_time, +feTimestampDifferenceExceeds(TimestampTz start_time, + TimestampTz stop_time, int msec) { - int64 diff = stop_time - start_time; + TimestampTz diff = stop_time - start_time; return (diff >= msec * INT64CONST(1000)); } |