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

Adding a mutex in the main_screen to avoid problem with the thread that loads the news

Browse Source 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@5759 178a84e3-b1eb-0310-8ba1-8eac791a3b58
This commit is contained in:
xapantu 2010-08-22 17:51:48 +00:00
parent bae43d78df
commit 9cfeac1ed4
2 changed files with 29 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
src/states_screens/main_menu_screen.cpp
View File

@ -63,7 +63,6 @@ MainMenuScreen::MainMenuScreen() : Screen("main.stkgui")
#ifdef ADDONS_MANAGER #ifdef ADDONS_MANAGER
void MainMenuScreen::changeNewsText(std::string action) void MainMenuScreen::changeNewsText(std::string action)
{ {
LabelWidget* w = this->getWidget<LabelWidget>("info_addons");
if(action == "news") if(action == "news")
{ {
FILE* newsFile = NULL; FILE* newsFile = NULL;
@ -85,12 +84,16 @@ void MainMenuScreen::changeNewsText(std::string action)
// to remove the break line. // to remove the break line.
//info.replace(info.size()-1,1, ""); //info.replace(info.size()-1,1, "");
std::cout << info << std::endl; //std::cout << info << std::endl;
//w->setText(std::string(info).c_str()); pthread_mutex_lock(&(this->m_mutex_news_text));
m_news_text = std::string(info).c_str();
pthread_mutex_unlock(&(this->m_mutex_news_text));
} }
if(action == "offline") if(action == "offline")
{ {
//w->setText(_("Can't access stkaddons server...")); pthread_mutex_lock(&(this->m_mutex_news_text));
m_news_text = "offline";
pthread_mutex_unlock(&(this->m_mutex_news_text));
} }
} }
#endif #endif
@ -110,11 +113,28 @@ void MainMenuScreen::init()
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
pthread_mutex_init(&(this->m_mutex_news_text), NULL);
pthread_t nThreadID2; pthread_t nThreadID2;
pthread_create(&nThreadID2, NULL, &MainMenuScreen::downloadNews, this); pthread_create(&nThreadID2, NULL, &MainMenuScreen::downloadNews, this);
#endif #endif
} }
#ifdef ADDONS_MANAGER
// ------------------------------------------------------------------------------------------------------
void MainMenuScreen::onUpdate(float delta, irr::video::IVideoDriver* driver)
{
//FIXME:very bad for performance
LabelWidget* w = this->getWidget<LabelWidget>("info_addons");
pthread_mutex_lock(&(this->m_mutex_news_text));
if(m_news_text == "offline")
{
w->setText("Can't access stkaddons server...");
}
else
w->setText(m_news_text.c_str());
pthread_mutex_unlock(&(this->m_mutex_news_text));
}
#endif
// ------------------------------------------------------------------------------------------------------ // ------------------------------------------------------------------------------------------------------
void MainMenuScreen::eventCallback(Widget* widget, const std::string& name, const int playerID) void MainMenuScreen::eventCallback(Widget* widget, const std::string& name, const int playerID)

5
src/states_screens/main_menu_screen.hpp
View File

@ -32,7 +32,12 @@ class MainMenuScreen : public GUIEngine::Screen, public GUIEngine::ScreenSinglet
MainMenuScreen(); MainMenuScreen();
public: public:
#ifdef ADDONS_MANAGER
void changeNewsText(std::string action); void changeNewsText(std::string action);
pthread_mutex_t m_mutex_news_text;
std::string m_news_text;
void onUpdate(float delta, irr::video::IVideoDriver* driver);
#endif
/** \brief implement callback from parent class GUIEngine::Screen */ /** \brief implement callback from parent class GUIEngine::Screen */
virtual void loadedFromFile(); virtual void loadedFromFile();