DisplayDriverServer: Check merge driver for errors #1461
Conversation
This file contains hidden or 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
Checks if the current merge driver is compatible with and incoming merge driver.
johnhaddon
reviewed
May 6, 2025
Comment on lines
+484
to
+488
| if ( ++m.usageCount > sessionClientsData->readable() ) | ||
| { | ||
| throw IECore::InvalidArgumentException( "Number of merge clients (" + std::to_string( m.usageCount ) | ||
| + ") is more than expected amount (" + std::to_string( m.mergeCount ) + ")." ); | ||
| } |
There was a problem hiding this comment.
It seems unfortunate that we're testing against sessionClientsData from the new driver here, since we have no guarantee that it has the same value that was used to initialise m.mergeCount in the first place. But we can't test against m.mergeCount either, since that is decremented in imageClose. Can we rejig our two state variables to make this a bit more watertight?
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.
I added a small test in the merge driver code to make sure that the data coming in is as expected.
Relates to PR #1448.
The incoming merge driver could gave mismatched data, which includes: display window, channel names and # merge drivers requested.
Checklist