From 31c453165b5a656044ce1dbce89f5828c1c7e23c Mon Sep 17 00:00:00 2001 From: Andres Freund Date: Tue, 13 Jan 2015 13:12:37 +0100 Subject: Commonalize process startup code. Move common code, that was duplicated in every postmaster child/every standalone process, into two functions in miscinit.c. Not only does that already result in a fair amount of net code reduction but it also makes it much easier to remove more duplication in the future. The prime motivation wasn't code deduplication though, but easier addition of new common code. --- src/backend/bootstrap/bootstrap.c | 26 ++++---------------------- 1 file changed, 4 insertions(+), 22 deletions(-) (limited to 'src/backend/bootstrap/bootstrap.c') diff --git a/src/backend/bootstrap/bootstrap.c b/src/backend/bootstrap/bootstrap.c index d33c683a4ee..57a1c99d61c 100644 --- a/src/backend/bootstrap/bootstrap.c +++ b/src/backend/bootstrap/bootstrap.c @@ -14,7 +14,6 @@ */ #include "postgres.h" -#include #include #include @@ -191,19 +190,11 @@ AuxiliaryProcessMain(int argc, char *argv[]) char *userDoption = NULL; /* - * initialize globals + * Initialize process environment (already done if under postmaster, but + * not if standalone). */ - MyProcPid = getpid(); - - MyStartTime = time(NULL); - - /* Compute paths, if we didn't inherit them from postmaster */ - if (my_exec_path[0] == '\0') - { - if (find_my_exec(progname, my_exec_path) < 0) - elog(FATAL, "%s: could not locate my own executable path", - progname); - } + if (!IsUnderPostmaster) + InitStandaloneProcess(argv[0]); /* * process command arguments @@ -515,15 +506,6 @@ bootstrap_signals(void) { if (IsUnderPostmaster) { - /* - * If possible, make this process a group leader, so that the - * postmaster can signal any child processes too. - */ -#ifdef HAVE_SETSID - if (setsid() < 0) - elog(FATAL, "setsid() failed: %m"); -#endif - /* * Properly accept or ignore signals the postmaster might send us */ -- cgit v1.2.3