mirrors/bun.sh
1
0
Fork 0
mirror of https://github.com/oven-sh/bun synced 2026-02-09 10:28:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

Move NapiRef methods into NapiRef.cpp

Browse Source
This commit is contained in:
Kai Tamkun
2025-08-12 19:16:56 -07:00
parent 50692c4a9d
commit a5e54e48fa
2 changed files with 69 additions and 56 deletions
Download Patch File Download Diff File Expand all files Collapse all files

64
src/bun.js/bindings/NapiRef.cpp
View File

@@ -41,6 +41,70 @@ void NapiRef::clear()
globalObject.clear();
weakValueRef.clear();
strongRef.clear();
if (boundCleanup) {
env->removeFinalizer(*boundCleanup);
}
}
NapiRef::NapiRef(napi_env env, uint32_t count, Bun::NapiFinalizer finalizer, bool deleteSelf)
: env(env)
, globalObject(JSC::Weak<JSC::JSGlobalObject>(env->globalObject()))
, finalizer(WTFMove(finalizer))
, refCount(count)
, m_deleteSelf(deleteSelf)
{
}
void NapiRef::setValueInitial(JSC::JSValue value, bool can_be_weak)
{
if (refCount > 0) {
strongRef.set(globalObject->vm(), value);
}
// In NAPI non-experimental, types other than object, function and symbol can't be used as values for references.
// In NAPI experimental, they can be, but we must not store weak references to them.
if (can_be_weak) {
weakValueRef.set(value, Napi::NapiRefWeakHandleOwner::weakValueHandleOwner(), this);
}
if (value.isSymbol()) {
auto* symbol = jsDynamicCast<JSC::Symbol*>(value);
ASSERT(symbol != nullptr);
if (symbol->uid().isRegistered()) {
// Global symbols must always be retrievable,
// even if garbage collection happens while the ref count is 0.
m_isEternal = true;
if (refCount == 0) {
strongRef.set(globalObject->vm(), symbol);
}
}
}
}
void NapiRef::callFinalizer()
{
// Calling the finalizer may delete `this`, so we have to do state changes on `this` before
// calling the finalizer
Bun::NapiFinalizer saved_finalizer = this->finalizer;
this->finalizer.clear();
saved_finalizer.call(env, nativeObject, !env->mustDeferFinalizers() || !env->inGC());
(void)m_deleteSelf;
}
NapiRef::~NapiRef()
{
NAPI_LOG("destruct napi ref %p", this);
if (boundCleanup) {
boundCleanup->deactivate(env);
boundCleanup = nullptr;
}
if (!m_isEternal) {
strongRef.clear();
}
weakValueRef.clear();
}
}

61
src/bun.js/bindings/napi.h
View File

@@ -509,13 +509,7 @@ public:
void unref();
void clear();
NapiRef(napi_env env, uint32_t count, Bun::NapiFinalizer finalizer)
: env(env)
, globalObject(JSC::Weak<JSC::JSGlobalObject>(env->globalObject()))
, finalizer(WTFMove(finalizer))
, refCount(count)
{
}
NapiRef(napi_env env, uint32_t count, Bun::NapiFinalizer finalizer, bool deleteSelf = false);
JSC::JSValue value() const
{
@@ -526,57 +520,11 @@ public:
return strongRef.get();
}
void setValueInitial(JSC::JSValue value, bool can_be_weak)
{
if (refCount > 0) {
strongRef.set(globalObject->vm(), value);
}
void setValueInitial(JSC::JSValue value, bool can_be_weak);
// In NAPI non-experimental, types other than object, function and symbol can't be used as values for references.
// In NAPI experimental, they can be, but we must not store weak references to them.
if (can_be_weak) {
weakValueRef.set(value, Napi::NapiRefWeakHandleOwner::weakValueHandleOwner(), this);
}
void callFinalizer();
if (value.isSymbol()) {
auto* symbol = jsDynamicCast<JSC::Symbol*>(value);
ASSERT(symbol != nullptr);
if (symbol->uid().isRegistered()) {
// Global symbols must always be retrievable,
// even if garbage collection happens while the ref count is 0.
m_isEternal = true;
if (refCount == 0) {
strongRef.set(globalObject->vm(), symbol);
}
}
}
}
void callFinalizer()
{
// Calling the finalizer may delete `this`, so we have to do state changes on `this` before
// calling the finalizer
Bun::NapiFinalizer saved_finalizer = this->finalizer;
this->finalizer.clear();
saved_finalizer.call(env, nativeObject, !env->mustDeferFinalizers() || !env->inGC());
}
~NapiRef()
{
NAPI_LOG("destruct napi ref %p", this);
if (boundCleanup) {
boundCleanup->deactivate(env);
boundCleanup = nullptr;
}
if (!m_isEternal) {
strongRef.clear();
}
// The weak ref can lead to calling the destructor
// so we must first clear the weak ref before we call the finalizer
weakValueRef.clear();
}
~NapiRef();
napi_env env = nullptr;
JSC::Weak<JSC::JSGlobalObject> globalObject;
@@ -590,6 +538,7 @@ public:
private:
bool m_isEternal = false;
bool m_deleteSelf = false;
};
static inline napi_ref toNapi(NapiRef* val)