oxen-io/session-ios
1
0
Fork 0
mirror of https://github.com/oxen-io/session-ios.git synced 2023-12-13 21:30:14 +01:00
Code Issues Projects Releases Wiki Activity

Rework flush of registration connection(s).

Browse source
This commit is contained in:
Matthew Chen 2018-04-18 15:37:32 -04:00
parent 4f1f1a107f
commit 5d627ee89f
1 changed files with 39 additions and 28 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

67
SignalServiceKit/src/Storage/OWSPrimaryStorage.m
View file

@ -138,37 +138,48 @@ void runAsyncRegistrationsForStorage(OWSStorage *storage)
DDLogVerbose(@"%@ async registrations enqueued.", self.logTag);
[[self registrationConnection] asyncReadWriteWithBlock:^(YapDatabaseReadWriteTransaction *transaction) {
// Block until all async registrations are complete.
//
// NOTE: This has to happen on the "registration connections" for this
// database.
NSMutableSet<YapDatabaseConnection *> *pendingRegistrationConnectionSet =
[[((OWSDatabase *)self.database)clearCollectedRegistrationConnections] mutableCopy];
DDLogVerbose(@"%@ flushing registration connections: %zd.", self.logTag, pendingRegistrationConnectionSet.count);
// Flush the write queue to ensure all async registrations have begun.
[[self registrationConnection]
flushTransactionsWithCompletionQueue:dispatch_get_main_queue()
completionBlock:^{
// Block until all async registrations are complete.
//
// NOTE: This has to happen on the "registration connections" for this
// database.
NSMutableSet<YapDatabaseConnection *> *pendingRegistrationConnectionSet = [
[((OWSDatabase *)self.database)clearCollectedRegistrationConnections] mutableCopy];
DDLogVerbose(@"%@ flushing registration connections: %zd.",
self.logTag,
pendingRegistrationConnectionSet.count);
dispatch_async(dispatch_get_main_queue(), ^{
if (pendingRegistrationConnectionSet.count > 0) {
for (YapDatabaseConnection *dbConnection in pendingRegistrationConnectionSet) {
[dbConnection
flushTransactionsWithCompletionQueue:dispatch_get_main_queue()
completionBlock:^{
OWSAssertIsOnMainThread();
dispatch_async(dispatch_get_main_queue(), ^{
if (pendingRegistrationConnectionSet.count > 0) {
for (YapDatabaseConnection *dbConnection in pendingRegistrationConnectionSet) {
[dbConnection
flushTransactionsWithCompletionQueue:dispatch_get_main_queue()
completionBlock:^{
OWSAssertIsOnMainThread();
[pendingRegistrationConnectionSet removeObject:dbConnection];
if (pendingRegistrationConnectionSet.count > 0) {
DDLogVerbose(@"%@ registration connection flushed.", self.logTag);
return;
}
[pendingRegistrationConnectionSet
removeObject:dbConnection];
if (pendingRegistrationConnectionSet.count
> 0) {
DDLogVerbose(@"%@ registration "
@"connection flushed.",
self.logTag);
return;
}
[self markAsyncRegistrationsAsCompleteWithCompletion:completion];
}];
}
} else {
[self markAsyncRegistrationsAsCompleteWithCompletion:completion];
}
});
}];
[self
markAsyncRegistrationsAsCompleteWithCompletion:
completion];
}];
}
} else {
[self markAsyncRegistrationsAsCompleteWithCompletion:completion];
}
});
}];
}
- (void)markAsyncRegistrationsAsCompleteWithCompletion:(void (^_Nonnull)(void))completion