dave/openttd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Try to do non-main thread crash save/screenshot in main thread

Browse Source
This commit is contained in:
Jonathan G Rennison
2018-08-26 22:15:21 +01:00
parent 5d61b27faa
commit 743432e7f0
3 changed files with 46 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
src/crashlog.cpp
View File

@@ -78,6 +78,7 @@
/* static */ const char *CrashLog::message = NULL;
/* static */ char *CrashLog::gamelog_buffer = NULL;
/* static */ const char *CrashLog::gamelog_last = NULL;
/* static */ const CrashLog *CrashLog::main_thread_pending_crashlog = NULL;
char *CrashLog::LogCompiler(char *buffer, const char *last) const
{
@@ -534,8 +535,33 @@ bool CrashLog::MakeCrashLog() const
printf("Crash dump written to %s. Please add this file to any bug reports.\n\n", filename);
}
if (IsNonMainThread()) {
printf("Asking main thread to write crash savegame and screenshot...\n\n");
CrashLog::main_thread_pending_crashlog = this;
_exit_game = true;
CSleep(60000);
if (!CrashLog::main_thread_pending_crashlog) return ret;
printf("Main thread did not write crash savegame and screenshot within 60s, trying it from this thread...\n\n");
}
CrashLog::main_thread_pending_crashlog = nullptr;
bret = CrashLog::MakeCrashSavegameAndScreenshot();
if (!bret) ret = false;
return ret;
}
/**
* Makes a crash dump and crash savegame. It uses DEBUG to write
* information like paths to the console.
* @return true when everything is made successfully.
*/
bool CrashLog::MakeCrashSavegameAndScreenshot() const
{
char filename[MAX_PATH];
bool ret = true;
printf("Writing crash savegame...\n");
bret = this->WriteSavegame(filename, lastof(filename));
bool bret = this->WriteSavegame(filename, lastof(filename));
if (bret) {
printf("Crash savegame written to %s. Please add this file and the last (auto)save to any bug reports.\n\n", filename);
} else {
@@ -555,6 +581,18 @@ bool CrashLog::MakeCrashLog() const
return ret;
}
/* static */ void CrashLog::MainThreadExitCheckPendingCrashlog()
{
const CrashLog *cl = CrashLog::main_thread_pending_crashlog;
if (cl) {
CrashLog::main_thread_pending_crashlog = nullptr;
cl->MakeCrashSavegameAndScreenshot();
CrashLog::AfterCrashLogCleanup();
abort();
}
}
/**
* Sets a message for the error message handler.
* @param message The error message of the error.