Commit3be5fe2

committed

Silence compiler warnings

Commitcfdf4dc left a few unnecessary assignments, one of whichcaused compiler warnings, as reported by Erik Rijkers. Remove them all.Discussion:https://postgr.es/m/df0dcca2025b3d90d946ecc508ca9678@xs4all.nl

1 parent0f75a46 commit3be5fe2Copy full SHA for 3be5fe2

File tree

+16

-19

lines changed

contrib/pg_prewarm
- autoprewarm.c
src
- backend/postmaster
  - bgwriter.c
- test/modules/worker_spi
  - worker_spi.c

+16

-19

lines changed

Lines changed: 8 additions & 10 deletions

Original file line number	Diff line number	Diff line change
`@@ -207,8 +207,6 @@ autoprewarm_main(Datum main_arg)`
`207`	`207`	`/* Periodically dump buffers until terminated. */`
`208`	`208`	`while (!got_sigterm)`
`209`	`209`	`{`
`210`		`-intrc;`
`211`		`-`
`212`	`210`	`/* In case of a SIGHUP, just reload the configuration. */`
`213`	`211`	`if (got_sighup)`
`214`	`212`	`{`
`@@ -219,10 +217,10 @@ autoprewarm_main(Datum main_arg)`
`219`	`217`	`if (autoprewarm_interval <=0)`
`220`	`218`	`{`
`221`	`219`	`/* We're only dumping at shutdown, so just wait forever. */`
`222`		`-rc=WaitLatch(&MyProc->procLatch,`
`223`		`-WL_LATCH_SET \|WL_EXIT_ON_PM_DEATH,`
`224`		`--1L,`
`225`		`-PG_WAIT_EXTENSION);`
	`220`	`+(void)WaitLatch(&MyProc->procLatch,`
	`221`	`+WL_LATCH_SET \|WL_EXIT_ON_PM_DEATH,`
	`222`	`+-1L,`
	`223`	`+PG_WAIT_EXTENSION);`
`226`	`224`	`}`
`227`	`225`	`else`
`228`	`226`	`{`
`@@ -248,10 +246,10 @@ autoprewarm_main(Datum main_arg)`
`248`	`246`	`}`
`249`	`247`
`250`	`248`	`/* Sleep until the next dump time. */`
`251`		`-rc=WaitLatch(&MyProc->procLatch,`
`252`		`-WL_LATCH_SET \|WL_TIMEOUT \|WL_EXIT_ON_PM_DEATH,`
`253`		`-delay_in_ms,`
`254`		`-PG_WAIT_EXTENSION);`
	`249`	`+(void)WaitLatch(&MyProc->procLatch,`
	`250`	`+WL_LATCH_SET \|WL_TIMEOUT \|WL_EXIT_ON_PM_DEATH,`
	`251`	`+delay_in_ms,`
	`252`	`+PG_WAIT_EXTENSION);`
`255`	`253`	`}`
`256`	`254`
`257`	`255`	`/* Reset the latch, loop. */`

Lines changed: 4 additions & 4 deletions

Original file line number	Diff line number	Diff line change
`@@ -361,10 +361,10 @@ BackgroundWriterMain(void)`
`361`	`361`	`/* Ask for notification at next buffer allocation */`
`362`	`362`	`StrategyNotifyBgWriter(MyProc->pgprocno);`
`363`	`363`	`/* Sleep ... */`
`364`		`-rc=WaitLatch(MyLatch,`
`365`		`-WL_LATCH_SET \|WL_TIMEOUT \|WL_EXIT_ON_PM_DEATH,`
`366`		`-BgWriterDelay*HIBERNATE_FACTOR,`
`367`		`-WAIT_EVENT_BGWRITER_HIBERNATE);`
	`364`	`+(void)WaitLatch(MyLatch,`
	`365`	`+WL_LATCH_SET \|WL_TIMEOUT \|WL_EXIT_ON_PM_DEATH,`
	`366`	`+BgWriterDelay*HIBERNATE_FACTOR,`
	`367`	`+WAIT_EVENT_BGWRITER_HIBERNATE);`
`368`	`368`	`/* Reset the notification request in case we timed out */`
`369`	`369`	`StrategyNotifyBgWriter(-1);`
`370`	`370`	`}`

Lines changed: 4 additions & 5 deletions

Original file line number	Diff line number	Diff line change
`@@ -217,18 +217,17 @@ worker_spi_main(Datum main_arg)`
`217`	`217`	`while (!got_sigterm)`
`218`	`218`	`{`
`219`	`219`	`intret;`
`220`		`-intrc;`
`221`	`220`
`222`	`221`	`/*`
`223`	`222`	`* Background workers mustn't call usleep() or any direct equivalent:`
`224`	`223`	`* instead, they may wait on their process latch, which sleeps as`
`225`	`224`	`* necessary, but is awakened if postmaster dies. That way the`
`226`	`225`	`* background process goes away immediately in an emergency.`
`227`	`226`	`*/`
`228`		`-rc=WaitLatch(MyLatch,`
`229`		`-WL_LATCH_SET \|WL_TIMEOUT \|WL_EXIT_ON_PM_DEATH,`
`230`		`-worker_spi_naptime*1000L,`
`231`		`-PG_WAIT_EXTENSION);`
	`227`	`+(void)WaitLatch(MyLatch,`
	`228`	`+WL_LATCH_SET \|WL_TIMEOUT \|WL_EXIT_ON_PM_DEATH,`
	`229`	`+worker_spi_naptime*1000L,`
	`230`	`+PG_WAIT_EXTENSION);`
`232`	`231`	`ResetLatch(MyLatch);`
`233`	`232`
`234`	`233`	`CHECK_FOR_INTERRUPTS();`

Comments

(0)