NotificationsYou must be signed in to change notification settings
Fork6
Star31

Commit8e2eca4

committed

Rename some bgworker functions as we've done in master.

Commit2dee799 renames thesefunctions in master, for consistency; per discussion, backportjust the renaming portion of that commit to 9.3 to keep thebranches in sync.Michael Paquier

1 parentae3c8c5 commit8e2eca4Copy full SHA for 8e2eca4

File tree

1 file changed

+12

-12

lines changed

src/backend/postmaster
- postmaster.c

1 file changed

+12

-12

lines changed

`‎src/backend/postmaster/postmaster.c`

Lines changed: 12 additions & 12 deletions

Original file line number	Diff line number	Diff line change
`@@ -401,7 +401,7 @@ static intGetNumRegisteredBackgroundWorkers(int flags);`
`401`	`401`	`staticvoidStartupPacketTimeoutHandler(void);`
`402`	`402`	`staticvoidCleanupBackend(intpid,intexitstatus);`
`403`	`403`	`staticboolCleanupBackgroundWorker(intpid,intexitstatus);`
`404`		`-staticvoiddo_start_bgworker(void);`
	`404`	`+staticvoidStartBackgroundWorker(void);`
`405`	`405`	`staticvoidHandleChildCrash(intpid,intexitstatus,constchar*procname);`
`406`	`406`	`staticvoidLogChildExit(intlev,constchar*procname,`
`407`	`407`	`intpid,intexitstatus);`
`@@ -426,7 +426,7 @@ static bool SignalUnconnectedWorkers(int signal);`
`426`	`426`
`427`	`427`	`staticintCountChildren(inttarget);`
`428`	`428`	`staticintCountUnconnectedWorkers(void);`
`429`		`-staticvoidStartOneBackgroundWorker(void);`
	`429`	`+staticvoidmaybe_start_bgworker(void);`
`430`	`430`	`staticboolCreateOptsFile(intargc,charargv[],charfullprogname);`
`431`	`431`	`staticpid_tStartChildProcess(AuxProcTypetype);`
`432`	`432`	`staticvoidStartAutovacuumWorker(void);`
`@@ -1251,7 +1251,7 @@ PostmasterMain(int argc, char *argv[])`
`1251`	`1251`	`pmState=PM_STARTUP;`
`1252`	`1252`
`1253`	`1253`	`/* Some workers may be scheduled to start now */`
`1254`		`-StartOneBackgroundWorker();`
	`1254`	`+maybe_start_bgworker();`
`1255`	`1255`
`1256`	`1256`	`status=ServerLoop();`
`1257`	`1257`
`@@ -1656,7 +1656,7 @@ ServerLoop(void)`
`1656`	`1656`
`1657`	`1657`	`/* Get other worker processes running, if needed */`
`1658`	`1658`	`if (StartWorkerNeeded\|\|HaveCrashedWorker)`
`1659`		`-StartOneBackgroundWorker();`
	`1659`	`+maybe_start_bgworker();`
`1660`	`1660`
`1661`	`1661`	`/*`
`1662`	`1662`	`* Touch Unix socket and lock files every 58 minutes, to ensure that`
`@@ -2596,7 +2596,7 @@ reaper(SIGNAL_ARGS)`
`2596`	`2596`	`PgStatPID=pgstat_start();`
`2597`	`2597`
`2598`	`2598`	`/* some workers may be scheduled to start now */`
`2599`		`-StartOneBackgroundWorker();`
	`2599`	`+maybe_start_bgworker();`
`2600`	`2600`
`2601`	`2601`	`/* at this point we are really open for business */`
`2602`	`2602`	`ereport(LOG,`
`@@ -4567,7 +4567,7 @@ SubPostmasterMain(int argc, char *argv[])`
`4567`	`4567`
`4568`	`4568`	`cookie=atoi(argv[1]+15);`
`4569`	`4569`	`MyBgworkerEntry=find_bgworker_entry(cookie);`
`4570`		`-do_start_bgworker();`
	`4570`	`+StartBackgroundWorker();`
`4571`	`4571`	`}`
`4572`	`4572`	`if (strcmp(argv[1],"--forkarch")==0)`
`4573`	`4573`	`{`
`@@ -4670,7 +4670,7 @@ sigusr1_handler(SIGNAL_ARGS)`
`4670`	`4670`	`pmState=PM_HOT_STANDBY;`
`4671`	`4671`
`4672`	`4672`	`/* Some workers may be scheduled to start now */`
`4673`		`-StartOneBackgroundWorker();`
	`4673`	`+maybe_start_bgworker();`
`4674`	`4674`	`}`
`4675`	`4675`
`4676`	`4676`	`if (CheckPostmasterSignal(PMSIGNAL_WAKEN_ARCHIVER)&&`
`@@ -5382,7 +5382,7 @@ bgworker_sigusr1_handler(SIGNAL_ARGS)`
`5382`	`5382`	`}`
`5383`	`5383`
`5384`	`5384`	`staticvoid`
`5385`		`-do_start_bgworker(void)`
	`5385`	`+StartBackgroundWorker(void)`
`5386`	`5386`	`{`
`5387`	`5387`	`sigjmp_buflocal_sigjmp_buf;`
`5388`	`5388`	`charbuf[MAXPGPATH];`
`@@ -5573,7 +5573,7 @@ bgworker_forkexec(int cookie)`
`5573`	`5573`	`* This code is heavily based on autovacuum.c, q.v.`
`5574`	`5574`	`*/`
`5575`	`5575`	`staticvoid`
`5576`		`-start_bgworker(RegisteredBgWorker*rw)`
	`5576`	`+do_start_bgworker(RegisteredBgWorker*rw)`
`5577`	`5577`	`{`
`5578`	`5578`	`pid_tworker_pid;`
`5579`	`5579`
`@@ -5604,7 +5604,7 @@ start_bgworker(RegisteredBgWorker *rw)`
`5604`	`5604`	`/* Do NOT release postmaster's working memory context */`
`5605`	`5605`
`5606`	`5606`	`MyBgworkerEntry=&rw->rw_worker;`
`5607`		`-do_start_bgworker();`
	`5607`	`+StartBackgroundWorker();`
`5608`	`5608`	`break;`
`5609`	`5609`	`#endif`
`5610`	`5610`	`default:`
`@@ -5708,7 +5708,7 @@ assign_backendlist_entry(RegisteredBgWorker *rw)`
`5708`	`5708`	`* system state requires it.`
`5709`	`5709`	`*/`
`5710`	`5710`	`staticvoid`
`5711`		`-StartOneBackgroundWorker(void)`
	`5711`	`+maybe_start_bgworker(void)`
`5712`	`5712`	`{`
`5713`	`5713`	`slist_iteriter;`
`5714`	`5714`	`TimestampTznow=0;`
`@@ -5776,7 +5776,7 @@ StartOneBackgroundWorker(void)`
`5776`	`5776`	`else`
`5777`	`5777`	`rw->rw_child_slot=MyPMChildSlot=AssignPostmasterChildSlot();`
`5778`	`5778`
`5779`		`-start_bgworker(rw);/* sets rw->rw_pid */`
	`5779`	`+do_start_bgworker(rw);/* sets rw->rw_pid */`
`5780`	`5780`
`5781`	`5781`	`if (rw->rw_backend)`
`5782`	`5782`	`{`

0 commit comments

Comments

(0)

Movatterモバイル変換

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Commit8e2eca4

File tree

1 file changed

1 file changed

`‎src/backend/postmaster/postmaster.c`

0 commit comments