database/postgres
1
0
Fork 0
mirror of https://github.com/postgres/postgres.git synced 2025-07-31 22:04:40 +03:00
Code Activity

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

Browse Source 
Commit 2dee7998f9 renames these
functions in master, for consistency; per discussion, backport
just the renaming portion of that commit to 9.3 to keep the
branches in sync.

Michael Paquier
This commit is contained in:
Robert Haas
2013-08-16 15:28:03 -04:00
parent ae3c8c57cb
commit 8e2eca46db
1 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
src/backend/postmaster/postmaster.c
View File

@ -401,7 +401,7 @@ static int GetNumRegisteredBackgroundWorkers(int flags);
static void StartupPacketTimeoutHandler(void); static void StartupPacketTimeoutHandler(void);
static void CleanupBackend(int pid, int exitstatus); static void CleanupBackend(int pid, int exitstatus);
static bool CleanupBackgroundWorker(int pid, int exitstatus); static bool CleanupBackgroundWorker(int pid, int exitstatus);
static void do_start_bgworker(void); static void StartBackgroundWorker(void);
static void HandleChildCrash(int pid, int exitstatus, const char *procname); static void HandleChildCrash(int pid, int exitstatus, const char *procname);
static void LogChildExit(int lev, const char *procname, static void LogChildExit(int lev, const char *procname,
int pid, int exitstatus); int pid, int exitstatus);
@ -426,7 +426,7 @@ static bool SignalUnconnectedWorkers(int signal);
static int CountChildren(int target); static int CountChildren(int target);
static int CountUnconnectedWorkers(void); static int CountUnconnectedWorkers(void);
static void StartOneBackgroundWorker(void); static void maybe_start_bgworker(void);
static bool CreateOptsFile(int argc, char *argv[], char *fullprogname); static bool CreateOptsFile(int argc, char *argv[], char *fullprogname);
static pid_t StartChildProcess(AuxProcType type); static pid_t StartChildProcess(AuxProcType type);
static void StartAutovacuumWorker(void); static void StartAutovacuumWorker(void);
@ -1251,7 +1251,7 @@ PostmasterMain(int argc, char *argv[])
pmState = PM_STARTUP; pmState = PM_STARTUP;
/* Some workers may be scheduled to start now */ /* Some workers may be scheduled to start now */
StartOneBackgroundWorker(); maybe_start_bgworker();
status = ServerLoop(); status = ServerLoop();
@ -1656,7 +1656,7 @@ ServerLoop(void)
/* Get other worker processes running, if needed */ /* Get other worker processes running, if needed */
if (StartWorkerNeeded || HaveCrashedWorker) if (StartWorkerNeeded || HaveCrashedWorker)
StartOneBackgroundWorker(); maybe_start_bgworker();
/* /*
* Touch Unix socket and lock files every 58 minutes, to ensure that * Touch Unix socket and lock files every 58 minutes, to ensure that
@ -2596,7 +2596,7 @@ reaper(SIGNAL_ARGS)
PgStatPID = pgstat_start(); PgStatPID = pgstat_start();
/* some workers may be scheduled to start now */ /* some workers may be scheduled to start now */
StartOneBackgroundWorker(); maybe_start_bgworker();
/* at this point we are really open for business */ /* at this point we are really open for business */
ereport(LOG, ereport(LOG,
@ -4567,7 +4567,7 @@ SubPostmasterMain(int argc, char *argv[])
cookie = atoi(argv[1] + 15); cookie = atoi(argv[1] + 15);
MyBgworkerEntry = find_bgworker_entry(cookie); MyBgworkerEntry = find_bgworker_entry(cookie);
do_start_bgworker(); StartBackgroundWorker();
} }
if (strcmp(argv[1], "--forkarch") == 0) if (strcmp(argv[1], "--forkarch") == 0)
{ {
@ -4670,7 +4670,7 @@ sigusr1_handler(SIGNAL_ARGS)
pmState = PM_HOT_STANDBY; pmState = PM_HOT_STANDBY;
/* Some workers may be scheduled to start now */ /* Some workers may be scheduled to start now */
StartOneBackgroundWorker(); maybe_start_bgworker();
} }
if (CheckPostmasterSignal(PMSIGNAL_WAKEN_ARCHIVER) && if (CheckPostmasterSignal(PMSIGNAL_WAKEN_ARCHIVER) &&
@ -5382,7 +5382,7 @@ bgworker_sigusr1_handler(SIGNAL_ARGS)
} }
static void static void
do_start_bgworker(void) StartBackgroundWorker(void)
{ {
sigjmp_buf local_sigjmp_buf; sigjmp_buf local_sigjmp_buf;
char buf[MAXPGPATH]; char buf[MAXPGPATH];
@ -5573,7 +5573,7 @@ bgworker_forkexec(int cookie)
* This code is heavily based on autovacuum.c, q.v. * This code is heavily based on autovacuum.c, q.v.
*/ */
static void static void
start_bgworker(RegisteredBgWorker *rw) do_start_bgworker(RegisteredBgWorker *rw)
{ {
pid_t worker_pid; pid_t worker_pid;
@ -5604,7 +5604,7 @@ start_bgworker(RegisteredBgWorker *rw)
/* Do NOT release postmaster's working memory context */ /* Do NOT release postmaster's working memory context */
MyBgworkerEntry = &rw->rw_worker; MyBgworkerEntry = &rw->rw_worker;
do_start_bgworker(); StartBackgroundWorker();
break; break;
#endif #endif
default: default:
@ -5708,7 +5708,7 @@ assign_backendlist_entry(RegisteredBgWorker *rw)
* system state requires it. * system state requires it.
*/ */
static void static void
StartOneBackgroundWorker(void) maybe_start_bgworker(void)
{ {
slist_iter iter; slist_iter iter;
TimestampTz now = 0; TimestampTz now = 0;
@ -5776,7 +5776,7 @@ StartOneBackgroundWorker(void)
else else
rw->rw_child_slot = MyPMChildSlot = AssignPostmasterChildSlot(); rw->rw_child_slot = MyPMChildSlot = AssignPostmasterChildSlot();
start_bgworker(rw); /* sets rw->rw_pid */ do_start_bgworker(rw); /* sets rw->rw_pid */
if (rw->rw_backend) if (rw->rw_backend)
{ {