ShuriZma
/
dolphin
mirror of https://github.com/dolphin-emu/dolphin.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3148 from phire/logWindow_lockup 

DolphinWX: Make UpdateLog() return in a finite time (aka, fix stack overflow messages when logging is enabled)
This commit is contained in:
Scott Mansell 2015-10-09 12:18:34 +13:00
parent 400a737ef9 71d7cd6b9d
commit dd5df05c01
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
Source/Core/DolphinWX/LogWindow.cpp
View File

@ -31,6 +31,8 @@
// Milliseconds between msgQueue flushes to wxTextCtrl
#define UPDATETIME 200
// Max size of msgQueue, old messages will be discarded when there are too many.
#define MSGQUEUE_MAX_SIZE 100
CLogWindow::CLogWindow(CFrame *parent, wxWindowID id, const wxPoint& pos,
const wxSize& size, long style, const wxString& name)
@ -279,7 +281,11 @@ void CLogWindow::UpdateLog()
m_LogTimer.Stop();
while (true)
// This function runs on the main gui thread, and needs to finish in a finite time otherwise
// the GUI will lock up, which could be an issue if new messages are flooding in faster than
// this function can render them to the screen.
// So we limit this function to processing MSGQUEUE_MAX_SIZE messages each time it's called.
for (int num = 0; num < MSGQUEUE_MAX_SIZE; num++)
{
u8 log_level;
wxString log_msg;
@ -339,7 +345,7 @@ void CLogWindow::Log(LogTypes::LOG_LEVELS level, const char *text)
{
std::lock_guard<std::mutex> lk(m_LogSection);
if (msgQueue.size() >= 100)
if (msgQueue.size() >= MSGQUEUE_MAX_SIZE)
msgQueue.pop();
msgQueue.push(std::make_pair(u8(level), StrToWxStr(text)));