diff options
| author | Peter Eisentraut <peter_e@gmx.net> | 2018-07-10 17:37:42 +0200 |
|---|---|---|
| committer | Peter Eisentraut <peter_e@gmx.net> | 2018-07-10 18:35:24 +0200 |
| commit | bcbd940806a2011d6f99ae72ea5897e8a94c6093 (patch) | |
| tree | a51aac6939900d6ba74b83bda1999304ac178c1b /src/backend/storage/ipc | |
| parent | 17b715c634d451da3edb221c55c614a7d993c289 (diff) | |
| download | postgresql-bcbd940806a2011d6f99ae72ea5897e8a94c6093.tar.gz postgresql-bcbd940806a2011d6f99ae72ea5897e8a94c6093.zip | |
Remove dynamic_shared_memory_type=none
PostgreSQL nowadays offers some kind of dynamic shared memory feature on
all supported platforms. Having the choice of "none" prevents us from
relying on DSM in core features. So this patch removes the choice of
"none".
Author: Kyotaro Horiguchi <horiguchi.kyotaro@lab.ntt.co.jp>
Diffstat (limited to 'src/backend/storage/ipc')
| -rw-r--r-- | src/backend/storage/ipc/dsm.c | 15 | ||||
| -rw-r--r-- | src/backend/storage/ipc/dsm_impl.c | 3 |
2 files changed, 0 insertions, 18 deletions
diff --git a/src/backend/storage/ipc/dsm.c b/src/backend/storage/ipc/dsm.c index f1f75b73f50..9629f22f7af 100644 --- a/src/backend/storage/ipc/dsm.c +++ b/src/backend/storage/ipc/dsm.c @@ -150,10 +150,6 @@ dsm_postmaster_startup(PGShmemHeader *shim) Assert(!IsUnderPostmaster); - /* If dynamic shared memory is disabled, there's nothing to do. */ - if (dynamic_shared_memory_type == DSM_IMPL_NONE) - return; - /* * If we're using the mmap implementations, clean up any leftovers. * Cleanup isn't needed on Windows, and happens earlier in startup for @@ -219,10 +215,6 @@ dsm_cleanup_using_control_segment(dsm_handle old_control_handle) uint32 i; dsm_control_header *old_control; - /* If dynamic shared memory is disabled, there's nothing to do. */ - if (dynamic_shared_memory_type == DSM_IMPL_NONE) - return; - /* * Try to attach the segment. If this fails, it probably just means that * the operating system has been rebooted and the segment no longer @@ -391,13 +383,6 @@ dsm_postmaster_shutdown(int code, Datum arg) static void dsm_backend_startup(void) { - /* If dynamic shared memory is disabled, reject this. */ - if (dynamic_shared_memory_type == DSM_IMPL_NONE) - ereport(ERROR, - (errcode(ERRCODE_OBJECT_NOT_IN_PREREQUISITE_STATE), - errmsg("dynamic shared memory is disabled"), - errhint("Set dynamic_shared_memory_type to a value other than \"none\"."))); - #ifdef EXEC_BACKEND { void *control_address = NULL; diff --git a/src/backend/storage/ipc/dsm_impl.c b/src/backend/storage/ipc/dsm_impl.c index c6382ec031b..77e1bab54be 100644 --- a/src/backend/storage/ipc/dsm_impl.c +++ b/src/backend/storage/ipc/dsm_impl.c @@ -106,7 +106,6 @@ const struct config_enum_entry dynamic_shared_memory_options[] = { #ifdef USE_DSM_MMAP {"mmap", DSM_IMPL_MMAP, false}, #endif - {"none", DSM_IMPL_NONE, false}, {NULL, 0, false} }; @@ -210,8 +209,6 @@ dsm_impl_can_resize(void) { switch (dynamic_shared_memory_type) { - case DSM_IMPL_NONE: - return false; case DSM_IMPL_POSIX: return true; case DSM_IMPL_SYSV: |