Skip to content
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.

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

Fix transfer window deadlock with Qt, implement Window::doneCurrent() #484

Merged
merged 2 commits into from
Aug 6, 2015

Conversation

tribal-tec
Copy link
Member

No description provided.

@bbpbuildbot
Copy link

Refer to this link for build results (access rights to CI server needed):
https://bbpcode.epfl.ch/ci//job/oss.Equalizer.github/214/
Test FAILed.

@bbpbuildbot
Copy link

Refer to this link for build results (access rights to CI server needed):
https://bbpcode.epfl.ch/ci//job/oss.Equalizer.github/215/
Test PASSed.

@bbpbuildbot
Copy link

Refer to this link for build results (access rights to CI server needed):
https://bbpcode.epfl.ch/ci//job/oss.Equalizer.github/216/
Test PASSed.

@tribal-tec
Copy link
Member Author

Hold on with merge. The tfer window creation in tfer thread does not work with WGL. Share context must not be current, which was guaranteed by making the tfer context current in the draw thread. Now the draw context is current while sharing with the tfer context in tfer thread. Needs more work it seems...

bool stopRunning() override { return _stop; }
void postStop() { _stop = true; }

private:
const eq::Pipe* _pipe;
Copy link
Member

Choose a reason for hiding this comment

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

_pipe still needed?

Copy link
Member Author

Choose a reason for hiding this comment

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

in run(): LB_TS_THREAD( _pipe->_tferThread );

@tribal-tec
Copy link
Member Author

Just did some archaeology: I should not introduce bug #177 again. Shared context creation must remain in the render thread.

@tribal-tec tribal-tec changed the title Qt: Fix transfer window deadlock Fix transfer window deadlock with Qt, implement Window::doneCurrent() Aug 5, 2015
@tribal-tec
Copy link
Member Author

Updated

@bbpbuildbot
Copy link

Refer to this link for build results (access rights to CI server needed):
https://bbpcode.epfl.ch/ci//job/oss.Equalizer.github/218/
Test FAILed.

@bbpbuildbot
Copy link

Refer to this link for build results (access rights to CI server needed):
https://bbpcode.epfl.ch/ci//job/oss.Equalizer.github/217/
Test FAILed.

@tribal-tec
Copy link
Member Author

retest this please

@bbpbuildbot
Copy link

Refer to this link for build results (access rights to CI server needed):
https://bbpcode.epfl.ch/ci//job/oss.Equalizer.github/219/
Test PASSed.

@bbpbuildbot
Copy link

Refer to this link for build results (access rights to CI server needed):
https://bbpcode.epfl.ch/ci//job/oss.Equalizer.github/221/
Test FAILed.

@tribal-tec
Copy link
Member Author

retest this please

@bbpbuildbot
Copy link

Refer to this link for build results (access rights to CI server needed):
https://bbpcode.epfl.ch/ci//job/oss.Equalizer.github/222/
Test PASSed.

@eile
Copy link
Member

eile commented Aug 6, 2015

+1

tribal-tec added a commit that referenced this pull request Aug 6, 2015
Fix transfer window deadlock with Qt, implement Window::doneCurrent()
@tribal-tec tribal-tec merged commit c9f0240 into Eyescale:master Aug 6, 2015
@bbpbuildbot
Copy link

Refer to this link for build results (access rights to CI server needed):
https://bbpcode.epfl.ch/ci//job/oss.Equalizer.github/223/
Test FAILed.

@bbpbuildbot
Copy link

Refer to this link for build results (access rights to CI server needed):
https://bbpcode.epfl.ch/ci//job/oss.Equalizer.github/224/
Test FAILed.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants