Fix deadlock when updating camera & renderer properties via Rockets #569
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
rolandjitsu
approved these changes
Sep 20, 2018
hernando
reviewed
Sep 20, 2018
| @@ -1214,7 +1218,7 @@ class RocketsPlugin::Impl | |||
| PropertyMap props = object.getPropertyMap(); | |||
| if (::from_json(props, request.message)) | |||
| { | |||
| object.updateProperties(props); | |||
| object.updateProperties(props, false); | |||
There was a problem hiding this comment.
Is it OK to not update the UI if you make changes from a notebook? Or does the rebroadcast at the bottom solve that problem?
There was a problem hiding this comment.
Yes, the rebroadcast solves that. The callback triggered by markModified() is needed for 'internal' and plugin changes.
|
I'll fix this differently, hang tight and hold on. |
|
Updated. Please review again. |
hernando
reviewed
Sep 21, 2018
| uintptr_t* _currentClientID; | ||
| }; | ||
|
|
||
| void bindEndpoint(const std::string& method, |
| @@ -1254,6 +1328,9 @@ class RocketsPlugin::Impl | |||
| std::unordered_map<std::string, std::pair<std::mutex, Throttle>> _throttle; | |||
| std::vector<std::function<void()>> _delayedNotifies; | |||
| std::mutex _delayedNotifiesMutex; | |||
| static constexpr uintptr_t NO_CURRENT_CLIENT{ | |||
| std::numeric_limits<uintptr_t>::max()}; | |||
There was a problem hiding this comment.
If this is representing an opaque pointer, you can also use 0 for brevity.
hernando
reviewed
Sep 21, 2018
| } | ||
|
|
||
| template <typename Params> | ||
| void _connectEndpoint(const std::string& method, |
There was a problem hiding this comment.
Why these methods are not called bind as well? Because they return OK?
There was a problem hiding this comment.
Because in rockets they are called connect as well.
Due the data race fixes in the latest Rockets versions, it revealed this wrong behavior in Brayns, where the updates on property objects from within Rockets shall not trigger the onModified() callback which would lead to an unnecessary (and deadlocking) notification.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Due the data race fixes in the latest Rockets versions, it revealed this wrong
behavior in Brayns, where the updates on property objects from within Rockets
shall not trigger the onModified() callback which would lead to an
unnecessary (and deadlocking) notification.