postgres.git / summary / log / commit / refs

commit    0d204a4b09f74f2c2ca0d099d5a44ce422d6978d
Author:   Peter Eisentraut <peter@eisentraut.org>
Date:     Mon May 10 09:36:26 2021 +0000
First released in: 14.0, 13.3

    Emit dummy statements for probes.d probes when disabled
    
    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 b94409a02f.
    
    Author: Craig Ringer <craig.ringer@2ndquadrant.com>
    Discussion: https://www.postgresql.org/message-id/flat/20210504221531.cfvpmmdfsou6eitb%40alap3.anarazel.de


src/backend/utils/Gen_dummy_probes.pl | 6 ++++++ src/backend/utils/Gen_dummy_probes.sed | 1 + 2 files changed, 7 insertions(+) diff --git a/src/backend/utils/Gen_dummy_probes.pl b/src/backend/utils/Gen_dummy_probes.pl index cb0ad5a75cf..073c0a854d2 100644 --- a/src/backend/utils/Gen_dummy_probes.pl +++ b/src/backend/utils/Gen_dummy_probes.pl @@ -135,6 +135,12 @@ sub Run() $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 index 3c9eac6e4f7..9ded04d98a8 100644 --- 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)/ [parent: 55fe672a92e3]