Mirror/citra
1
0
Fork 0
mirror of https://github.com/PabloMK7/citra.git synced 2024-11-19 22:16:36 +00:00
Code Issues Projects Releases Packages Wiki Activity

Add instant log flush option (#209)

Browse source
This commit is contained in:
PabloMK7 2024-07-21 12:36:00 +02:00 committed by GitHub
parent 518f7234f7
commit 63450b662e
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
12 changed files with 45 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/android/app/src/main/java/org/citra/citra_emu/features/settings/model/BooleanSetting.kt
View file

@ -13,7 +13,8 @@ enum class BooleanSetting(
ASYNC_SHADERS("async_shader_compilation", Settings.SECTION_RENDERER, false),
PLUGIN_LOADER("plugin_loader", Settings.SECTION_SYSTEM, false),
ALLOW_PLUGIN_LOADER("allow_plugin_loader", Settings.SECTION_SYSTEM, true),
SWAP_SCREEN("swap_screen", Settings.SECTION_LAYOUT, false);
SWAP_SCREEN("swap_screen", Settings.SECTION_LAYOUT, false),
INSTANT_DEBUG_LOG("instant_debug_log", Settings.SECTION_DEBUG, false);
override var boolean: Boolean = defaultValue

9
src/android/app/src/main/java/org/citra/citra_emu/features/settings/ui/SettingsFragmentPresenter.kt
View file

@ -986,6 +986,15 @@ class SettingsFragmentPresenter(private val fragmentView: SettingsFragmentView)
IntSetting.DEBUG_RENDERER.defaultValue
)
)
add(
SwitchSetting(
BooleanSetting.INSTANT_DEBUG_LOG,
R.string.instant_debug_log,
R.string.instant_debug_log_desc,
BooleanSetting.INSTANT_DEBUG_LOG.key,
BooleanSetting.INSTANT_DEBUG_LOG.defaultValue
)
)
}
}

1
src/android/app/src/main/jni/config.cpp
View file

