Page MenuHomePhabricator
Files F3383741

D4381.id14149.diff
No OneTemporary
Actions

D4381.id14149.diff
View Options

diff --git a/native/ios/Comm.xcodeproj/project.pbxproj b/native/ios/Comm.xcodeproj/project.pbxproj
--- a/native/ios/Comm.xcodeproj/project.pbxproj
+++ b/native/ios/Comm.xcodeproj/project.pbxproj
@@ -63,6 +63,8 @@
CB4821B127CFB1FA001AB7E1 /* GlobalNetworkSingleton.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 726E5D762731A5E10032361D /* GlobalNetworkSingleton.cpp */; };
CB4821B227CFB20E001AB7E1 /* SQLiteQueryExecutor.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 71BE84412636A944002849D2 /* SQLiteQueryExecutor.cpp */; };
CB64AA76284F4DC900460699 /* ThreadOperations.cpp in Sources */ = {isa = PBXBuildFile; fileRef = CB64AA74284F4DC900460699 /* ThreadOperations.cpp */; };
+ CBEA4A8A286EECCC00DFCFF5 /* NonBlockingLock.mm in Sources */ = {isa = PBXBuildFile; fileRef = CBEA4A89286EECCC00DFCFF5 /* NonBlockingLock.mm */; };
+ CBEA4A8B286EED0400DFCFF5 /* NonBlockingLock.mm in Sources */ = {isa = PBXBuildFile; fileRef = CBEA4A89286EECCC00DFCFF5 /* NonBlockingLock.mm */; };
D7DB6E0F85B2DBE15B01EC21 /* libPods-Comm.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 994BEBDD4E4959F69CEA0BC3 /* libPods-Comm.a */; };
F02C296C528B51ADAB5AA19D /* libPods-NotificationService.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 3EE4DCB430B05EC9DE7D7B01 /* libPods-NotificationService.a */; };
/* End PBXBuildFile section */
@@ -209,6 +211,7 @@
CB64AA74284F4DC900460699 /* ThreadOperations.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = ThreadOperations.cpp; path = ../PersistentStorageUtilities/ThreadOperationsUtilities/ThreadOperations.cpp; sourceTree = "<group>"; };
CB64AA75284F4DC900460699 /* ThreadOperations.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ThreadOperations.h; path = ../PersistentStorageUtilities/ThreadOperationsUtilities/ThreadOperations.h; sourceTree = "<group>"; };
CBEA4A88286EEC9100DFCFF5 /* NonBlockingLock.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = NonBlockingLock.h; path = Comm/TemporalMessageStorage/NonBlockingLock.h; sourceTree = "<group>"; };
+ CBEA4A89286EECCC00DFCFF5 /* NonBlockingLock.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = NonBlockingLock.mm; path = Comm/TemporalMessageStorage/NonBlockingLock.mm; sourceTree = "<group>"; };
F53DA7B3F26C2798DCE74A94 /* Pods-Comm.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Comm.debug.xcconfig"; path = "Target Support Files/Pods-Comm/Pods-Comm.debug.xcconfig"; sourceTree = "<group>"; };
/* End PBXFileReference section */
@@ -560,6 +563,7 @@
CBEA4A87286EEC7600DFCFF5 /* TemporalMessageStorage */ = {
isa = PBXGroup;
children = (
+ CBEA4A89286EECCC00DFCFF5 /* NonBlockingLock.mm */,
CBEA4A88286EEC9100DFCFF5 /* NonBlockingLock.h */,
);
name = TemporalMessageStorage;
@@ -940,6 +944,7 @@
711B408425DA97F9005F8F06 /* dummy.swift in Sources */,
726E5D782731A5E10032361D /* GlobalNetworkSingleton.cpp in Sources */,
13B07FC11A68108700A75B9A /* main.m in Sources */,
+ CBEA4A8A286EECCC00DFCFF5 /* NonBlockingLock.mm in Sources */,
71BE844B2636A944002849D2 /* SQLiteQueryExecutor.cpp in Sources */,
2DDA0AE067906E18B83A455C /* ClientGetReadReactor.cpp in Sources */,
);
@@ -957,6 +962,7 @@
isa = PBXSourcesBuildPhase;
buildActionMask = 2147483647;
files = (
+ CBEA4A8B286EED0400DFCFF5 /* NonBlockingLock.mm in Sources */,
CB38F2C0286C6CDF0010535C /* MessageOperationsUtilities.cpp in Sources */,
CB1648AF27CFBE6A00394D9D /* CryptoModule.cpp in Sources */,
CB1648AD27CFBBBB00394D9D /* ClientGetReadReactor.cpp in Sources */,
diff --git a/native/ios/Comm/TemporalMessageStorage/NonBlockingLock.mm b/native/ios/Comm/TemporalMessageStorage/NonBlockingLock.mm
new file mode 100644
--- /dev/null
+++ b/native/ios/Comm/TemporalMessageStorage/NonBlockingLock.mm
@@ -0,0 +1,78 @@
+#import "NonBlockingLock.h"
+#import <string>
+
+@implementation NonBlockingLock
+- (instancetype)initWithName:(NSString *)lockName {
+ self = [super init];
+ if (self) {
+ _lockName = [lockName cStringUsingEncoding:NSUTF8StringEncoding];
+ _lockHandle = nil;
+ }
+ return self;
+}
+
+- (BOOL)tryAcquireLock:(NSError **)err {
+ if (_lockHandle) {
+ *err = [NSError errorWithDomain:@"app.comm"
+ code:EBUSY
+ userInfo:@{
+ NSLocalizedDescriptionKey :
+ @"Attempt to acquire already held lock."
+ }];
+ return NO;
+ }
+ sem_t *lock = sem_open(self.lockName, O_CREAT, 0644, 1);
+ if (lock == SEM_FAILED) {
+ *err = [NSError errorWithDomain:@"app.comm"
+ code:errno
+ userInfo:@{
+ NSLocalizedDescriptionKey : [NSString
+ stringWithCString:strerror(errno)
+ encoding:NSUTF8StringEncoding]
+ }];
+ sem_close(lock);
+ return NO;
+ }
+ if (sem_trywait(lock)) {
+ *err = [NSError errorWithDomain:@"app.comm"
+ code:errno
+ userInfo:@{
+ NSLocalizedDescriptionKey : [NSString
+ stringWithCString:strerror(errno)
+ encoding:NSUTF8StringEncoding]
+ }];
+ sem_close(lock);
+ return NO;
+ }
+ _lockHandle = lock;
+ return YES;
+}
+
+- (void)releaseLock:(NSError **)err {
+ if (!self.lockHandle) {
+ *err =
+ [NSError errorWithDomain:@"app.comm"
+ code:ENODATA
+ userInfo:@{
+ NSLocalizedDescriptionKey :
+ @"Attempt to release lock that was not acquired."
+ }];
+ return;
+ }
+ sem_post(_lockHandle);
+ sem_close(_lockHandle);
+ _lockHandle = nil;
+}
+
+- (void)destroyLock:(NSError **)err {
+ if (sem_unlink(_lockName)) {
+ *err = [NSError errorWithDomain:@"app.comm"
+ code:errno
+ userInfo:@{
+ NSLocalizedDescriptionKey : [NSString
+ stringWithCString:strerror(errno)
+ encoding:NSUTF8StringEncoding]
+ }];
+ };
+}
+@end

File Metadata

Mime Type
text/plain
Expires
Fri, Nov 29, 5:29 PM (20 h, 41 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
2597639
Default Alt Text
D4381.id14149.diff (6 KB)

Event Timeline