mirror/postgresql
2
0
Fork 0
mirror of https://git.postgresql.org/git/postgresql.git synced 2025-02-23 19:39:53 +08:00
Code Issues Packages Projects Releases Wiki Activity

Rename StartBackgroundWorker() to BackgroundWorkerMain().

Browse Source 
The comment claimed that it is "called from postmaster", but it is
actually called in the child process, pretty early in the process
initialization. I guess you could interpret "called from postmaster"
to mean that, but it seems wrong to me. Rename the function to be
consistent with other functions with similar role.

Reviewed-by: Thomas Munro
Discussion: https://www.postgresql.org/message-id/4f95c1fc-ad3c-7974-3a8c-6faa3931804c@iki.fi
This commit is contained in:
Heikki Linnakangas 2023-10-09 11:52:09 +03:00
parent 0bbafb5342
commit 637109d13a
3 changed files with 6 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/backend/postmaster/bgworker.c
View File

@ -741,13 +741,10 @@ bgworker_die(SIGNAL_ARGS)
} }
/* /*
* Start a new background worker * Main entry point for background worker processes.
*
* This is the main entry point for background worker, to be called from
* postmaster.
*/ */
void void
StartBackgroundWorker(void) BackgroundWorkerMain(void)
{ {
sigjmp_buf local_sigjmp_buf; sigjmp_buf local_sigjmp_buf;
BackgroundWorker *worker = MyBgworkerEntry; BackgroundWorker *worker = MyBgworkerEntry;

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

@ -4982,7 +4982,7 @@ SubPostmasterMain(int argc, char *argv[])
shmem_slot = atoi(argv[1] + 15); shmem_slot = atoi(argv[1] + 15);
MyBgworkerEntry = BackgroundWorkerEntry(shmem_slot); MyBgworkerEntry = BackgroundWorkerEntry(shmem_slot);
StartBackgroundWorker(); BackgroundWorkerMain();
} }
if (strcmp(argv[1], "--forklog") == 0) if (strcmp(argv[1], "--forklog") == 0)
{ {
@ -5721,7 +5721,7 @@ do_start_bgworker(RegisteredBgWorker *rw)
MemoryContextDelete(PostmasterContext); MemoryContextDelete(PostmasterContext);
PostmasterContext = NULL; PostmasterContext = NULL;
StartBackgroundWorker(); BackgroundWorkerMain();
exit(1); /* should not get here */ exit(1); /* should not get here */
break; break;

4
src/include/postmaster/bgworker_internals.h
View File

@ -54,8 +54,8 @@ extern void BackgroundWorkerStopNotifications(pid_t pid);
extern void ForgetUnstartedBackgroundWorkers(void); extern void ForgetUnstartedBackgroundWorkers(void);
extern void ResetBackgroundWorkerCrashTimes(void); extern void ResetBackgroundWorkerCrashTimes(void);
/* Function to start a background worker, called from postmaster.c */ /* Entry point for background worker processes */
extern void StartBackgroundWorker(void) pg_attribute_noreturn(); extern void BackgroundWorkerMain(void) pg_attribute_noreturn();
#ifdef EXEC_BACKEND #ifdef EXEC_BACKEND
extern BackgroundWorker *BackgroundWorkerEntry(int slotno); extern BackgroundWorker *BackgroundWorkerEntry(int slotno);