Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Split up napi envs #15437

Open
wants to merge 16 commits into
base: main
Choose a base branch
from
Open

Split up napi envs #15437

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
9e9d137
Initial work on splitting up napi envs
heimskr Nov 26, 2024
bfc423e
More work on splitting napi envs
heimskr Nov 27, 2024
85499c8
Splitting napi envs mostly works now, save for one napi test
heimskr Nov 27, 2024
b98fe40
Make constructors work
heimskr Nov 27, 2024
57a3f83
Move instance data to napi envs
heimskr Nov 27, 2024
f99d1bc
Don't undef dlsym on Windows too early
heimskr Nov 27, 2024
890fb04
Implement feedback
heimskr Dec 7, 2024
f92e2d5
Add napi instance data test
heimskr Dec 9, 2024
4b97c78
Undo changes to isolate usage
heimskr Dec 9, 2024
12de2d5
Don't use a random number
heimskr Dec 9, 2024
797cba8
Merge branch 'main' into kai/multiple-napi-envs
190n Dec 9, 2024
f49690a
Bikeshed NapiExternal::create parameter order
190n Dec 10, 2024
a4e3311
Merge branch 'main' into kai/multiple-napi-envs
190n Dec 19, 2024
518a687
Merge branch 'main' into kai/multiple-napi-envs
190n Dec 19, 2024
53fe8bc
Merge branch 'main' into kai/multiple-napi-envs
190n Jan 7, 2025
f73edb4
Merge branch 'main' into kai/multiple-napi-envs
190n Jan 9, 2025
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
6 changes: 3 additions & 3 deletions src/bun.js/bindings/BunProcess.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -394,14 +394,14 @@ JSC_DEFINE_HOST_FUNCTION(Process_functionDlopen,
return JSValue::encode(jsUndefined());
}

JSC::EncodedJSValue (*napi_register_module_v1)(napi_env env, JSC::EncodedJSValue exports);
napi_value (*napi_register_module_v1)(napi_env env, napi_value exports);
#if OS(WINDOWS)
#define dlsym GetProcAddress
#endif

// TODO(@190n) look for node_register_module_vXYZ according to BuildOptions.reported_nodejs_version
// (bun/src/env.zig:36) and the table at https://github.com/nodejs/node/blob/main/doc/abi_version_registry.json
napi_register_module_v1 = reinterpret_cast<JSC::EncodedJSValue (*)(napi_env, JSC::EncodedJSValue)>(
napi_register_module_v1 = reinterpret_cast<napi_value (*)(napi_env, napi_value)>(
dlsym(handle, "napi_register_module_v1"));

if (!napi_register_module_v1) {
Expand Down Expand Up @@ -442,7 +442,7 @@ JSC_DEFINE_HOST_FUNCTION(Process_functionDlopen,
auto env = globalObject->makeNapiEnv(nmodule);

EncodedJSValue exportsValue = JSC::JSValue::encode(exports);
JSC::JSValue resultValue = JSValue::decode(napi_register_module_v1(env, exportsValue));
JSC::JSValue resultValue = JSValue::decode(reinterpret_cast<EncodedJSValue>(napi_register_module_v1(env, reinterpret_cast<napi_value>(exportsValue))));

RETURN_IF_EXCEPTION(scope, {});

Expand Down
2 changes: 1 addition & 1 deletion src/bun.js/bindings/ZigGlobalObject.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -569,7 +569,7 @@ class GlobalObject : public Bun::GlobalScope {

bool hasOverridenModuleResolveFilenameFunction = false;

WTF::Vector<std::unique_ptr<napi_env__>> m_napiEnvs;
WTF::Vector<std::unique_ptr<napi_env__>, 0> m_napiEnvs;
napi_env makeNapiEnv(const napi_module&);
napi_env makeNapiEnvForFFI();

Expand Down
Loading
Loading