Revert "Fix comments in instr_time.h and remove an unneeded cast to int64"

hlinnaka · hlinnaka · commit 39a138fbef87 · 2024-08-06T22:15:46.000+03:00
This reverts commit 3dcb09d. 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
diff --git 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 */

Original file line number	Diff line number	Diff line change
`@@ -32,9 +32,9 @@`
`32`	`32`	`*`
`33`	`33`	`* INSTR_TIME_GET_MILLISEC(t) convert t to double (in milliseconds)`
`34`	`34`	`*`
`35`		`- * INSTR_TIME_GET_MICROSEC(t) get t in microseconds`
	`35`	`+ * INSTR_TIME_GET_MICROSEC(t) convert t to uint64 (in microseconds)`
`36`	`36`	`*`
`37`		`- * INSTR_TIME_GET_NANOSEC(t) get t in nanoseconds`
	`37`	`+ * INSTR_TIME_GET_NANOSEC(t) convert t to uint64 (in nanoseconds)`
`38`	`38`	`*`
`39`	`39`	`* Note that INSTR_TIME_SUBTRACT and INSTR_TIME_ACCUM_DIFF convert`
`40`	`40`	`* absolute times to intervals. The INSTR_TIME_GET_xxx operations are`
`@@ -123,7 +123,7 @@ pg_clock_gettime_ns(void)`
`123`	`123`	`((t) = pg_clock_gettime_ns())`
`124`	`124`
`125`	`125`	`#define INSTR_TIME_GET_NANOSEC(t) \`
`126`		`- ((t).ticks)`
	`126`	`+ ((int64) (t).ticks)`
`127`	`127`
`128`	`128`
`129`	`129`	`#else /* WIN32 */`