diff options
author | Gil <mcg@google.com> | 2018-03-13 14:19:15 -0700 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-03-13 14:19:15 -0700 |
commit | d4d73ea53ecdf1e8ade3d00921419645dd5d66f7 (patch) | |
tree | be3c51c202acd5d1fa0a40e330224b90fd67f38d /Firestore/Source/Util/FSTDispatchQueue.h | |
parent | 687e8d768db7ea01219000ab25b43f524cc530ab (diff) |
Defend against users making API calls during deinit (#863)
Track operation in progress FSTDispatchQueue
... and allow dispatchAsync onto the worker queue even from the same
queue if an operation is not in progress. Fixes #753.
This fixes a corner case that happens when users pass us an object and
we retain that object in a block submitted to the worker queue for
processing. Users are not obligated to retain that object themselves.
This can lead to the object's destructor (or dealloc or deinit) being
called on the Firestore worker thread. If that destructor makes
Firestore API calls (most likely ListenerRegistration.remove but any are
possible) this will trigger the assertion.
Diffstat (limited to 'Firestore/Source/Util/FSTDispatchQueue.h')
-rw-r--r-- | Firestore/Source/Util/FSTDispatchQueue.h | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/Firestore/Source/Util/FSTDispatchQueue.h b/Firestore/Source/Util/FSTDispatchQueue.h index 7922600..8e9273c 100644 --- a/Firestore/Source/Util/FSTDispatchQueue.h +++ b/Firestore/Source/Util/FSTDispatchQueue.h @@ -75,6 +75,14 @@ typedef NS_ENUM(NSInteger, FSTTimerID) { - (void)verifyIsCurrentQueue; /** + * Declares that we are already executing on the correct dispatch_queue_t and would like to + * officially execute code on behalf of this FSTDispatchQueue. To be used only when called back + * by some other API directly onto our queue. This allows us to safely dispatch directly onto the + * worker queue without destroying the invariants this class helps us maintain. + */ +- (void)enterCheckedOperation:(void (^)(void))block; + +/** * Same as dispatch_async() except it asserts that we're not already on the queue, since this * generally indicates a bug (and can lead to re-ordering of operations, etc). * |