ilikecats/stk-code_catmod
1
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix thread cancellation

Browse Source 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@6144 178a84e3-b1eb-0310-8ba1-8eac791a3b58
This commit is contained in:
auria 2010-09-25 18:09:06 +00:00
parent 0c5c9496cf
commit 90766a6118
1 changed files with 17 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/states_screens/main_menu_screen.cpp
View File

@ -108,11 +108,16 @@ void MainMenuScreen::loadedFromFile()
void MainMenuScreen::init() void MainMenuScreen::init()
{ {
Screen::init(); Screen::init();
// reset in case we're coming back from a race // reset in case we're coming back from a race
StateManager::get()->resetActivePlayers(); StateManager::get()->resetActivePlayers();
input_manager->getDeviceList()->setAssignMode(NO_ASSIGN); input_manager->getDeviceList()->setAssignMode(NO_ASSIGN);
input_manager->setMasterPlayerOnly(false); input_manager->setMasterPlayerOnly(false);
#ifdef ADDONS_MANAGER #ifdef ADDONS_MANAGER
// FIXME: this is wrong, init may be called several times in the object's
// lifespan, and the pthread docs state that initing several times the same
// mutex can cause undefined behavior
pthread_mutex_init(&(this->m_mutex_news_text), NULL); pthread_mutex_init(&(this->m_mutex_news_text), NULL);
pthread_create(&m_thread_news_text, NULL, &MainMenuScreen::downloadNews, this); pthread_create(&m_thread_news_text, NULL, &MainMenuScreen::downloadNews, this);
#endif #endif
@ -231,15 +236,25 @@ void MainMenuScreen::eventCallback(Widget* widget, const std::string& name, cons
// ------------------------------------------------------------------------------------------------------ // ------------------------------------------------------------------------------------------------------
void * MainMenuScreen::downloadNews( void * pthis) void * MainMenuScreen::downloadNews( void * pthis)
{ {
// enable thread to be cancelled
pthread_setcancelstate(PTHREAD_CANCEL_ENABLE, NULL);
pthread_setcanceltype(PTHREAD_CANCEL_DEFERRED, NULL);
// FIXME: this code is wrong, "pt" might have been deleted by the // FIXME: this code is wrong, "pt" might have been deleted by the
// time the download is done (by having switched to another screen, // time the download is done (by having switched to another screen,
// or exiting the game, etc...) // or exiting the game, etc...)
MainMenuScreen * pt = (MainMenuScreen*)pthis; MainMenuScreen * pt = (MainMenuScreen*)pthis;
if(download("news")) if (download("news"))
{
pthread_testcancel(); // check if thread was cancelled
pt->changeNewsText("news"); pt->changeNewsText("news");
}
else else
{
pthread_testcancel(); // check if thread was cancelled
pt->changeNewsText("offline"); pt->changeNewsText("offline");
}
return NULL; return NULL;
} }
#endif #endif
@ -247,7 +262,7 @@ void * MainMenuScreen::downloadNews( void * pthis)
#ifdef ADDONS_MANAGER #ifdef ADDONS_MANAGER
void MainMenuScreen::tearDown() void MainMenuScreen::tearDown()
{ {
fprintf(stdout, "canceling the thread"); fprintf(stdout, "canceling the thread\n");
pthread_cancel(m_thread_news_text); pthread_cancel(m_thread_news_text);
} }
#endif #endif