@@ -416,7 +416,7 @@ static void TerminateChildren(int signal);
416416#define SignalChildren (sig ) SignalSomeChildren(sig, BACKEND_TYPE_ALL)
417417
418418static int CountChildren (int target );
419- static bool assign_backendlist_entry (RegisteredBgWorker * rw );
419+ static Backend * assign_backendlist_entry (void );
420420static void maybe_start_bgworkers (void );
421421static bool CreateOptsFile (int argc ,char * argv [],char * fullprogname );
422422static pid_t StartChildProcess (BackendType type );
@@ -4028,6 +4028,7 @@ MaxLivePostmasterChildren(void)
40284028static bool
40294029do_start_bgworker (RegisteredBgWorker * rw )
40304030{
4031+ Backend * bn ;
40314032pid_t worker_pid ;
40324033
40334034Assert (rw -> rw_pid == 0 );
@@ -4042,11 +4043,14 @@ do_start_bgworker(RegisteredBgWorker *rw)
40424043 * tried again right away, most likely we'd find ourselves hitting the
40434044 * same resource-exhaustion condition.
40444045 */
4045- if (!assign_backendlist_entry (rw ))
4046+ bn = assign_backendlist_entry ();
4047+ if (bn == NULL )
40464048{
40474049rw -> rw_crashed_at = GetCurrentTimestamp ();
40484050return false;
40494051}
4052+ rw -> rw_backend = bn ;
4053+ rw -> rw_child_slot = bn -> child_slot ;
40504054
40514055ereport (DEBUG1 ,
40524056(errmsg_internal ("starting background worker process \"%s\"" ,
@@ -4119,12 +4123,10 @@ bgworker_should_start_now(BgWorkerStartTime start_time)
41194123 * Allocate the Backend struct for a connected background worker, but don't
41204124 * add it to the list of backends just yet.
41214125 *
4122- * On failure, return false without changing any worker state.
4123- *
4124- * Some info from the Backend is copied into the passed rw.
4126+ * On failure, return NULL.
41254127 */
4126- static bool
4127- assign_backendlist_entry (RegisteredBgWorker * rw )
4128+ static Backend *
4129+ assign_backendlist_entry (void )
41284130{
41294131Backend * bn ;
41304132
@@ -4138,7 +4140,7 @@ assign_backendlist_entry(RegisteredBgWorker *rw)
41384140ereport (LOG ,
41394141(errcode (ERRCODE_CONFIGURATION_LIMIT_EXCEEDED ),
41404142errmsg ("no slot available for new background worker process" )));
4141- return false ;
4143+ return NULL ;
41424144}
41434145
41444146bn = palloc_extended (sizeof (Backend ),MCXT_ALLOC_NO_OOM );
@@ -4147,18 +4149,15 @@ assign_backendlist_entry(RegisteredBgWorker *rw)
41474149ereport (LOG ,
41484150(errcode (ERRCODE_OUT_OF_MEMORY ),
41494151errmsg ("out of memory" )));
4150- return false ;
4152+ return NULL ;
41514153}
41524154
41534155bn -> child_slot = MyPMChildSlot = AssignPostmasterChildSlot ();
41544156bn -> bkend_type = BACKEND_TYPE_BGWORKER ;
41554157bn -> dead_end = false;
41564158bn -> bgworker_notify = false;
41574159
4158- rw -> rw_backend = bn ;
4159- rw -> rw_child_slot = bn -> child_slot ;
4160-
4161- return true;
4160+ return bn ;
41624161}
41634162
41644163/*