This repository has been archived by the owner on Aug 8, 2023. It is now read-only.
Mutex guard annotation manager for cross thread usage #9220
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
2 tasks
jfirebaugh
suggested changes
Jun 9, 2017
| @@ -68,13 +74,15 @@ void AnnotationManager::add(const AnnotationID& id, const FillAnnotation& annota | |||
| Update AnnotationManager::update(const AnnotationID& id, const SymbolAnnotation& annotation, const uint8_t maxZoom) { | |||
| Update result = Update::Nothing; | |||
|
|
|||
| mutex.lock(); | |||
There was a problem hiding this comment.
Manual locking/unlocking will leave a stranded lock in the early exit case. (It's an error case, but still best not to corrupt the object internals.)
| auto it = shapeAnnotations.find(id); | ||
| if (it == shapeAnnotations.end()) { | ||
| assert(false); // Attempt to update a non-existent shape annotation | ||
| return Update::Nothing; | ||
| } | ||
| mutex.unlock(); | ||
|
|
||
| removeAndAdd(id, annotation, maxZoom); |
There was a problem hiding this comment.
There should be a lock in removeAndAdd around both the remove and add, not merely a lock in add and a lock in remove. Otherwise, a tile could get updated in between the remove and the add, producing a flickering annotation.
ivovandongen
force-pushed
the
annotation-manager-mutexed
branch
from
50c10ee
to
2d525de
Compare
|
@jfirebaugh Thanks for the review. I've factored out a private |
jfirebaugh
approved these changes
Jun 12, 2017
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Alternative for #9208 to make annotations thread safe for asynchronous rendering (#8820)