From 4cd52ab74fa7dc7c4841cc7b0d6a1f2b82e7eca6 Mon Sep 17 00:00:00 2001 From: Stas Boukarev Date: Thu, 11 Jan 2018 19:30:03 +0300 Subject: [PATCH] Remove --default-merge-core-pages. It's already a default, the only job it could do is to override preceding options, which is not a very convincing reason to keep it. --- doc/manual/start-stop.texinfo | 10 +--------- doc/sbcl.1 | 8 ++------ src/runtime/runtime.c | 3 --- 3 files changed, 3 insertions(+), 18 deletions(-) diff --git a/doc/manual/start-stop.texinfo b/doc/manual/start-stop.texinfo index 3223862ea..5f4ff5b34 100644 --- a/doc/manual/start-stop.texinfo +++ b/doc/manual/start-stop.texinfo @@ -251,19 +251,11 @@ that identical pages may be shared between processes until they are written to. This can be useful to reduce the memory usage on systems with multiple SBCL processes started from similar but differently-named core files, or from compressed cores. Without platform support, do -nothing. - +nothing. By default only compressed cores trigger hinting. @item --no-merge-core-pages Ensures that no sharing hint is provided to the operating system. - -@item --default-merge-core-pages -Reverts the sharing hint policy to the default: only compressed cores -trigger hinting. Uncompressed cores are mapped directly from the core -file, which is usually enough to ensure sharing. - - @item --help Print some basic information about SBCL, then exit. diff --git a/doc/sbcl.1 b/doc/sbcl.1 index 01e977d73..335747a46 100644 --- a/doc/sbcl.1 +++ b/doc/sbcl.1 @@ -128,16 +128,12 @@ system that identical pages may be shared between processes until they are written to. This can be useful to reduce the memory usage on systems with multiple SBCL processes started from similar but differently\-named core files, or from compressed cores. Without -platform support, do nothing. +platform support, do nothing. By default only compressed cores trigger +hinting. .TP 3 .B \-\-no-merge\-core\-pages Ensures that no sharing hint is provided to the operating system. .TP 3 -.B \-\-default\-merge\-core\-pages -Reverts the sharing hint policy to the default: only compressed cores -trigger hinting. Uncompressed cores are mapped directly from the core -file, which is usually enough to ensure sharing. -.TP 3 .B \-\-help Print some basic information about SBCL, then exit. .TP 3 diff --git a/src/runtime/runtime.c b/src/runtime/runtime.c index 274515869..b4c1443c1 100644 --- a/src/runtime/runtime.c +++ b/src/runtime/runtime.c @@ -582,9 +582,6 @@ main(int argc, char *argv[], char *envp[]) } else if (0 == strcmp(arg, "--no-merge-core-pages")) { ++argi; merge_core_pages = 0; - } else if (0 == strcmp(arg, "--default-merge-core-pages")) { - ++argi; - merge_core_pages = -1; } else { /* This option was unrecognized as a runtime option, * so it must be a toplevel option or a user option, -- 2.11.4.GIT