diff --git a/src/backend/postmaster/fork_process.c b/src/backend/postmaster/fork_process.c index f6df2de..7b9bc38 100644 --- a/src/backend/postmaster/fork_process.c +++ b/src/backend/postmaster/fork_process.c @@ -22,6 +22,11 @@ #endif #ifndef WIN32 + +#ifdef __linux__ +int linux_oom_score_adj = 0; +#endif + /* * Wrapper for fork(). Return values are the same as those for fork(): * -1 if the fork failed, 0 in the child process, and the PID of the @@ -78,7 +83,7 @@ fork_process(void) * LINUX_OOM_SCORE_ADJ #defined to 0, or to some other value that you * want child processes to adopt here. */ -#ifdef LINUX_OOM_SCORE_ADJ +#ifdef __linux__ { /* * Use open() not stdio, to ensure we control the open flags. Some @@ -92,13 +97,12 @@ fork_process(void) char buf[16]; int rc; - snprintf(buf, sizeof(buf), "%d\n", LINUX_OOM_SCORE_ADJ); + snprintf(buf, sizeof(buf), "%d\n", linux_oom_score_adj); rc = write(fd, buf, strlen(buf)); (void) rc; close(fd); } } -#endif /* LINUX_OOM_SCORE_ADJ */ /* * Older Linux kernels have oom_adj not oom_score_adj. This works @@ -106,7 +110,6 @@ fork_process(void) * it's necessary to build Postgres to work with either API, you can * define both LINUX_OOM_SCORE_ADJ and LINUX_OOM_ADJ. */ -#ifdef LINUX_OOM_ADJ { /* * Use open() not stdio, to ensure we control the open flags. Some @@ -120,13 +123,13 @@ fork_process(void) char buf[16]; int rc; - snprintf(buf, sizeof(buf), "%d\n", LINUX_OOM_ADJ); + snprintf(buf, sizeof(buf), "%d\n", linux_oom_score_adj); rc = write(fd, buf, strlen(buf)); (void) rc; close(fd); } } -#endif /* LINUX_OOM_ADJ */ +#endif /* __linux__ */ /* * Make sure processes do not share OpenSSL randomness state. diff --git a/src/backend/utils/misc/guc.c b/src/backend/utils/misc/guc.c index 1d094f0..8713abb 100644 --- a/src/backend/utils/misc/guc.c +++ b/src/backend/utils/misc/guc.c @@ -128,6 +128,7 @@ extern bool synchronize_seqscans; extern char *SSLCipherSuites; extern char *SSLECDHCurve; extern bool SSLPreferServerCiphers; +extern int linux_oom_score_adj; #ifdef TRACE_SORT extern bool trace_sort; @@ -2554,6 +2555,18 @@ static struct config_int ConfigureNamesInt[] = NULL, NULL, NULL }, +#ifdef __linux__ + { + {"linux_oom_score_adj", PGC_POSTMASTER, RESOURCES_KERNEL, + gettext_noop("Sets the oom_score_adj parameter of postmaster's child processes."), + NULL, + }, + &linux_oom_score_adj, + 0, -1000, 1000, + NULL, NULL, NULL + }, +#endif /* __linux__ */ + /* End-of-list marker */ { {NULL, 0, 0, NULL, NULL}, NULL, 0, 0, 0, NULL, NULL, NULL