8000 n-api: remove n-api module loading flag · nodejs/node@cd3a8e8 · GitHub
[go: up one dir, main page]
Skip to content

Commit cd3a8e8

Browse files
Gabriel Schulhofjasnell
Gabriel Schulhof
authored and
jasnell
committed
n-api: remove n-api module loading flag
Remove the command line flag that was needed for N-API module loading. Re: nodejs/vm#9 PR-URL: #14902 Reviewed-By: Refael Ackermann <refack@gmail.com> Reviewed-By: Colin Ihrig <cjihrig@gmail.com> Reviewed-By: Anna Henningsen <anna@addaleax.net> Reviewed-By: Matteo Collina <matteo.collina@gmail.com> Reviewed-By: Michael Dawson <michael_dawson@ca.ibm.com> Reviewed-By: James M Snell <jasnell@gmail.com> Reviewed-By: Hitesh Kanwathirtha <digitalinfinity@gmail.com>
1 parent 526e78f commit cd3a8e8

File tree

15 files changed

+86
-70
lines changed

15 files changed

+86
-70
lines changed

‎doc/api/cli.md‎

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -178,14 +178,6 @@ added: v8.4.0
178178

179179
Enable the experimental `'http2'` module.
180180

181-
### `--napi-modules`
182-
<!-- YAML
183-
added: v8.0.0
184-
-->
185-
186-
Enable loading native modules compiled with the ABI-stable Node.js API (N-API)
187-
(experimental).
188-
189181
### `--abort-on-uncaught-exception`
190182
<!-- YAML
191183
added: v0.10
@@ -453,7 +445,6 @@ Node options that are allowed are:
453445
- `--inspect-brk`
454446
- `--inspect-port`
455447
- `--inspect`
456-
- `--napi-modules`
457448
- `--no-deprecation`
458449
- `--no-warnings`
459450
- `--openssl-config`

