From 39a138fbef87803ab7fe494243c1ba36a093a0e8 Mon Sep 17 00:00:00 2001 From: Heikki Linnakangas Date: Tue, 6 Aug 2024 22:15:46 +0300 Subject: [PATCH] Revert "Fix comments in instr_time.h and remove an unneeded cast to int64" This reverts commit 3dcb09de7b. Tom Lane pointed out that it broke the abstraction provided by the macros. The callers should not need to know what the internal type is. This commit is an exact revert, the next commit will fix the comments on the macros that incorrectly claim that they return uint64. Discussion: https://www.postgresql.org/message-id/ZrHkv3MAQfwNSmTG@ip-10-97-1-34.eu-west-3.compute.internal --- src/include/portability/instr_time.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/include/portability/instr_time.h b/src/include/portability/instr_time.h index 8f9ba2f151f..a6fc1922f20 100644 --- a/src/include/portability/instr_time.h +++ b/src/include/portability/instr_time.h @@ -32,9 +32,9 @@ * * INSTR_TIME_GET_MILLISEC(t) convert t to double (in milliseconds) * - * INSTR_TIME_GET_MICROSEC(t) get t in microseconds + * INSTR_TIME_GET_MICROSEC(t) convert t to uint64 (in microseconds) * - * INSTR_TIME_GET_NANOSEC(t) get t in nanoseconds + * INSTR_TIME_GET_NANOSEC(t) convert t to uint64 (in nanoseconds) * * Note that INSTR_TIME_SUBTRACT and INSTR_TIME_ACCUM_DIFF convert * absolute times to intervals. The INSTR_TIME_GET_xxx operations are @@ -123,7 +123,7 @@ pg_clock_gettime_ns(void) ((t) = pg_clock_gettime_ns()) #define INSTR_TIME_GET_NANOSEC(t) \ - ((t).ticks) + ((int64) (t).ticks) #else /* WIN32 */