Skip to content

Commit f9ecb57

Browse files
committed
Clean up WaitLatch calls that passed latch without WL_LATCH_SET
The 'latch' argument is ignored if WL_LATCH_SET is not given. Clarify these calls by not pointlessly passing MyLatch. Discussion: https://www.postgresql.org/message-id/391abe21-413e-4d91-a650-b663af49500c@iki.fi
1 parent 094ae07 commit f9ecb57

File tree

3 files changed

+4
-4
lines changed

3 files changed

+4
-4
lines changed

src/backend/libpq/be-secure-gssapi.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -450,7 +450,7 @@ read_or_wait(Port *port, ssize_t len)
450450
*/
451451
if (ret <= 0)
452452
{
453-
WaitLatchOrSocket(MyLatch,
453+
WaitLatchOrSocket(NULL,
454454
WL_SOCKET_READABLE | WL_EXIT_ON_PM_DEATH,
455455
port->sock, 0, WAIT_EVENT_GSS_OPEN_SERVER);
456456

@@ -668,7 +668,7 @@ secure_open_gssapi(Port *port)
668668
/* Wait and retry if we couldn't write yet */
669669
if (ret <= 0)
670670
{
671-
WaitLatchOrSocket(MyLatch,
671+
WaitLatchOrSocket(NULL,
672672
WL_SOCKET_WRITEABLE | WL_EXIT_ON_PM_DEATH,
673673
port->sock, 0, WAIT_EVENT_GSS_OPEN_SERVER);
674674
continue;

src/backend/libpq/be-secure-openssl.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -506,7 +506,7 @@ be_tls_open_server(Port *port)
506506
else
507507
waitfor = WL_SOCKET_WRITEABLE | WL_EXIT_ON_PM_DEATH;
508508

509-
(void) WaitLatchOrSocket(MyLatch, waitfor, port->sock, 0,
509+
(void) WaitLatchOrSocket(NULL, waitfor, port->sock, 0,
510510
WAIT_EVENT_SSL_OPEN_SERVER);
511511
goto aloop;
512512
case SSL_ERROR_SYSCALL:

src/backend/postmaster/walsummarizer.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -315,7 +315,7 @@ WalSummarizerMain(char *startup_data, size_t startup_data_len)
315315
* So a really fast retry time doesn't seem to be especially
316316
* beneficial, and it will clutter the logs.
317317
*/
318-
(void) WaitLatch(MyLatch,
318+
(void) WaitLatch(NULL,
319319
WL_TIMEOUT | WL_EXIT_ON_PM_DEATH,
320320
10000,
321321
WAIT_EVENT_WAL_SUMMARIZER_ERROR);

0 commit comments

Comments
 (0)
pFad - Phonifier reborn

Pfad - The Proxy pFad of © 2024 Garber Painting. All rights reserved.

Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.


Alternative Proxies:

Alternative Proxy

pFad Proxy

pFad v3 Proxy

pFad v4 Proxy