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

fix: Fix ref counting with recursive mutex #368

Merged
merged 2 commits into from
Nov 22, 2024
+11 −5
Merged

fix: Fix ref counting with recursive mutex #368

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
aa4c6cb
fix: Fix ref counting with recursive mutex
mrousavy Nov 22, 2024
7016ded
Xcode
mrousavy Nov 22, 2024
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
10 changes: 8 additions & 2 deletions example/ios/NitroExample.xcodeproj/project.pbxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -624,7 +624,10 @@
"-DFOLLY_CFG_NO_COROUTINES=1",
"-DFOLLY_HAVE_CLOCK_GETTIME=1",
);
OTHER_LDFLAGS = "$(inherited) ";
OTHER_LDFLAGS = (
"$(inherited)",
" ",
);
REACT_NATIVE_PATH = "${PODS_ROOT}/../../../node_modules/react-native";
SDKROOT = iphoneos;
SWIFT_ACTIVE_COMPILATION_CONDITIONS = "$(inherited) DEBUG";
Expand Down Expand Up @@ -698,7 +701,10 @@
"-DFOLLY_CFG_NO_COROUTINES=1",
"-DFOLLY_HAVE_CLOCK_GETTIME=1",
);
OTHER_LDFLAGS = "$(inherited) ";
OTHER_LDFLAGS = (
"$(inherited)",
" ",
);
REACT_NATIVE_PATH = "${PODS_ROOT}/../../../node_modules/react-native";
SDKROOT = iphoneos;
SWIFT_OBJC_INTEROP_MODE = objcxx;
Expand Down
2 changes: 1 addition & 1 deletion packages/react-native-nitro-modules/cpp/utils/BorrowingReference.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -111,7 +111,7 @@ class BorrowingReference final {
bool* _isDeleted;
std::atomic_size_t* _strongRefCount;
std::atomic_size_t* _weakRefCount;
std::mutex* _mutex;
std::recursive_mutex* _mutex;
};

} // namespace margelo::nitro
4 changes: 2 additions & 2 deletions packages/react-native-nitro-modules/cpp/utils/OwningReference.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ class OwningReference final {

explicit OwningReference(T* value)
: _value(value), _isDeleted(new bool(false)), _strongRefCount(new std::atomic_size_t(1)), _weakRefCount(new std::atomic_size_t(0)),
_mutex(new std::mutex()) {}
_mutex(new std::recursive_mutex()) {}

OwningReference(const OwningReference& ref)
: _value(ref._value), _isDeleted(ref._isDeleted), _strongRefCount(ref._strongRefCount), _weakRefCount(ref._weakRefCount),
Expand Down Expand Up @@ -229,7 +229,7 @@ class OwningReference final {
bool* _isDeleted;
std::atomic_size_t* _strongRefCount;
std::atomic_size_t* _weakRefCount;
std::mutex* _mutex;
std::recursive_mutex* _mutex;
};

} // namespace margelo::nitro
Expand Down
Loading