aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorMichael Paquier <michael@paquier.xyz>2023-07-13 09:09:04 +0900
committerMichael Paquier <michael@paquier.xyz>2023-07-13 09:09:04 +0900
commitc17164aec88cfa2d1b949e76e05e4ebafd74936c (patch)
tree6967b2faf3cb3dae37a750bfb08492ee686213a9 /src
parent7a7f13afee9229fe738c390d39aa44c394400c04 (diff)
downloadpostgresql-c17164aec88cfa2d1b949e76e05e4ebafd74936c.tar.gz
postgresql-c17164aec88cfa2d1b949e76e05e4ebafd74936c.zip
Simplify some conditions related to [LW]Lock in generate-wait_event_types.pl
The first check on the enum values was not necessary as the values set in wait_event_names.txt for the classes LWLock and Lock were able to satisfy the check. The second check when generating the C and header files is now based on a match of the class names, making it simpler to understand. Author: Masahiro Ikeda, Michael Paquier Discussion: https://postgr.es/m/eaf82a85c0ef1b55dc3b651d3f7b867a@oss.nttdata.com
Diffstat (limited to 'src')
-rw-r--r--src/backend/utils/activity/generate-wait_event_types.pl11
1 files changed, 3 insertions, 8 deletions
diff --git a/src/backend/utils/activity/generate-wait_event_types.pl b/src/backend/utils/activity/generate-wait_event_types.pl
index 6d1a2af42ae..75cddf6fa26 100644
--- a/src/backend/utils/activity/generate-wait_event_types.pl
+++ b/src/backend/utils/activity/generate-wait_event_types.pl
@@ -85,13 +85,8 @@ foreach my $line (@lines_sorted)
my $trimmedwaiteventname = $waiteventenumname;
$trimmedwaiteventname =~ s/^WAIT_EVENT_//;
- # An exception is required for LWLock and Lock as these don't require
- # any C and header files generated.
die "wait event names must start with 'WAIT_EVENT_'"
- if ( $trimmedwaiteventname eq $waiteventenumname
- && $waiteventenumname !~ /^LWLock/
- && $waiteventenumname !~ /^Lock/);
- $continue = ",\n";
+ if ($trimmedwaiteventname eq $waiteventenumname);
push(@{ $hashwe{$waitclassname} }, @waiteventlist);
}
@@ -141,8 +136,8 @@ if ($gen_code)
# Don't generate .c and .h files for LWLock and Lock, these are
# handled independently.
next
- if ( $waitclass =~ /^WaitEventLWLock$/
- || $waitclass =~ /^WaitEventLock$/);
+ if ( $waitclass eq 'WaitEventLWLock'
+ || $waitclass eq 'WaitEventLock');
my $last = $waitclass;
$last =~ s/^WaitEvent//;