Skip to content

Commit 75e7378

Browse files
committed
Small tidyup for commit d41a178.
A comment was left behind claiming that we needed to use malloc() rather than palloc() because the corresponding free would run in another thread, but that's not true anymore. Remove that comment. And, with the reason being gone, we might as well actually use palloc(). Back-patch to supported releases, like d41a178. Discussion: https://postgr.es/m/CA%2BhUKG%2BpdM9v3Jv4tc2BFx2jh_daY3uzUyAGBhtDkotEQDNPYw%40mail.gmail.com
1 parent b0488cb commit 75e7378

File tree

1 file changed

+4
-7
lines changed

1 file changed

+4
-7
lines changed

src/backend/postmaster/postmaster.c

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -4836,13 +4836,10 @@ internal_forkexec(int argc, char *argv[], Port *port)
48364836

48374837
/*
48384838
* Queue a waiter to signal when this child dies. The wait will be handled
4839-
* automatically by an operating system thread pool.
4840-
*
4841-
* Note: use malloc instead of palloc, since it needs to be thread-safe.
4842-
* Struct will be free():d from the callback function that runs on a
4843-
* different thread.
4839+
* automatically by an operating system thread pool. The memory will be
4840+
* freed by a later call to waitpid().
48444841
*/
4845-
childinfo = malloc(sizeof(win32_deadchild_waitinfo));
4842+
childinfo = palloc(sizeof(win32_deadchild_waitinfo));
48464843
if (!childinfo)
48474844
ereport(FATAL,
48484845
(errcode(ERRCODE_OUT_OF_MEMORY),
@@ -6523,7 +6520,7 @@ waitpid(pid_t pid, int *exitstatus, int options)
65236520
* Free struct that was allocated before the call to
65246521
* RegisterWaitForSingleObject()
65256522
*/
6526-
free(childinfo);
6523+
pfree(childinfo);
65276524

65286525
return pid;
65296526
}

0 commit comments

Comments
 (0)