Rework macro pgstat_is_ioop_tracked_in_bytes()

michaelpq · michaelpq · commit 7b6468cc9523 · 2025-01-17T08:26:17.000+09:00
As written, it was triggering a compilation warning for old versions of clang, as reported by buildfarm members ayu, batfish and demoiselle. Forcing a cast with "unsigned int" should fix the warning. While on it, the macro is moved to pgstat.h, closer to the declaration of IOOp, per suggestion from Tom Lane. Reported-by: Tom Lane Reviewed-by: Bertrand Drouvot, Tom Lane, Nazir Bilal Yavuz Discussion: https://postgr.es/m/1272824.1736961543@sss.pgh.pa.us
diff --git a/src/backend/utils/activity/pgstat_io.c b/src/backend/utils/activity/pgstat_io.c
@@ -23,14 +23,6 @@
 static PgStat_PendingIO PendingIOStats;
 static bool have_iostats = false;
 
-/*
- * Check if an IOOp is tracked in bytes.  This relies on the ordering of IOOp
- * defined in pgstat.h, so make sure to update this check when changing its
- * elements.
- */
-#define pgstat_is_ioop_tracked_in_bytes(io_op) \
-	((io_op) < IOOP_NUM_TYPES && (io_op) >= IOOP_EXTEND)
-
 /*
  * Check that stats have not been counted for any combination of IOObject,
  * IOContext, and IOOp which are not tracked for the passed-in BackendType. If
diff --git a/src/include/pgstat.h b/src/include/pgstat.h
@@ -314,6 +314,10 @@ typedef enum IOOp
 
 #define IOOP_NUM_TYPES (IOOP_WRITE + 1)
 
+#define pgstat_is_ioop_tracked_in_bytes(io_op) \
+	(((unsigned int) (io_op)) < IOOP_NUM_TYPES && \
+	 ((unsigned int) (io_op)) >= IOOP_EXTEND)
+
 typedef struct PgStat_BktypeIO
 {
 	uint64		bytes[IOOBJECT_NUM_TYPES][IOCONTEXT_NUM_TYPES][IOOP_NUM_TYPES];

Original file line number	Diff line number	Diff line change
`@@ -314,6 +314,10 @@ typedef enum IOOp`
`314`	`314`
`315`	`315`	`#define IOOP_NUM_TYPES (IOOP_WRITE + 1)`
`316`	`316`
	`317`	`+#define pgstat_is_ioop_tracked_in_bytes(io_op) \`
	`318`	`+ (((unsigned int) (io_op)) < IOOP_NUM_TYPES && \`
	`319`	`+ ((unsigned int) (io_op)) >= IOOP_EXTEND)`
	`320`	`+`
`317`	`321`	`typedef struct PgStat_BktypeIO`
`318`	`322`	`{`
`319`	`323`	`uint64 bytes[IOOBJECT_NUM_TYPES][IOCONTEXT_NUM_TYPES][IOOP_NUM_TYPES];`