Commitf9ecb57

committed

Clean up WaitLatch calls that passed latch without WL_LATCH_SET

The 'latch' argument is ignored if WL_LATCH_SET is not given. Clarifythese calls by not pointlessly passing MyLatch.Discussion:https://www.postgresql.org/message-id/391abe21-413e-4d91-a650-b663af49500c@iki.fi

1 parent094ae07 commitf9ecb57Copy full SHA for f9ecb57

File tree

-4

lines changed

-4

lines changed

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -450,7 +450,7 @@ read_or_wait(Port *port, ssize_t len)`
`450`	`450`	`*/`
`451`	`451`	`if (ret <=0)`
`452`	`452`	`{`
`453`		`-WaitLatchOrSocket(MyLatch,`
	`453`	`+WaitLatchOrSocket(NULL,`
`454`	`454`	`WL_SOCKET_READABLE \|WL_EXIT_ON_PM_DEATH,`
`455`	`455`	`port->sock,0,WAIT_EVENT_GSS_OPEN_SERVER);`
`456`	`456`
`@@ -668,7 +668,7 @@ secure_open_gssapi(Port *port)`
`668`	`668`	`/* Wait and retry if we couldn't write yet */`
`669`	`669`	`if (ret <=0)`
`670`	`670`	`{`
`671`		`-WaitLatchOrSocket(MyLatch,`
	`671`	`+WaitLatchOrSocket(NULL,`
`672`	`672`	`WL_SOCKET_WRITEABLE \|WL_EXIT_ON_PM_DEATH,`
`673`	`673`	`port->sock,0,WAIT_EVENT_GSS_OPEN_SERVER);`
`674`	`674`	`continue;`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -506,7 +506,7 @@ be_tls_open_server(Port *port)`
`506`	`506`	`else`
`507`	`507`	`waitfor=WL_SOCKET_WRITEABLE \|WL_EXIT_ON_PM_DEATH;`
`508`	`508`
`509`		`-(void)WaitLatchOrSocket(MyLatch,waitfor,port->sock,0,`
	`509`	`+(void)WaitLatchOrSocket(NULL,waitfor,port->sock,0,`
`510`	`510`	`WAIT_EVENT_SSL_OPEN_SERVER);`
`511`	`511`	`gotoaloop;`
`512`	`512`	`caseSSL_ERROR_SYSCALL:`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -315,7 +315,7 @@ WalSummarizerMain(char *startup_data, size_t startup_data_len)`
`315`	`315`	`* So a really fast retry time doesn't seem to be especially`
`316`	`316`	`* beneficial, and it will clutter the logs.`
`317`	`317`	`*/`
`318`		`-(void)WaitLatch(MyLatch,`
	`318`	`+(void)WaitLatch(NULL,`
`319`	`319`	`WL_TIMEOUT \|WL_EXIT_ON_PM_DEATH,`
`320`	`320`	`10000,`
`321`	`321`	`WAIT_EVENT_WAL_SUMMARIZER_ERROR);`

Comments

(0)