Skip to content

fix(ffi/objc): key thread_local bridge caches by a per-bridge id #81

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

Merged
ammarahm-ed merged 1 commit into from
Oct 25, 2026
Merged

fix(ffi/objc): key thread_local bridge caches by a per-bridge id #81

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
35 changes: 21 additions & 14 deletions NativeScript/ffi/objc/shared/bridge/ObjCBridge.mm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -708,7 +708,7 @@ Value findRoundTripValue(Runtime& runtime, const void* native,
? validationKey
: (nativeIsObject ? nativeObjectClassKey(native) : 0);
struct RoundTripCacheEntry {
const NativeApiBridge* bridge = nullptr;
uint64_t bridgeId = 0;
uintptr_t key = 0;
uint64_t generation = 0;
std::weak_ptr<Value> value;
Expand All @@ -722,7 +722,7 @@ Value findRoundTripValue(Runtime& runtime, const void* native,
const size_t firstSlot = (key >> 4) & 3;
for (size_t i = 0; i < 4; i++) {
RoundTripCacheEntry& entry = cache[(firstSlot + i) & 3];
if (entry.bridge == this && entry.key == key &&
if (entry.bridgeId == instanceId_ && entry.key == key &&
entry.generation == generation) {
if (entry.validationKey != expectedValidationKey) {
break;
Expand Down Expand Up @@ -777,13 +777,13 @@ Value findRoundTripValue(Runtime& runtime, const void* native,
}
if (entry == nullptr) {
cache[firstSlot] = RoundTripCacheEntry{
this, key, generation, {}, true, false, expectedValidationKey};
instanceId_, key, generation, {}, true, false, expectedValidationKey};
return Value::undefined();
}
storedValue = entry->value;
cachedStringLike = entry->stringLikeNative;
cache[firstSlot] = RoundTripCacheEntry{
this, key, generation, storedValue, false, cachedStringLike,
instanceId_, key, generation, storedValue, false, cachedStringLike,
entry->validationKey};
}
if (stringLikeNative != nullptr) {
Expand Down Expand Up @@ -973,7 +973,7 @@ Value findObjectExpando(Runtime& runtime, const void* native,
return Value::undefined();
}
struct ObjectExpandoCacheEntry {
const NativeApiBridge* bridge = nullptr;
uint64_t bridgeId = 0;
uintptr_t key = 0;
uint64_t generation = 0;
std::string property;
Expand All @@ -988,7 +988,7 @@ Value findObjectExpando(Runtime& runtime, const void* native,
const uint64_t generation =
objectExpandosGeneration_.load(std::memory_order_acquire);
for (auto& entry : cache) {
if (entry.bridge == this && entry.key == key &&
if (entry.bridgeId == instanceId_ && entry.key == key &&
entry.generation == generation && entry.property == property) {
if (entry.miss) {
return Value::undefined();
Expand All @@ -1004,17 +1004,17 @@ Value findObjectExpando(Runtime& runtime, const void* native,
const size_t slot = nextSlot++ & 7;
if (objectIt == objectExpandos_.end()) {
cache[slot] =
ObjectExpandoCacheEntry{this, key, generation, property, {}, true};
ObjectExpandoCacheEntry{instanceId_, key, generation, property, {}, true};
return Value::undefined();
}
auto propertyIt = objectIt->second.find(property);
if (propertyIt == objectIt->second.end() || propertyIt->second == nullptr) {
cache[slot] =
ObjectExpandoCacheEntry{this, key, generation, property, {}, true};
ObjectExpandoCacheEntry{instanceId_, key, generation, property, {}, true};
return Value::undefined();
}
cache[slot] = ObjectExpandoCacheEntry{
this, key, generation, property, propertyIt->second, false};
instanceId_, key, generation, property, propertyIt->second, false};
return Value(runtime, *propertyIt->second);
}

Expand Down Expand Up @@ -1045,7 +1045,7 @@ void forgetObjectExpandos(const void* native) {
return nullptr;
}
struct PropertyGetterCacheEntry {
const NativeApiBridge* bridge = nullptr;
uint64_t bridgeId = 0;
Class cls = Nil;
uint64_t generation = 0;
std::string property;
Expand All @@ -1058,7 +1058,7 @@ void forgetObjectExpandos(const void* native) {
const uint64_t generation =
propertyGetterCacheGeneration_.load(std::memory_order_acquire);
for (auto& entry : cache) {
if (entry.bridge == this && entry.cls == cls &&
if (entry.bridgeId == instanceId_ && entry.cls == cls &&
entry.generation == generation && entry.property == property) {
return entry.miss ? nullptr : entry.getter;
}
Expand All @@ -1068,17 +1068,17 @@ void forgetObjectExpandos(const void* native) {
const size_t slot = nextSlot++ & 7;
if (classIt == propertyGetterCache_.end()) {
cache[slot] = PropertyGetterCacheEntry{
this, cls, generation, property, nullptr, true};
instanceId_, cls, generation, property, nullptr, true};
return nullptr;
}
auto propIt = classIt->second.find(property);
if (propIt == classIt->second.end()) {
cache[slot] = PropertyGetterCacheEntry{
this, cls, generation, property, nullptr, true};
instanceId_, cls, generation, property, nullptr, true};
return nullptr;
}
cache[slot] =
PropertyGetterCacheEntry{this, cls, generation, property,
PropertyGetterCacheEntry{instanceId_, cls, generation, property,
&propIt->second, false};
return &propIt->second;
}
Expand Down Expand Up @@ -2133,6 +2133,13 @@ static void appendSurfaceMember(
objectExpandos_;
std::unordered_map<uintptr_t, size_t> objectExpandoOwnerCounts_;
std::atomic<uint64_t> objectExpandosGeneration_{1};
// Identifies this bridge in the thread_local lookup caches. Its address
// cannot: a bridge allocated where a destroyed one lived would match that
// one's entries, and the property-getter cache holds raw pointers into it.
const uint64_t instanceId_ = [] {
static std::atomic<uint64_t> next{1};
return next.fetch_add(1, std::memory_order_relaxed);
}();
std::unordered_map<Class, std::unordered_map<std::string, CachedPropertyGetter>>
propertyGetterCache_;
std::atomic<uint64_t> propertyGetterCacheGeneration_{1};
Expand Down
Loading