‎doc/api/n-api.md‎

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -63,14 +63,6 @@ For example:
6363
#include <node_api.h>
6464
```
6565

66-
As the feature is experimental it must be enabled with the
67-
following command line
68-
[option](https://nodejs.org/dist/latest-v8.x/docs/api/cli.html#cli_napi_modules):
69-
70-
```bash
71-
--napi-modules
72-
```
73-
7466
## Basic N-API Data Types
7567

7668
N-API exposes the following fundamental datatypes as abstractions that are

‎src/env-inl.h‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -288,6 +288,7 @@ inline Environment::Environment(IsolateData* isolate_data,
288288
printed_error_(false),
289289
trace_sync_io_(false),
290290
abort_on_uncaught_exception_(false),
291+
emit_napi_warning_(true),
291292
makecallback_cntr_(0),
292293
#if HAVE_INSPECTOR
293294
inspector_agent_(this),

‎src/env.cc‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -213,6 +213,12 @@ bool Environment::RemovePromiseHook(promise_hook_func fn, void* arg) {
213213
return true;
214214
}
215215

216+
bool Environment::EmitNapiWarning() {
217+
bool current_value = emit_napi_warning_;
218+
emit_napi_warning_ = false;
219+
return current_value;
220+
}
221+
216222
void Environment::EnvPromiseHook(v8::PromiseHookType type,
217223
v8::Local<v8::Promise> promise,
218224
v8::Local<v8::Value> parent) {

‎src/env.h‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -669,6 +669,7 @@ class Environment {
669669

670670
void AddPromiseHook(promise_hook_func fn, void* arg);
671671
bool RemovePromiseHook(promise_hook_func fn, void* arg);
672+
bool EmitNapiWarning();
672673

673674
private:
674675
inline void ThrowError(v8::Local<v8::Value> (*fun)(v8::Local<v8::String>),
@@ -690,6 +691,7 @@ class Environment {
690691
bool printed_error_;
691692
bool trace_sync_io_;
692693
bool abort_on_uncaught_exception_;
694+
bool emit_napi_warning_;
693695
size_t makecallback_cntr_;
694696
std::vector<double> destroy_ids_list_;
695697

‎src/node.cc‎

Lines changed: 18 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -193,9 +193,6 @@ unsigned int reverted = 0;
193193
std::string icu_data_dir; // NOLINT(runtime/string)
194194
#endif
195195

196-
// N-API is in experimental state, disabled by default.
197-
bool load_napi_modules = false;
198-
199196
// used by C++ modules as well
200197
bool no_deprecation = false;
201198

@@ -2650,27 +2647,22 @@ static void DLOpen(const FunctionCallbackInfo<Value>& args) {
26502647
env->ThrowError("Module did not self-register.");
26512648
return;
26522649
}
2653-
if (mp->nm_version != NODE_MODULE_VERSION) {
2654-
char errmsg[1024];
2655-
if (mp->nm_version == -1) {
2656-
snprintf(errmsg,
2657-
sizeof(errmsg),
2658-
"The module '%s'"
2659-
"\nwas compiled against the ABI-stable Node.js API (N-API)."
2660-
"\nThis feature is experimental and must be enabled on the "
2661-
"\ncommand-line by adding --napi-modules.",
2662-
*filename);
2663-
} else {
2664-
snprintf(errmsg,
2665-
sizeof(errmsg),
2666-
"The module '%s'"
2667-
"\nwas compiled against a different Node.js version using"
2668-
"\nNODE_MODULE_VERSION %d. This version of Node.js requires"
2669-
"\nNODE_MODULE_VERSION %d. Please try re-compiling or "
2670-
"re-installing\nthe module (for instance, using `npm rebuild` "
2671-
"or `npm install`).",
2672-
*filename, mp->nm_version, NODE_MODULE_VERSION);
2650+
if (mp->nm_version == -1) {
2651+
if (env->EmitNapiWarning()) {
2652+
ProcessEmitWarning(env, "N-API is an experimental feature and could "
2653+
"change at any time.");
26732654
}
2655+
} else if (mp->nm_version != NODE_MODULE_VERSION) {
2656+
char errmsg[1024];
2657+
snprintf(errmsg,
2658+
sizeof(errmsg),
2659+
"The module '%s'"
2660+
"\nwas compiled against a different Node.js version using"
2661+
"\nNODE_MODULE_VERSION %d. This version of Node.js requires"
2662+
"\nNODE_MODULE_VERSION %d. Please try re-compiling or "
2663+
"re-installing\nthe module (for instance, using `npm rebuild` "
2664+
"or `npm install`).",
2665+
*filename, mp->nm_version, NODE_MODULE_VERSION);
26742666

26752667
// NOTE: `mp` is allocated inside of the shared library's memory, calling
26762668
// `uv_dlclose` will deallocate it
@@ -3769,7 +3761,8 @@ static void PrintHelp() {
37693761
" --throw-deprecation throw an exception on deprecations\n"
37703762
" --pending-deprecation emit pending deprecation warnings\n"
37713763
" --no-warnings silence all process warnings\n"
3772-
" --napi-modules load N-API modules\n"
3764+
" --napi-modules load N-API modules (no-op - option\n"
3765+
" kept for compatibility)\n"
37733766
" --abort-on-uncaught-exception\n"
37743767
" aborting instead of exiting causes a\n"
37753768
" core file to be generated for analysis\n"
@@ -4027,7 +4020,7 @@ static void ParseArgs(int* argc,
40274020
} else if (strcmp(arg, "--no-deprecation") == 0) {
40284021
no_deprecation = true;
40294022
} else if (strcmp(arg, "--napi-modules") == 0) {
4030-
load_napi_modules = true;
4023+
// no-op
40314024
} else if (strcmp(arg, "--no-warnings") == 0) {
40324025
no_process_warnings = true;
40334026
} else if (strcmp(arg, "--trace-warnings") == 0) {
@@ -4665,11 +4658,6 @@ inline int Start(Isolate* isolate, IsolateData* isolate_data,
46654658

46664659
env.set_trace_sync_io(trace_sync_io);
46674660

4668-
if (load_napi_modules) {
4669-
ProcessEmitWarning(&env, "N-API is an experimental feature "
4670-
"and could change at any time.");
4671-
}
4672-
46734661
{
46744662
SealHandleScope seal(isolate);
46754663
bool more;

‎src/node_api.cc‎

Lines changed: 1 addition & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -841,28 +841,10 @@ void napi_module_register_cb(v8::Local<v8::Object> exports,
841841

842842
} // end of anonymous namespace
843843

844-
#ifndef EXTERNAL_NAPI
845-
namespace node {
846-
// Indicates whether NAPI was enabled/disabled via the node command-line.
847-
extern bool load_napi_modules;
848-
}
849-
#endif // EXTERNAL_NAPI
850-
851844
// Registers a NAPI module.
852845
void napi_module_register(napi_module* mod) {
853-
// NAPI modules always work with the current node version.
854-
int module_version = NODE_MODULE_VERSION;
855-
856-
#ifndef EXTERNAL_NAPI
857-
if (!node::load_napi_modules) {
858-
// NAPI is disabled, so set the module version to -1 to cause the module
859-
// to be unloaded.
860-
module_version = -1;
861-
}
862-
#endif // EXTERNAL_NAPI
863-
864846
node::node_module* nm = new node::node_module {
865-
module_version,
847+
-1,
866848
mod->nm_flags,
867849
nullptr,
868850
mod->nm_filename,

‎test/addons-napi/test_async/test.js‎

Expand all lines: test/addons-napi/test_async/test.js
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ if (process.argv[2] === 'child') {
1515
return;
1616
}
1717
const p = child_process.spawnSync(
18-
process.execPath, [ '--napi-modules', __filename, 'child' ]);
18+
process.execPath, [ __filename, 'child' ]);
1919
assert.ifError(p.error);
2020
assert.ok(p.stderr.toString().includes(testException));
2121

‎test/addons-napi/test_fatal/test.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ if (process.argv[2] === 'child') {
1212
}
1313

1414
const p = child_process.spawnSync(
15-
process.execPath, [ '--napi-modules', __filename, 'child' ]);
15+
process.execPath, [ __filename, 'child' ]);
1616
assert.ifError(p.error);
1717
assert.ok(p.stderr.toString().includes(
1818
'FATAL ERROR: test_fatal::Test fatal message'));

‎test/addons-napi/test_function/test_function.c‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,9 @@ napi_value TestCallFunction(napi_env env, napi_callback_info info) {
2626
return result;
2727
}
2828

29-
void TestFunctionName(napi_env env, napi_callback_info info) {}
29+
napi_value TestFunctionName(napi_env env, napi_callback_info info) {
30+
return NULL;
31+
}
3032

3133
napi_value Init(napi_env env, napi_value exports) {
3234
napi_value fn1;

0 commit comments

Comments
 (0)
0