piwalker/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-07-31 01:59:52 -06:00
Code Issues Packages Projects Releases Wiki Activity

GUI: Fixed some GUI related start/stop crashes

Browse Source 
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@4223 8ced0084-cf51-0410-be5f-012b33b47a6e
This commit is contained in:
John Peterson
2009-09-07 12:40:43 +00:00
parent 49601e0af2
commit 7e115dcb00
27 changed files with 424 additions and 190 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -26,6 +26,7 @@
#include "Common.h"
#include "StringUtil.h"
#include "MathUtil.h"
#include "MemoryUtil.h"
#include "Console.h"
#include "Core.h"
@ -92,6 +93,7 @@ THREAD_RETURN EmuThread(void *pArg);
void Stop();
bool g_bStopping = false;
bool g_bHwInit = false;
bool g_bRealWiimote = false;
HWND g_pWindowHandle = NULL;
@ -106,6 +108,14 @@ Common::Event gpuShutdownCall;
// Display messages and return values
// Formatted stop message
std::string StopMessage(bool bMainThread, std::string Message)
{
return StringFromFormat("Stop [%s %i]\t%s\t%s",
bMainThread ? "Main Thread" : "Video Thread", Common::Thread::CurrentId(), MemUsage().c_str(), Message.c_str());
}
//
bool PanicAlertToVideo(const char* text, bool yes_no)
{
@ -207,11 +217,20 @@ bool Init()
void Stop() // - Hammertime!
{
const SCoreStartupParameter& _CoreParameter = SConfig::GetInstance().m_LocalCoreStartupParameter;
g_bStopping = true;
WARN_LOG(CONSOLE, "Stop [Main Thread]\t\t---- Shutting down ----");
// This must be done a while before freeing the dll to not crash wx around MSWWindowProc and DefWindowProc, will investigate further
Host_Message(AUDIO_DESTROY);
Host_Message(VIDEO_DESTROY);
Host_SetWaitCursor(true); // hourglass!
if (PowerPC::GetState() == PowerPC::CPU_POWERDOWN)
return;
WARN_LOG(CONSOLE, "%s", StopMessage(true, "Stop CPU").c_str());
// Stop the CPU
PowerPC::Stop();
CCPU::StepOpcode(); // Kick it if it's waiting (code stepping wait loop)
@ -226,7 +245,7 @@ void Stop() // - Hammertime!
// If dual core mode, the CPU thread should immediately exit here.
if (_CoreParameter.bUseDualCore) {
INFO_LOG(CONSOLE, "Stop [Main Thread]: Wait for Video Loop to exit...\n");
NOTICE_LOG(CONSOLE, "%s", StopMessage(true, "Wait for Video Loop to exit ...").c_str());
CPluginManager::GetInstance().GetVideo()->Video_ExitLoop();
}
@ -235,13 +254,29 @@ void Stop() // - Hammertime!
// Close the trace file
Core::StopTrace();
NOTICE_LOG(BOOT, "Shutting down core");
WARN_LOG(CONSOLE, "%s", StopMessage(true, "Shutting down core").c_str());
// Update mouse pointer
Host_SetWaitCursor(false);
WARN_LOG(CONSOLE, "%s", StopMessage(true, "Stopping Emu thread ...").c_str());
#ifdef _WIN32
g_EmuThread->WaitForDeath(5000);
DWORD Wait = g_EmuThread->WaitForDeath(5000);
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
@ -469,17 +504,20 @@ THREAD_RETURN EmuThread(void *pArg)
#endif
}
INFO_LOG(CONSOLE, "Stop [Video Thread]: Stop() and Video Loop Ended\n");
INFO_LOG(CONSOLE, "Stop [Video Thread]: Shutting down HW and Plugins\n");
NOTICE_LOG(CONSOLE, "%s", StopMessage(false, "Stop() and Video Loop Ended").c_str());
WARN_LOG(CONSOLE, "%s", StopMessage(false, "Shutting down HW").c_str());
// We have now exited the Video Loop and will shut down
// Write message
if (g_pUpdateFPSDisplay != NULL)
g_pUpdateFPSDisplay("Stopping...");
if (g_pUpdateFPSDisplay != NULL) g_pUpdateFPSDisplay("Stopping...");
HW::Shutdown();
NOTICE_LOG(CONSOLE, "%s", StopMessage(false, "HW shutdown").c_str());
WARN_LOG(CONSOLE, "%s", StopMessage(false, "Shutting down plugins").c_str());
Plugins.ShutdownPlugins();
NOTICE_LOG(CONSOLE, "%s", StopMessage(false, "Plugins shutdown").c_str());
#ifdef _WIN32
gpuShutdownCall.Set();
@ -495,9 +533,25 @@ THREAD_RETURN EmuThread(void *pArg)
if (cpuThread)
{
WARN_LOG(CONSOLE, "%s", StopMessage(true, "Stopping CPU thread ...").c_str());
// There is a CPU thread - join it.
#ifdef _WIN32
cpuThread->WaitForDeath(3000);
#ifdef _WIN32
DWORD Wait = cpuThread->WaitForDeath(3000);
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
@ -508,8 +562,10 @@ THREAD_RETURN EmuThread(void *pArg)
// The hardware is uninitialized
g_bHwInit = false;
INFO_LOG(MASTER_LOG, "EmuThread exited");
g_bStopping = false;
NOTICE_LOG(CONSOLE, "%s", StopMessage(true, "Main thread stopped").c_str());
NOTICE_LOG(CONSOLE, "Stop [Main Thread]\t\t---- Shutdown complete ----");
Host_UpdateMainFrame();
@ -545,6 +601,8 @@ EState GetState()
{
if (CCPU::IsStepping())
return CORE_PAUSE;
else if (g_bStopping)
return CORE_STOPPING;
else
return CORE_RUN;
}
@ -752,7 +810,7 @@ void Callback_VideoCopiedToXFB(bool video_update)
// Callback_DSPLog
// WARNING - THIS MAY EXECUTED FROM DSP THREAD
// WARNING - THIS MAY BE EXECUTED FROM DSP THREAD
void Callback_DSPLog(const TCHAR* _szMessage, int _v)
{
GENERIC_LOG(LogTypes::AUDIO, (LogTypes::LOG_LEVELS)_v, _szMessage);
@ -760,7 +818,7 @@ void Callback_VideoCopiedToXFB(bool video_update)
// Callback_DSPInterrupt
// WARNING - THIS MAY EXECUTED FROM DSP THREAD
// WARNING - THIS MAY BE EXECUTED FROM DSP THREAD
void Callback_DSPInterrupt()
{
DSP::GenerateDSPInterruptFromPlugin(DSP::INT_DSP);
@ -831,4 +889,4 @@ const SCoreStartupParameter& GetStartupParameter() {
return SConfig::GetInstance().m_LocalCoreStartupParameter;
}
} // end of namespace Core
} // Core

3
Source/Core/Core/Src/Core.h
View File

@ -38,12 +38,15 @@ namespace Core
CORE_UNINITIALIZED,
CORE_PAUSE,
CORE_RUN,
CORE_STOPPING
};
// Init core
bool Init();
void Stop();
std::string StopMessage(bool, std::string);
bool isRunning();
void SetState(EState _State);

3
Source/Core/Core/Src/Debugger/PPCDebugInterface.cpp
View File

@ -30,6 +30,9 @@
void PPCDebugInterface::disasm(unsigned int address, char *dest, int max_size)
{
// Memory::ReadUnchecked_U32 seemed to crash on shutdown
if (PowerPC::GetState() == PowerPC::CPU_POWERDOWN) return;
if (Core::GetState() != Core::CORE_UNINITIALIZED)
{
if (Memory::IsRAMAddress(address, true))

1
Source/Core/Core/Src/Host.h
View File

@ -36,6 +36,7 @@
// The host can be just a command line app that opens a window, or a full blown debugger
// interface.
void Host_Message(int Id);
void Host_UpdateMainFrame();
void Host_UpdateDisasmDialog();
void Host_UpdateLogDisplay();

16
Source/Core/Core/Src/PluginManager.cpp
View File

@ -36,10 +36,12 @@
#include "ConfigManager.h"
#include "LogManager.h"
#include "Core.h"
#include "Host.h"
#include "FileSearch.h" // Common
#include "FileUtil.h"
#include "StringUtil.h"
#include "MemoryUtil.h"
#include "Setup.h"
// Create the plugin manager class
@ -182,9 +184,8 @@ void CPluginManager::ShutdownPlugins()
if (m_dsp)
{
m_dsp->Shutdown();
// With this option, this is done on boot instead
delete m_dsp;
m_dsp = NULL;
FreeDSP();
NOTICE_LOG(CONSOLE, "%s", Core::StopMessage(false, "Audio shutdown").c_str());
}
}
@ -193,9 +194,8 @@ void CPluginManager::ShutdownVideoPlugin()
if (m_video)
{
m_video->Shutdown();
// With this option, this is done on boot instead
delete m_video;
m_video = NULL;
FreeVideo();
NOTICE_LOG(CONSOLE, "%s", Core::StopMessage(false, "Video shutdown").c_str());
}
}
@ -443,12 +443,16 @@ Common::PluginVideo *CPluginManager::GetVideo()
// the plugins in turn
void CPluginManager::FreeVideo()
{
//Host_Message(VIDEO_DESTROY);
WARN_LOG(CONSOLE, "%s", Core::StopMessage(false, "Will unload video DLL").c_str());
delete m_video;
m_video = NULL;
}
void CPluginManager::FreeDSP()
{
//Host_Message(AUDIO_DESTROY);
WARN_LOG(CONSOLE, "%s", Core::StopMessage(false, "Will unload audio DLL").c_str());
delete m_dsp;
m_dsp = NULL;
}