Emulation/ppsspp
1
0
Fork 0
mirror of https://github.com/hrydgard/ppsspp.git synced 2025-04-02 11:01:50 -04:00
Code Issues Projects Releases Packages Wiki Activity

Supply some extra info in asserts (currently game ID and name).

Browse source 
Google Play Console can now show this along with the assert stacktrace.
This commit is contained in:
Henrik Rydgård 2022-12-16 14:55:56 +01:00
parent 4e41474e85
commit 800bc91a8a
3 changed files with 16 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
Common/Log.cpp
View file

@ -16,6 +16,7 @@
// http://code.google.com/p/dolphin-emu/
#include <string>
#include <mutex>
#include "ppsspp_config.h"
@ -34,6 +35,14 @@
static bool hitAnyAsserts = false;
std::mutex g_extraAssertInfoMutex;
std::string g_extraAssertInfo = "no extra info set";
void SetExtraAssertInfo(const char *info) {
std::lock_guard<std::mutex> guard(g_extraAssertInfoMutex);
g_extraAssertInfo = info;
}
bool HandleAssert(const char *function, const char *file, int line, const char *expression, const char* format, ...) {
// Read message and write it to the log
char text[LOG_BUF_SIZE];
@ -45,7 +54,10 @@ bool HandleAssert(const char *function, const char *file, int line, const char *
// Secondary formatting. Wonder if this can be combined into the vsnprintf somehow.
char formatted[LOG_BUF_SIZE + 128];
snprintf(formatted, sizeof(formatted), "(%s:%s:%d) %s: [%s] %s", file, function, line, caption, expression, text);
{
std::lock_guard<std::mutex> guard(g_extraAssertInfoMutex);
snprintf(formatted, sizeof(formatted), "(%s:%s:%d) %s: [%s] %s (%s)", file, function, line, caption, expression, text, g_extraAssertInfo.c_str());
}
// Normal logging (will also log to Android log)
ERROR_LOG(SYSTEM, "%s", formatted);

1
Common/Log.h
View file

@ -118,6 +118,7 @@ __attribute__((format(printf, 5, 6)))
bool HitAnyAsserts();
void ResetHitAnyAsserts();
void SetExtraAssertInfo(const char *info);
#if defined(__ANDROID__)
// Tricky macro to get the basename, that also works if *built* on Win32.

2
UI/EmuScreen.cpp
View file

@ -263,6 +263,8 @@ void EmuScreen::bootGame(const Path &filename) {
if (!info || info->pending)
return;
SetExtraAssertInfo((info->id + " " + info->GetTitle()).c_str());
if (!info->id.empty()) {
g_Config.loadGameConfig(info->id, info->GetTitle());
// Reset views in case controls are in a different place.