v2-0007-Clean-up-existing-WaitLatch-calls-that-passed-MyL.patch
text/x-patch
Filename: v2-0007-Clean-up-existing-WaitLatch-calls-that-passed-MyL.patch
Type: text/x-patch
Part: 6
Message:
Re: Interrupts vs signals
Patch
Format: format-patch
Series: patch v2-0007
Subject: Clean up existing WaitLatch calls that passed MyLatch without WL_LATCH_SET
| File | + | − |
|---|---|---|
| src/backend/libpq/be-secure-gssapi.c | 2 | 2 |
| src/backend/libpq/be-secure-openssl.c | 1 | 1 |
| src/backend/postmaster/walsummarizer.c | 1 | 1 |
From 777c7b0ba2fb5a538c0eb3ec0afe87b0d8997fec Mon Sep 17 00:00:00 2001
From: Heikki Linnakangas <heikki.linnakangas@iki.fi>
Date: Fri, 30 Aug 2024 21:06:36 +0300
Subject: [PATCH v2 07/12] Clean up existing WaitLatch calls that passed
MyLatch without WL_LATCH_SET
The 'latch' argument is ignored if WL_LATCH_SET is not given. Clarify
these calls by not pointlessly passing MyLatch.
---
src/backend/libpq/be-secure-gssapi.c | 4 ++--
src/backend/libpq/be-secure-openssl.c | 2 +-
src/backend/postmaster/walsummarizer.c | 2 +-
3 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/src/backend/libpq/be-secure-gssapi.c b/src/backend/libpq/be-secure-gssapi.c
index 483636503c..2d36c76324 100644
--- a/src/backend/libpq/be-secure-gssapi.c
+++ b/src/backend/libpq/be-secure-gssapi.c
@@ -450,7 +450,7 @@ read_or_wait(Port *port, ssize_t len)
*/
if (ret <= 0)
{
- WaitLatchOrSocket(MyLatch,
+ WaitLatchOrSocket(NULL,
WL_SOCKET_READABLE | WL_EXIT_ON_PM_DEATH,
port->sock, 0, WAIT_EVENT_GSS_OPEN_SERVER);
@@ -668,7 +668,7 @@ secure_open_gssapi(Port *port)
/* Wait and retry if we couldn't write yet */
if (ret <= 0)
{
- WaitLatchOrSocket(MyLatch,
+ WaitLatchOrSocket(NULL,
WL_SOCKET_WRITEABLE | WL_EXIT_ON_PM_DEATH,
port->sock, 0, WAIT_EVENT_GSS_OPEN_SERVER);
continue;
diff --git a/src/backend/libpq/be-secure-openssl.c b/src/backend/libpq/be-secure-openssl.c
index 60cf5d16e7..1b36077891 100644
--- a/src/backend/libpq/be-secure-openssl.c
+++ b/src/backend/libpq/be-secure-openssl.c
@@ -519,7 +519,7 @@ aloop:
else
waitfor = WL_SOCKET_WRITEABLE | WL_EXIT_ON_PM_DEATH;
- (void) WaitLatchOrSocket(MyLatch, waitfor, port->sock, 0,
+ (void) WaitLatchOrSocket(NULL, waitfor, port->sock, 0,
WAIT_EVENT_SSL_OPEN_SERVER);
goto aloop;
case SSL_ERROR_SYSCALL:
diff --git a/src/backend/postmaster/walsummarizer.c b/src/backend/postmaster/walsummarizer.c
index 3a407f8daa..48350bec52 100644
--- a/src/backend/postmaster/walsummarizer.c
+++ b/src/backend/postmaster/walsummarizer.c
@@ -315,7 +315,7 @@ WalSummarizerMain(char *startup_data, size_t startup_data_len)
* So a really fast retry time doesn't seem to be especially
* beneficial, and it will clutter the logs.
*/
- (void) WaitLatch(MyLatch,
+ (void) WaitLatch(NULL,
WL_TIMEOUT | WL_EXIT_ON_PM_DEATH,
10000,
WAIT_EVENT_WAL_SUMMARIZER_ERROR);
--
2.39.2