remove unnecessary dispatch

// FREEBIE
pull/1/head
Michael Kirk 8 years ago
parent 6a5c6a9fc9
commit 0b38b46683

@ -243,38 +243,22 @@ NSString *const OWSMessageProcessingJobFinderExtensionGroup = @"OWSMessageProces
return; return;
} }
dispatch_async(self.class.serialGCDQueue, ^{ [self processJob:job
[self processJob:job completion:^{
completion:^{ DDLogVerbose(@"%@ completed job. %lu jobs left.",
DDLogVerbose(@"%@ completed job. %lu jobs left.", self.tag,
self.tag, (unsigned long)[OWSMessageProcessingJob numberOfKeysInCollection]);
(unsigned long)[OWSMessageProcessingJob numberOfKeysInCollection]); [self drainQueueWorkStep];
[self drainQueueWorkStep]; }];
}];
});
} }
- (void)processJob:(OWSMessageProcessingJob *)job completion:(void (^)())completion - (void)processJob:(OWSMessageProcessingJob *)job completion:(void (^)())completion
{ {
dispatch_async(dispatch_get_main_queue(), ^{ [self.messagesManager processEnvelope:job.envelopeProto
[self.messagesManager processEnvelope:job.envelopeProto completion:^{
completion:^{ [self.finder removeJobWithId:job.uniqueId];
[self.finder removeJobWithId:job.uniqueId]; completion();
completion(); }];
}];
});
}
#pragma mark Helpers
+ (dispatch_queue_t)serialGCDQueue
{
static dispatch_once_t onceToken;
static dispatch_queue_t queue;
dispatch_once(&onceToken, ^{
queue = dispatch_queue_create("org.whispersystems.signal.messageProcessingQueue", NULL);
});
return queue;
} }
#pragma mark Logging #pragma mark Logging
@ -353,7 +337,9 @@ NSString *const OWSMessageProcessingJobFinderExtensionGroup = @"OWSMessageProces
- (void)handleAnyUnprocessedEnvelopes - (void)handleAnyUnprocessedEnvelopes
{ {
[self.processingQueue drainQueue]; dispatch_async(dispatch_get_main_queue(), ^{
[self.processingQueue drainQueue];
});
} }
- (void)handleReceivedEnvelope:(OWSSignalServiceProtosEnvelope *)envelope - (void)handleReceivedEnvelope:(OWSSignalServiceProtosEnvelope *)envelope

Loading…
Cancel
Save