Emit dummy statements for probes.d probes when disabled

petere · petere · commit 0d204a4b09f7 · 2021-05-10T13:56:21.000+02:00
When building without --enable-dtrace, emit dummy do {} while (0) statements for the stubbed-out TRACE_POSTGRESQL_foo() macros instead of empty macros that totally elide the original probe statement. This fixes the warning: suggest braces around empty body in an ‘if’ statement [-Wempty-body] introduced by b94409a. Author: Craig Ringer <craig.ringer@2ndquadrant.com> Discussion: https://www.postgresql.org/message-id/flat/20210504221531.cfvpmmdfsou6eitb%40alap3.anarazel.de
diff --git a/src/backend/utils/Gen_dummy_probes.pl b/src/backend/utils/Gen_dummy_probes.pl
@@ -135,6 +135,12 @@ ()
 			$CondReg ||= $s;
 		}
 
+		# s/$/ do {} while (0)/
+		{
+			$s = s /$/ do {} while (0)/s;
+			$CondReg ||= $s;
+		}
+
 		# P
 		{
 			if (/^(.*)/) { print $1, "\n"; }
diff --git a/src/backend/utils/Gen_dummy_probes.sed b/src/backend/utils/Gen_dummy_probes.sed
@@ -19,5 +19,6 @@ s/([^,)]\{1,\}, [^,)]\{1,\}, [^,)]\{1,\}, [^,)]\{1,\}, [^,)]\{1,\})/(INT1, INT2,
 s/([^,)]\{1,\}, [^,)]\{1,\}, [^,)]\{1,\}, [^,)]\{1,\}, [^,)]\{1,\}, [^,)]\{1,\})/(INT1, INT2, INT3, INT4, INT5, INT6)/
 s/([^,)]\{1,\}, [^,)]\{1,\}, [^,)]\{1,\}, [^,)]\{1,\}, [^,)]\{1,\}, [^,)]\{1,\}, [^,)]\{1,\})/(INT1, INT2, INT3, INT4, INT5, INT6, INT7)/
 s/([^,)]\{1,\}, [^,)]\{1,\}, [^,)]\{1,\}, [^,)]\{1,\}, [^,)]\{1,\}, [^,)]\{1,\}, [^,)]\{1,\}, [^,)]\{1,\})/(INT1, INT2, INT3, INT4, INT5, INT6, INT7, INT8)/
+s/$/ do {} while (0)/
 P
 s/(.*$/_ENABLED() (0)/

Original file line number	Diff line number	Diff line change
`@@ -135,6 +135,12 @@ ()`
`135`	`135`	`$CondReg \|\|= $s;`
`136`	`136`	`}`
`137`	`137`
	`138`	`+ # s/$/ do {} while (0)/`
	`139`	`+ {`
	`140`	`+ $s = s /$/ do {} while (0)/s;`
	`141`	`+ $CondReg \|\|= $s;`
	`142`	`+ }`
	`143`	`+`
`138`	`144`	`# P`
`139`	`145`	`{`
`140`	`146`	`if (/^(.*)/) { print $1, "\n"; }`
Original file line number	Diff line number	Diff line change
`@@ -19,5 +19,6 @@ s/([^,)]\{1,\}, [^,)]\{1,\}, [^,)]\{1,\}, [^,)]\{1,\}, [^,)]\{1,\})/(INT1, INT2,`
`19`	`19`	`s/([^,)]\{1,\}, [^,)]\{1,\}, [^,)]\{1,\}, [^,)]\{1,\}, [^,)]\{1,\}, [^,)]\{1,\})/(INT1, INT2, INT3, INT4, INT5, INT6)/`
`20`	`20`	`s/([^,)]\{1,\}, [^,)]\{1,\}, [^,)]\{1,\}, [^,)]\{1,\}, [^,)]\{1,\}, [^,)]\{1,\}, [^,)]\{1,\})/(INT1, INT2, INT3, INT4, INT5, INT6, INT7)/`
`21`	`21`	`s/([^,)]\{1,\}, [^,)]\{1,\}, [^,)]\{1,\}, [^,)]\{1,\}, [^,)]\{1,\}, [^,)]\{1,\}, [^,)]\{1,\}, [^,)]\{1,\})/(INT1, INT2, INT3, INT4, INT5, INT6, INT7, INT8)/`
	`22`	`+s/$/ do {} while (0)/`
`22`	`23`	`P`
`23`	`24`	`s/(.*$/_ENABLED() (0)/`