Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 0 additions & 23 deletions LICENSE
Original file line number Diff line number Diff line change
Expand Up @@ -2600,29 +2600,6 @@ The externally maintained libraries used by Node.js are:
WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
"""

- large_pages, located at src/large_pages, is licensed as follows:
"""
Copyright (C) 2018 Intel Corporation

Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"),
to deal in the Software without restriction, including without limitation
the rights to use, copy, modify, merge, publish, distribute, sublicense,
and/or sell copies of the Software, and to permit persons to whom
the Software is furnished to do so, subject to the following conditions:

The above copyright notice and this permission notice shall be included
in all copies or substantial portions of the Software.

THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES
OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE
OR OTHER DEALINGS IN THE SOFTWARE.
"""

- caja, located at lib/internal/freeze_intrinsics.js, is licensed as follows:
"""
Adapted from SES/Caja - Copyright (C) 2011 Google Inc.
Expand Down
10 changes: 4 additions & 6 deletions configure.py
Original file line number Diff line number Diff line change
Expand Up @@ -884,13 +884,13 @@
action='store_true',
dest='node_use_large_pages',
default=None,
help='This option has no effect. --use-largepages is now a runtime option.')
help='This option is no longer supported and a no-op.')

parser.add_argument('--use-largepages-script-lld',
action='store_true',
dest='node_use_large_pages_script_lld',
default=None,
help='This option has no effect. --use-largepages is now a runtime option.')
help='This option is no longer supported and a no-op.')

