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

1. Removed the waitfordeath time out as it seems to crash dolphin every now and then 

if it hangs on stop now please report so we can fix it.
2. Change linux to use the same threading module in single core mode as windows

Anyone knows which revision broke dual core mode on linux?


git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@4803 8ced0084-cf51-0410-be5f-012b33b47a6e
This commit is contained in:
nakeee 2010-01-11 07:14:30 +00:00
parent 183804e442
commit 345f922549
1 changed files with 8 additions and 49 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

57
Source/Core/Core/Src/Core.cpp
View File

@ -231,27 +231,7 @@ void Stop() // - Hammertime!
Host_SetWaitCursor(false);
WARN_LOG(CONSOLE, "%s", StopMessage(true, "Stopping Emu thread ...").c_str());
#ifdef _WIN32
// The whole shutdown process shouldn't take more than ~200ms. 2000ms timeout is more than enough.
DWORD Wait = g_EmuThread->WaitForDeath(2000);
switch(Wait)
{
case WAIT_ABANDONED:
ERROR_LOG(CONSOLE, "%s", StopMessage(true, "Emu wait returned: WAIT_ABANDONED").c_str());
break;
case WAIT_OBJECT_0:
NOTICE_LOG(CONSOLE, "%s", StopMessage(true, "Emu wait returned: WAIT_OBJECT_0").c_str());
break;
case WAIT_TIMEOUT:
ERROR_LOG(CONSOLE, "%s", StopMessage(true, "Emu wait returned: WAIT_TIMEOUT").c_str());
break;
case WAIT_FAILED:
ERROR_LOG(CONSOLE, "%s", StopMessage(true, "Emu wait returned: WAIT_FAILED").c_str());
break;
}
#else
g_EmuThread->WaitForDeath();
#endif
delete g_EmuThread; // Wait for emuthread to close.
g_EmuThread = 0;
}
@ -430,11 +410,10 @@ THREAD_RETURN EmuThread(void *pArg)
}
else // SingleCore mode
{
#ifdef _WIN32
// the spawned CPU Thread is the... CPU thread but it also does the graphics.
// the EmuThread is thus an idle thread, which sleeps and wait for the emu to terminate.
// Without this extra thread, the video plugin window hangs in single core mode since
// noone is pumping messages.
// the spawned CPU Thread also does the graphics. the EmuThread is
// thus an idle thread, which sleep wait for the program to terminate.
// Without this extra thread, the video plugin window hangs in single
// core mode since noone is pumping messages.
cpuThread = new Common::Thread(CpuThread, pArg);
Common::SetCurrentThreadName("Emuthread - Idle");
@ -452,11 +431,10 @@ THREAD_RETURN EmuThread(void *pArg)
NOTICE_LOG(CONSOLE, "%s", StopMessage(true, "Stopping CPU-GPU thread ...").c_str());
cpuRunloopQuit.Wait();
NOTICE_LOG(CONSOLE, "%s", StopMessage(true, "CPU thread stopped.").c_str());
#else
// On unix platforms, the Emulation main thread IS the CPU & video thread
// So there's only one thread, imho, that's much better than on windows :P
CpuThread(pArg);
#endif
// On unix platforms, the Emulation main thread IS the CPU & video
// thread So there's only one thread, imho, that's much better than on
// windows :P
//CpuThread(pArg);
}
// We have now exited the Video Loop
@ -467,26 +445,7 @@ THREAD_RETURN EmuThread(void *pArg)
if (cpuThread)
{
// There is a CPU thread - join it.
#ifdef _WIN32
DWORD Wait = cpuThread->WaitForDeath(1000);
switch(Wait)
{
case WAIT_ABANDONED:
ERROR_LOG(CONSOLE, "%s", StopMessage(true, "CPU wait returned: WAIT_ABANDONED").c_str());
break;
case WAIT_OBJECT_0:
NOTICE_LOG(CONSOLE, "%s", StopMessage(true, "CPU wait returned: WAIT_OBJECT_0").c_str());
break;
case WAIT_TIMEOUT:
ERROR_LOG(CONSOLE, "%s", StopMessage(true, "CPU wait returned: WAIT_TIMEOUT").c_str());
break;
case WAIT_FAILED:
ERROR_LOG(CONSOLE, "%s", StopMessage(true, "CPU wait returned: WAIT_FAILED").c_str());
break;
}
#else
cpuThread->WaitForDeath();
#endif
delete cpuThread;
// Returns after game exited
cpuThread = NULL;