Fixed poor synchronization in XBPyThread::stop() #1221
Merged
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
| @@ -442,10 +445,27 @@ void XBPyThread::stop() | |||
| PyThreadState_Swap(old); | |||
| PyEval_ReleaseLock(); | |||
|
|
|||
| if(!stoppedEvent.WaitMSec(5000))//let the script 5 secs for shut stuff down | |||
| unsigned int checkpoint = XbmcThreads::SystemClockMillis(); | |||
This comment was marked as spam.
This comment was marked as spam.
Sorry, something went wrong.
|
With above two changes, it should be a good fix. |
|
Fixed elupus's comment. What value should be used for WaitMSec(15)? I chose 15 because it's about 60fps. |
|
Should be fine. |
| // dismantle themselves. Python dialogs aren't normal XBMC dialogs, they rely | ||
| // on TMSG_GUI_PYTHON_DIALOG messages, so pump the render loop. | ||
| CSingleLock lock(g_graphicsContext); | ||
| g_windowManager.ProcessRenderLoop(); |
This comment was marked as spam.
This comment was marked as spam.
Sorry, something went wrong.
This comment was marked as spam.
This comment was marked as spam.
Sorry, something went wrong.
|
Updated the message processing part (see commit description) |
|
Rebased into single commit. @elupus any more thoughts? |
This fixes XBPyThread::stop() waiting on a event in the application thread, which precludes the event from getting triggered if a Python script relies on the messaging system to close itself (such as calling the .close() function on an open dialog)
ghost
pushed a commit
that referenced
this pull request
Aug 4, 2012
Fixed poor synchronization in XBPyThread::stop()
ghost
merged commit
tru
pushed a commit
to plexinc/plex-home-theater-public
that referenced
this pull request
Jun 13, 2014
Currently we only add the main language code with two letters: en, sv etc. Fixes xbmc#1221
tru
pushed a commit
to RasPlex/plex-home-theatre
that referenced
this pull request
Aug 21, 2014
Currently we only add the main language code with two letters: en, sv etc. Fixes xbmc#1221
This pull request was closed.
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.
This fixes XBPyThread::stop() waiting on a event in the application thread, which precludes the event from getting triggered if a Python script relies on the messaging system to close itself (such as calling the .close() function on an open dialog)
An alternative could be not ever calling ::stop() in the app thread. I don't know how feasible this is.
My strategy for handling messages comes from
https://github.com/xbmc/xbmc/blob/master/xbmc/cores/dvdplayer/DVDPlayer.cpp#L461
https://github.com/xbmc/xbmc/blob/master/xbmc/filesystem/Directory.cpp#L170
https://github.com/xbmc/xbmc/blob/master/xbmc/guilib/GUIDialog.cpp#L176
and I've learned that just because it's done throughout the code base doesn't make it correct, consistent or complete. Always open to being pointed in the right direction :)