Skip to content

DisplayDriverServer: Check merge driver for errors #1461

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: RB-10.5
Choose a base branch
from
Open

DisplayDriverServer: Check merge driver for errors #1461

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 18 additions & 3 deletions src/IECoreImage/DisplayDriverServer.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,6 +77,7 @@ struct MergeDriverInfo
{
DisplayDriverPtr mergeDriver = nullptr;
int mergeCount = 0;
int usageCount = 0;
};

using MergeMap = std::map<int, MergeDriverInfo>;
Expand Down Expand Up @@ -456,14 +457,14 @@ void DisplayDriverServer::Session::handleReadOpenParameters( const boost::system
}
else
{
m_mergeId = parameters->member<IntData>( "displayDriverServer:mergeId", false /* throw if missing */ )->readable();
m_mergeId = parameters->member<IntData>( "displayDriverServer:mergeId", true /* throw if missing */ )->readable();
const IntData *sessionClientsData = parameters->member<IntData>( "displayDriverServer:mergeClients", true /* throw if missing */ );

// Check if merge ID in map, if not then create display driver and session count pair with merge ID.
auto &m = m_mergeMap[m_mergeId.value()];
if ( !m.mergeDriver )
{
const IntData *sessionClientsData = parameters->member<IntData>( "displayDriverServer:mergeClients", true /* throw if missing */ );
m.mergeDriver= DisplayDriver::create(
m.mergeDriver = DisplayDriver::create(
displayType->readable(),
displayWindow->readable(),
displayWindow->readable(), // For merge we want dataWindow = displayWindow
Expand All @@ -472,6 +473,20 @@ void DisplayDriverServer::Session::handleReadOpenParameters( const boost::system
);
m.mergeCount = sessionClientsData->readable();
}
if ( channelNames->readable() != m.mergeDriver->channelNames() )
{
throw IECore::InvalidArgumentException( "Merge driver has incompatible channel names." );
}
if ( displayWindow->readable() != m.mergeDriver->displayWindow() )
{
throw IECore::InvalidArgumentException( "Merge driver has incompatible display window." );
}
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 ) + ")." );
}
Comment on lines +484 to +488
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

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?


// Merge ID is now in map, so load the display driver.
m_displayDriver = m.mergeDriver;
}
Expand Down