parser.add_argument('--use-section-ordering-file',
action='store',
Expand Down Expand Up @@ -2047,10 +2047,8 @@ def configure_node(o):

if options.node_use_large_pages or options.node_use_large_pages_script_lld:
warn('''The `--use-largepages` and `--use-largepages-script-lld` options
have no effect during build time. Support for mapping to large pages is
now a runtime option of Node.js. Run `node --use-largepages` or add
`--use-largepages` to the `NODE_OPTIONS` environment variable once
Node.js is built to enable mapping to large pages.''')
have no effect. Mapping the Node.js static code to large pages is
no longer supported.''')

if options.no_ifaddrs:
o['defines'] += ['SUNOS_NO_IFADDRS']
Expand Down
18 changes: 10 additions & 8 deletions doc/api/cli.md
Original file line number Diff line number Diff line change
Expand Up @@ -3486,19 +3486,21 @@ When both are set, `--use-env-proxy` takes precedence.
added:
- v13.6.0
- v12.17.0
changes:
- version: REPLACEME
pr-url: https://github.com/nodejs/node/pull/65389
description: This option is now a no-op.
-->

Re-map the Node.js static code to large memory pages at startup. If supported on
the target system, this will cause the Node.js static code to be moved onto 2
MiB pages instead of 4 KiB pages.
This option is no longer supported and a no-op. It used to re-map the Node.js
static code to large memory pages at startup.

The following values are valid for `mode`:
It still accepts the following values for compatibility:

* `off`: No mapping will be attempted. This is the default.
* `on`: If supported by the OS, mapping will be attempted. Failure to map will
be ignored and a message will be printed to standard error.
* `silent`: If supported by the OS, mapping will be attempted. Failure to map
will be ignored and will not be reported.
* `on`: No mapping will be attempted and a message will be printed to
standard error stating it's no longer supported.
* `silent`: Same as `off`.

### `--use-system-ca`

Expand Down
2 changes: 1 addition & 1 deletion doc/node-config-schema.json
Original file line number Diff line number Diff line change
Expand Up @@ -754,7 +754,7 @@
},
"use-largepages": {
"type": "string",
"description": "Map the Node.js static code to large pages. Options are 'off' (the default value, meaning do not map), 'on' (map and ignore failure, reporting it to stderr), or 'silent' (map and silently ignore failure)"
"description": "This option is no longer supported and a no-op. Options are 'off' (default), 'on' (report a warning to stderr), or 'silent' (same as 'off')."
},
"use-openssl-ca": {
"type": "boolean",
Expand Down
17 changes: 3 additions & 14 deletions doc/node.1
Original file line number Diff line number Diff line change
Expand Up @@ -1691,20 +1691,9 @@ This is equivalent to setting the \fBNODE_USE_ENV_PROXY=1\fR environment variabl
When both are set, \fB--use-env-proxy\fR takes precedence.
.
.It Fl -use-largepages Ns = Ns Ar mode
Re-map the Node.js static code to large memory pages at startup. If supported on
the target system, this will cause the Node.js static code to be moved onto 2
MiB pages instead of 4 KiB pages.
The following values are valid for \fBmode\fR:
.Bl -bullet
.It
\fBoff\fR: No mapping will be attempted. This is the default.
.It
\fBon\fR: If supported by the OS, mapping will be attempted. Failure to map will
be ignored and a message will be printed to standard error.
.It
\fBsilent\fR: If supported by the OS, mapping will be attempted. Failure to map
will be ignored and will not be reported.
.El
This option is no longer supported and a no-op. It still accepts
\fBoff\fR (the default), \fBon\fR and \fBsilent\fR as values for compatibility.
Passing \fBon\fR as the value prints a warning to standard error.
.
.It Fl -use-system-ca
Node.js uses the trusted CA certificates present in the system store along with
Expand Down
33 changes: 0 additions & 33 deletions node.gyp
Original file line number Diff line number Diff line change
Expand Up @@ -235,8 +235,6 @@
'src/histogram-inl.h',
'src/js_stream.h',
'src/json_utils.h',
'src/large_pages/node_large_page.cc',
'src/large_pages/node_large_page.h',
'src/memory_tracker.h',
'src/memory_tracker-inl.h',
'src/module_wrap.h',
Expand Down Expand Up @@ -503,11 +501,6 @@
'node_mksnapshot_exec': '<(PRODUCT_DIR)/<(EXECUTABLE_PREFIX)node_mksnapshot<(EXECUTABLE_SUFFIX)',
'node_js2c_exec': '<(PRODUCT_DIR)/<(EXECUTABLE_PREFIX)node_js2c<(EXECUTABLE_SUFFIX)',
'conditions': [
['GENERATOR == "ninja"', {
'node_text_start_object_path': 'src/large_pages/node_text_start.node_text_start.o'
}, {
'node_text_start_object_path': 'node_text_start/src/large_pages/node_text_start.o'
}],
[ 'node_shared=="true"', {
'node_target_type%': 'shared_library',
'node_lib_type': 'shared_library',
Expand Down Expand Up @@ -585,19 +578,6 @@
},

'targets': [
{
'target_name': 'node_text_start',
'type': 'none',
'conditions': [
[ 'OS in "linux freebsd solaris openharmony" and '
'target_arch=="x64"', {
'type': 'static_library',
'sources': [
'src/large_pages/node_text_start.S'
]
}],
]
},
{
'target_name': '<(node_core_target_name)',
'type': 'executable',
Expand Down Expand Up @@ -769,14 +749,6 @@
},
},
}],
[ 'OS in "linux freebsd openharmony" and '
'target_arch=="x64"', {
'dependencies': [ 'node_text_start' ],
'ldflags+': [
'<(obj_dir)/<(node_text_start_object_path)'
]
}],

['node_fipsinstall=="true"', {
'variables': {
'openssl-cli': '<(PRODUCT_DIR)/<(EXECUTABLE_PREFIX)openssl-cli<(EXECUTABLE_SUFFIX)',
Expand Down Expand Up @@ -1013,11 +985,6 @@
'HAVE_DTLS=1',
],
}],
[ 'OS in "linux freebsd mac solaris openharmony" and '
'target_arch=="x64" and '
'node_target_type=="executable"', {
'defines': [ 'NODE_ENABLE_LARGE_CODE_PAGES=1' ],
}],
[ 'use_openssl_def==1', {
# TODO(bnoordhuis) Make all platforms export the same list of symbols.
# Teach mkssldef.py to generate linker maps that UNIX linkers understand.
Expand Down
1 change: 0 additions & 1 deletion src/debug_utils.h
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,6 @@ void NODE_EXTERN_PRIVATE FWrite(FILE* file, const std::string& str);
V(COMPILE_CACHE) \
V(CONTEXTIFY) \
V(DIAGNOSTICS) \
V(HUGEPAGES) \
V(INSPECTOR_SERVER) \
V(INSPECTOR_CLIENT) \
V(INSPECTOR_PROFILER) \
Expand Down
Loading
Loading