@ -262,6 +262,7 @@ void Config::ReadValues() {
ReadSetting("Debugging", Settings::values.renderer_debug);
ReadSetting("Debugging", Settings::values.use_gdbstub);
ReadSetting("Debugging", Settings::values.gdbstub_port);
ReadSetting("Debugging", Settings::values.instant_debug_log);
for (const auto& service_module : Service::service_module_map) {
bool use_lle = sdl2_config->GetBoolean("Debugging", "LLE\\" + service_module.name, false);

4
src/android/app/src/main/jni/default_ini.h
View file

@ -357,6 +357,10 @@ renderer_debug =
use_gdbstub=false
gdbstub_port=24689
# Flush log output on every message
# Immediately commits the debug log to file. Use this if citra crashes and the log output is being cut.
instant_debug_log =
# To LLE a service module add "LLE\<module name>=true"
[WebService]

2
src/android/app/src/main/res/values/strings.xml
View file

@ -703,5 +703,7 @@
<string name="miscellaneous">Miscellaneous</string>
<string name="use_artic_base_controller">Use Artic Controller when connected to Artic Base Server</string>
<string name="use_artic_base_controller_desc">Use the controls provided by Artic Base Server when connected to it instead of the configured input device.</string>
<string name="instant_debug_log">Flush log output on every message</string>
<string name="instant_debug_log_desc">Immediately commits the debug log to file. Use this if citra crashes and the log output is being cut.</string>
</resources>

2
src/citra/config.cpp
View file

@ -126,6 +126,7 @@ void Config::ReadValues() {
Settings::values.current_input_profile.udp_input_port =
static_cast<u16>(sdl2_config->GetInteger("Controls", "udp_input_port",
InputCommon::CemuhookUDP::DEFAULT_PORT));
ReadSetting("Controls", Settings::values.use_artic_base_controller);
// Core
ReadSetting("Core", Settings::values.use_cpu_jit);
@ -322,6 +323,7 @@ void Config::ReadValues() {
ReadSetting("Debugging", Settings::values.renderer_debug);
ReadSetting("Debugging", Settings::values.use_gdbstub);
ReadSetting("Debugging", Settings::values.gdbstub_port);
ReadSetting("Debugging", Settings::values.instant_debug_log);
for (const auto& service_module : Service::service_module_map) {
bool use_lle = sdl2_config->GetBoolean("Debugging", "LLE\\" + service_module.name, false);

2
src/citra_qt/configuration/config.cpp
View file

@ -494,6 +494,7 @@ void Config::ReadDebuggingValues() {
ReadBasicSetting(Settings::values.gdbstub_port);
ReadBasicSetting(Settings::values.renderer_debug);
ReadBasicSetting(Settings::values.dump_command_buffers);
ReadBasicSetting(Settings::values.instant_debug_log);
qt_config->beginGroup(QStringLiteral("LLE"));
for (const auto& service_module : Service::service_module_map) {
@ -1031,6 +1032,7 @@ void Config::SaveDebuggingValues() {
WriteBasicSetting(Settings::values.use_gdbstub);
WriteBasicSetting(Settings::values.gdbstub_port);
WriteBasicSetting(Settings::values.renderer_debug);
WriteBasicSetting(Settings::values.instant_debug_log);
qt_config->beginGroup(QStringLiteral("LLE"));
for (const auto& service_module : Settings::values.lle_modules) {

2
src/citra_qt/configuration/configure_debug.cpp
View file

@ -121,6 +121,7 @@ void ConfigureDebug::SetConfiguration() {
SettingsToSlider(Settings::values.cpu_clock_percentage.GetValue()));
ui->clock_display_label->setText(
QStringLiteral("%1%").arg(Settings::values.cpu_clock_percentage.GetValue()));
ui->instant_debug_log->setChecked(Settings::values.instant_debug_log.GetValue());
}
void ConfigureDebug::ApplyConfiguration() {
@ -138,6 +139,7 @@ void ConfigureDebug::ApplyConfiguration() {
Settings::values.delay_start_for_lle_modules = ui->delay_start_for_lle_modules->isChecked();
Settings::values.renderer_debug = ui->toggle_renderer_debug->isChecked();
Settings::values.dump_command_buffers = ui->toggle_dump_command_buffers->isChecked();
Settings::values.instant_debug_log = ui->instant_debug_log->isChecked();
ConfigurationShared::ApplyPerGameSetting(
&Settings::values.cpu_clock_percentage, ui->clock_speed_combo,

10
src/citra_qt/configuration/configure_debug.ui
View file

@ -117,6 +117,16 @@
</item>
</layout>
</item>
<item>
<widget class="QCheckBox" name="instant_debug_log">
<property name="text">
<string>Flush log output on every message</string>
</property>
<property name="toolTip">
<string>&lt;html&gt;&lt;body&gt;Immediately commits the debug log to file. Use this if citra crashes and the log output is being cut.&lt;br&gt;Enabling this feature will decrease performance, only use it for debugging purposes.&lt;/body&gt;&lt;/html&gt;</string>
</property>
</widget>
</item>
</layout>
</widget>
</item>

9
src/common/logging/backend.cpp
View file

@ -68,7 +68,7 @@ public:
}
void Flush() override {
// stderr shouldn't be buffered
std::fflush(stderr);
}
void EnableForStacktrace() override {
@ -263,8 +263,15 @@ public:
!boost::regex_search(FormatLogMessage(new_entry), regex_filter)) {
return;
}
if (Settings::values.instant_debug_log.GetValue()) {
ForEachBackend([&new_entry](Backend& backend) {
backend.Write(new_entry);
backend.Flush();
});
} else {
message_queue.EmplaceWait(new_entry);
}
}
private:
Impl(const std::string& file_backend_filename, const Filter& filter_)

1
src/common/settings.cpp
View file

@ -147,6 +147,7 @@ void LogSettings() {
log_setting("Debugging_DelayStartForLLEModules", values.delay_start_for_lle_modules.GetValue());
log_setting("Debugging_UseGdbstub", values.use_gdbstub.GetValue());
log_setting("Debugging_GdbstubPort", values.gdbstub_port.GetValue());
log_setting("Debugging_InstantDebugLog", values.instant_debug_log.GetValue());
}
bool IsConfiguringGlobal() {

1
src/common/settings.h
View file

@ -542,6 +542,7 @@ struct Values {
Setting<bool> delay_start_for_lle_modules{true, "delay_start_for_lle_modules"};
Setting<bool> use_gdbstub{false, "use_gdbstub"};
Setting<u16> gdbstub_port{24689, "gdbstub_port"};
Setting<bool> instant_debug_log{false, "instant_debug_log"};
// Miscellaneous
Setting<std::string> log_filter{"*:Info", "log_filter"};