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

diff --git a/src/backend/libpq/be-secure-gssapi.c b/src/backend/libpq/be-secure-gssapi.c
index 483636503c188d36ce7678a756d135f63ad44260..2d36c76324a38719c381de6e104aa14f3f83f0bb 100644 (file)
--- 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 8ec78c8330457ee0157488eeee58a6b63e95620b..e810be03bd3bf2d683666a0c83cd4800eac5ab7f 100644 (file)
--- a/src/backend/libpq/be-secure-openssl.c
+++ b/src/backend/libpq/be-secure-openssl.c
@@ -506,7 +506,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 c1bf4a70dd174d47b44319fdc194c280c05847fa..ee6f1afc9af82ec5a3def814748ba36c4152fc7b 100644 (file)
--- 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);