From 8a219d64d3eb7d2aa7d6f0a3e316da3e4625bf13 Mon Sep 17 00:00:00 2001 From: lizzie Date: Sun, 15 Mar 2026 23:49:48 +0000 Subject: [PATCH] logging: refactor --- .../app/src/main/jni/android_config.cpp | 2 +- .../src/main/jni/emu_window/emu_window.cpp | 2 +- src/android/app/src/main/jni/native.cpp | 4 +- .../app/src/main/jni/native_config.cpp | 2 +- src/android/app/src/main/jni/native_log.cpp | 2 +- .../apps/audio_renderer/audio_renderer.cpp | 2 +- .../adsp/apps/opus/opus_decoder.cpp | 2 +- src/audio_core/audio_snoop_manager.cpp | 2 +- src/audio_core/audio_system_manager.cpp | 2 +- src/audio_core/common/fft.cpp | 2 +- src/audio_core/common/loudness_calculator.cpp | 2 +- src/audio_core/device/shared_ring_buffer.cpp | 2 +- src/audio_core/in/audio_in_system.cpp | 2 +- src/audio_core/out/audio_out_system.cpp | 2 +- .../renderer/command/data_source/decode.cpp | 2 +- .../renderer/command/mix/mix_ramp.cpp | 2 +- .../renderer/command/mix/volume.cpp | 2 +- src/audio_core/renderer/nodes/node_states.cpp | 2 +- src/audio_core/sink/cubeb_sink.cpp | 2 +- src/audio_core/sink/oboe_sink.cpp | 2 +- src/audio_core/sink/openal_sink.cpp | 2 +- src/audio_core/sink/sdl2_sink.cpp | 2 +- src/audio_core/sink/sink_details.cpp | 2 +- src/citron/applets/qt_software_keyboard.cpp | 2 +- src/citron/bootmanager.h | 2 +- src/citron/compatdb.cpp | 2 +- src/citron/configuration/configure_debug.cpp | 4 +- src/citron/configuration/configure_dialog.cpp | 2 +- .../configuration/configure_graphics.cpp | 2 +- .../configuration/configure_motion_touch.cpp | 2 +- .../configure_per_game_addons.cpp | 2 +- src/citron/configuration/configure_ui.cpp | 2 +- src/citron/configuration/input_profiles.cpp | 2 +- src/citron/configuration/qt_config.cpp | 2 +- src/citron/configuration/shared_widget.cpp | 2 +- src/citron/custom_metadata.cpp | 2 +- src/citron/debugger/console.cpp | 2 +- src/citron/debugger/memory_viewer.cpp | 2 +- src/citron/game_list.cpp | 2 +- src/citron/game_list_p.h | 2 +- src/citron/hotkey_profile_manager.cpp | 2 +- src/citron/main.cpp | 4 +- .../mod_manager/mod_downloader_dialog.cpp | 2 +- src/citron/multiplayer/chat_room.cpp | 2 +- src/citron/multiplayer/client_room.cpp | 2 +- src/citron/multiplayer/direct_connect.cpp | 2 +- src/citron/multiplayer/host_room.cpp | 2 +- src/citron/multiplayer/lobby.cpp | 2 +- src/citron/multiplayer/state.cpp | 2 +- src/citron/play_time_manager.cpp | 2 +- src/citron/qt_common.cpp | 2 +- src/citron/setup_wizard.cpp | 2 +- src/citron/updater/updater_service.cpp | 2 +- src/citron/util/util.cpp | 2 +- src/citron/vk_device_info.cpp | 2 +- src/citron_cmd/citron.cpp | 4 +- src/citron_cmd/emu_window/emu_window_sdl2.cpp | 2 +- .../emu_window/emu_window_sdl2_null.cpp | 2 +- .../emu_window/emu_window_sdl2_vk.cpp | 2 +- src/citron_cmd/sdl_config.cpp | 2 +- src/common/CMakeLists.txt | 12 +- .../android/applets/software_keyboard.cpp | 2 +- src/common/assert.cpp | 2 +- src/common/assert.h | 2 +- src/common/fs/file.cpp | 2 +- src/common/fs/fs.cpp | 2 +- src/common/fs/path_util.cpp | 2 +- src/common/host_memory.cpp | 2 +- src/common/input.h | 2 +- src/common/linux/gamemode.cpp | 2 +- src/common/log_class.inc | 99 +++++ src/common/logging.cpp | 395 ++++++++++++++++++ src/common/logging.h | 83 ++++ src/common/logging/backend.cpp | 353 ---------------- src/common/logging/backend.h | 28 -- src/common/logging/filter.cpp | 242 ----------- src/common/logging/filter.h | 64 --- src/common/logging/formatter.h | 22 - src/common/logging/log.h | 67 --- src/common/logging/log_entry.h | 26 -- src/common/logging/text_formatter.cpp | 144 ------- src/common/logging/text_formatter.h | 20 - src/common/logging/types.h | 135 ------ src/common/param_package.cpp | 2 +- src/common/settings.cpp | 2 +- src/common/thread.cpp | 2 +- src/common/time_zone.cpp | 2 +- src/common/x64/cpu_detect.cpp | 2 +- src/common/xci_trimmer.cpp | 2 +- src/common/zstd_compression.cpp | 2 +- src/core/arm/arm_interface.cpp | 2 +- src/core/arm/dynarmic/dynarmic_cp15.cpp | 2 +- src/core/core.cpp | 2 +- src/core/crypto/aes_util.cpp | 2 +- src/core/crypto/key_manager.cpp | 2 +- src/core/crypto/partition_data_manager.cpp | 2 +- src/core/debugger/debugger.cpp | 2 +- src/core/debugger/gdbstub.cpp | 2 +- src/core/file_sys/card_image.cpp | 2 +- src/core/file_sys/content_archive.cpp | 2 +- src/core/file_sys/control_metadata.cpp | 2 +- .../directory_save_data_filesystem.cpp | 2 +- src/core/file_sys/ips_layer.cpp | 2 +- src/core/file_sys/nca_metadata.cpp | 2 +- src/core/file_sys/partition_filesystem.cpp | 2 +- src/core/file_sys/patch_manager.cpp | 2 +- src/core/file_sys/program_metadata.cpp | 2 +- src/core/file_sys/registered_cache.cpp | 2 +- src/core/file_sys/romfs_factory.cpp | 2 +- .../file_sys/savedata_extra_data_accessor.cpp | 2 +- src/core/file_sys/savedata_factory.cpp | 2 +- src/core/file_sys/submission_package.cpp | 2 +- .../system_archive/system_archive.cpp | 2 +- .../system_archive/system_version.cpp | 2 +- src/core/file_sys/vfs/vfs_real.cpp | 2 +- src/core/frontend/applets/cabinet.cpp | 2 +- src/core/frontend/applets/controller.cpp | 2 +- src/core/frontend/applets/error.cpp | 2 +- src/core/frontend/applets/general.cpp | 2 +- src/core/frontend/applets/mii_edit.cpp | 2 +- .../frontend/applets/software_keyboard.cpp | 2 +- src/core/frontend/applets/web_browser.cpp | 2 +- src/core/hle/kernel/k_scheduler.cpp | 2 +- src/core/hle/kernel/k_server_session.cpp | 2 +- src/core/hle/kernel/k_thread.cpp | 2 +- src/core/hle/kernel/kernel.cpp | 2 +- .../hle/kernel/svc/svc_interrupt_event.cpp | 2 +- src/core/hle/kernel/svc/svc_processor.cpp | 2 +- src/core/hle/service/acc/acc.cpp | 2 +- .../service/am/frontend/applet_cabinet.cpp | 2 +- .../service/am/frontend/applet_controller.cpp | 2 +- .../hle/service/am/frontend/applet_error.cpp | 2 +- .../service/am/frontend/applet_general.cpp | 2 +- .../service/am/frontend/applet_mii_edit.cpp | 2 +- .../am/frontend/applet_web_browser.cpp | 2 +- .../service/am/service/self_controller.cpp | 2 +- .../hle/service/aoc/addon_content_manager.cpp | 2 +- .../service/aoc/contents_service_manager.cpp | 2 +- src/core/hle/service/apm/apm_controller.cpp | 2 +- src/core/hle/service/apm/apm_interface.cpp | 2 +- .../hle/service/audio/audio_controller.cpp | 2 +- .../service/audio/audio_device_service.cpp | 2 +- .../hle/service/audio/audio_snoop_manager.cpp | 2 +- .../service/audio/audio_system_manager.cpp | 2 +- src/core/hle/service/audio/codecctl.cpp | 2 +- src/core/hle/service/bcat/backend/backend.cpp | 2 +- .../service/bcat/news/download_context.cpp | 2 +- src/core/hle/service/btdrv/btdrv.cpp | 2 +- src/core/hle/service/btm/btm_system.cpp | 2 +- src/core/hle/service/btm/btm_system_core.cpp | 2 +- src/core/hle/service/btm/btm_user.cpp | 2 +- src/core/hle/service/btm/btm_user_core.cpp | 2 +- src/core/hle/service/caps/caps_a.cpp | 2 +- src/core/hle/service/caps/caps_c.cpp | 2 +- src/core/hle/service/caps/caps_manager.cpp | 2 +- src/core/hle/service/caps/caps_ss.cpp | 2 +- src/core/hle/service/caps/caps_su.cpp | 2 +- src/core/hle/service/caps/caps_u.cpp | 2 +- src/core/hle/service/erpt/erpt.cpp | 2 +- src/core/hle/service/fatal/fatal.cpp | 2 +- .../hle/service/filesystem/fsp/fsp_srv.cpp | 2 +- src/core/hle/service/friend/friend.cpp | 2 +- src/core/hle/service/glue/arp.cpp | 2 +- src/core/hle/service/glue/bgtc.cpp | 2 +- src/core/hle/service/glue/notif.cpp | 2 +- .../hle/service/grc/continuous_recorder.cpp | 2 +- .../hid/active_vibration_device_list.cpp | 2 +- src/core/hle/service/hid/applet_resource.cpp | 2 +- src/core/hle/service/hid/hid_server.cpp | 2 +- src/core/hle/service/hid/hidbus.cpp | 2 +- src/core/hle/service/hle_ipc.cpp | 2 +- src/core/hle/service/jit/jit_context.cpp | 2 +- src/core/hle/service/lbl/lbl.cpp | 2 +- src/core/hle/service/ldn/lan_discovery.h | 2 +- src/core/hle/service/lm/lm.cpp | 2 +- src/core/hle/service/mig/mig.cpp | 2 +- src/core/hle/service/mii/mii.cpp | 2 +- .../hle/service/mii/mii_database_manager.cpp | 2 +- src/core/hle/service/mii/mii_manager.cpp | 2 +- src/core/hle/service/mm/mm_u.cpp | 2 +- src/core/hle/service/mnpp/mnpp_app.cpp | 2 +- src/core/hle/service/nex/nex.cpp | 2 +- .../hle/service/nfc/common/amiibo_crypto.cpp | 2 +- src/core/hle/service/nfc/common/device.cpp | 2 +- .../hle/service/nfc/common/device_manager.cpp | 2 +- src/core/hle/service/nfc/nfc.cpp | 2 +- src/core/hle/service/nfc/nfc_interface.cpp | 2 +- src/core/hle/service/nfp/nfp.cpp | 2 +- src/core/hle/service/nfp/nfp_interface.cpp | 2 +- src/core/hle/service/ns/notify_service.cpp | 2 +- .../service/ns/platform_service_manager.cpp | 2 +- src/core/hle/service/ns/query_service.cpp | 2 +- src/core/hle/service/nvdrv/core/nvmap.cpp | 2 +- .../service/nvdrv/devices/nvdisp_disp0.cpp | 2 +- .../service/nvdrv/devices/nvhost_as_gpu.cpp | 2 +- .../hle/service/nvdrv/devices/nvhost_ctrl.cpp | 2 +- .../service/nvdrv/devices/nvhost_ctrl_gpu.cpp | 2 +- .../hle/service/nvdrv/devices/nvhost_gpu.cpp | 2 +- .../service/nvdrv/devices/nvhost_nvdec.cpp | 2 +- .../nvdrv/devices/nvhost_nvdec_common.cpp | 2 +- .../service/nvdrv/devices/nvhost_nvjpg.cpp | 2 +- .../hle/service/nvdrv/devices/nvhost_vic.cpp | 2 +- src/core/hle/service/nvdrv/devices/nvmap.cpp | 2 +- .../hle/service/nvdrv/nvdrv_interface.cpp | 2 +- src/core/hle/service/nvdrv/nvmemp.cpp | 2 +- .../nvnflinger/buffer_item_consumer.cpp | 2 +- .../nvnflinger/buffer_queue_consumer.cpp | 2 +- .../nvnflinger/buffer_queue_producer.cpp | 2 +- .../hle/service/nvnflinger/consumer_base.cpp | 2 +- src/core/hle/service/prepo/prepo.cpp | 2 +- src/core/hle/service/ptm/psm.cpp | 2 +- src/core/hle/service/service.cpp | 2 +- .../set/firmware_debug_settings_server.cpp | 2 +- src/core/hle/service/set/settings_server.cpp | 2 +- .../service/set/system_settings_server.cpp | 2 +- src/core/hle/service/sm/sm_controller.cpp | 2 +- .../hle/service/sockets/sockets_translate.cpp | 2 +- src/core/hle/service/spl/spl_module.cpp | 2 +- src/core/hle/service/ssl/ssl_backend_none.cpp | 2 +- src/core/hle/service/usb/usb.cpp | 2 +- src/core/internal_network/network.cpp | 2 +- .../internal_network/network_interface.cpp | 2 +- src/core/internal_network/socket_proxy.cpp | 2 +- .../loader/deconstructed_rom_directory.cpp | 2 +- src/core/loader/loader.cpp | 2 +- src/core/loader/nro.cpp | 2 +- src/core/loader/nso.cpp | 2 +- src/core/memory.cpp | 2 +- src/core/perf_stats.cpp | 2 +- src/core/tools/freezer.cpp | 2 +- src/dedicated_room/citron_room.cpp | 4 +- src/frontend_common/config.cpp | 2 +- src/hid_core/resource_manager.cpp | 2 +- src/hid_core/resources/npad/npad.cpp | 2 +- .../touch_screen/touch_screen_resource.cpp | 2 +- src/input_common/drivers/gc_adapter.cpp | 2 +- src/input_common/drivers/sdl_driver.cpp | 2 +- src/input_common/drivers/tas_input.cpp | 2 +- src/input_common/drivers/udp_client.cpp | 2 +- src/input_common/drivers/virtual_amiibo.cpp | 2 +- src/input_common/helpers/joycon_driver.cpp | 2 +- .../joycon_protocol/common_protocol.cpp | 2 +- .../joycon_protocol/generic_functions.cpp | 2 +- .../helpers/joycon_protocol/irs.cpp | 2 +- .../helpers/joycon_protocol/nfc.cpp | 2 +- .../helpers/joycon_protocol/poller.cpp | 2 +- .../helpers/joycon_protocol/ringcon.cpp | 2 +- .../helpers/joycon_protocol/rumble.cpp | 2 +- src/input_common/helpers/udp_protocol.cpp | 2 +- src/input_common/input_engine.cpp | 2 +- src/network/network.cpp | 2 +- src/network/room.cpp | 2 +- src/network/verify_user.h | 2 +- .../backend/spirv/emit_spirv.cpp | 2 +- src/tests/common/param_package.cpp | 2 +- src/video_core/engines/fermi_2d.cpp | 2 +- src/video_core/engines/kepler_compute.cpp | 2 +- src/video_core/engines/kepler_memory.cpp | 2 +- src/video_core/engines/maxwell_dma.cpp | 2 +- src/video_core/engines/puller.cpp | 2 +- src/video_core/frame_skipping.cpp | 2 +- src/video_core/host1x/ffmpeg/ffmpeg.cpp | 2 +- src/video_core/host1x/vic.cpp | 2 +- src/video_core/macro/macro_interpreter.cpp | 2 +- src/video_core/macro/macro_jit_x64.cpp | 2 +- src/video_core/memory_manager.cpp | 2 +- src/video_core/query_cache/query_cache.h | 2 +- src/video_core/renderer_base.cpp | 2 +- .../renderer_vulkan/maxwell_to_vk.cpp | 2 +- .../renderer_vulkan/pipeline_statistics.cpp | 2 +- .../renderer_vulkan/present/taa.cpp | 2 +- .../renderer_vulkan/renderer_vulkan.cpp | 2 +- .../renderer_vulkan/vk_rasterizer.cpp | 2 +- .../renderer_vulkan/vk_swapchain.cpp | 2 +- .../renderer_vulkan/vk_turbo_mode.cpp | 2 +- .../renderer_vulkan/vk_update_descriptor.cpp | 2 +- .../renderer_vulkan/vk_zbc_clear.cpp | 2 +- src/video_core/shader_environment.cpp | 2 +- src/video_core/surface.h | 2 +- .../texture_cache/format_lookup_table.cpp | 2 +- src/video_core/video_core.cpp | 2 +- .../nsight_aftermath_tracker.cpp | 2 +- .../vulkan_common/vulkan_debug_callback.cpp | 2 +- src/video_core/vulkan_common/vulkan_device.h | 2 +- .../vulkan_common/vulkan_instance.cpp | 2 +- .../vulkan_common/vulkan_library.cpp | 2 +- .../vulkan_common/vulkan_memory_allocator.cpp | 2 +- .../vulkan_common/vulkan_surface.cpp | 2 +- .../vulkan_common/vulkan_wrapper.cpp | 2 +- src/video_core/zbc_manager.cpp | 2 +- src/web_service/announce_room_json.cpp | 2 +- src/web_service/verify_user_jwt.cpp | 2 +- src/web_service/web_backend.cpp | 2 +- 293 files changed, 863 insertions(+), 1395 deletions(-) create mode 100644 src/common/log_class.inc create mode 100644 src/common/logging.cpp create mode 100644 src/common/logging.h delete mode 100644 src/common/logging/backend.cpp delete mode 100644 src/common/logging/backend.h delete mode 100644 src/common/logging/filter.cpp delete mode 100644 src/common/logging/filter.h delete mode 100644 src/common/logging/formatter.h delete mode 100644 src/common/logging/log.h delete mode 100644 src/common/logging/log_entry.h delete mode 100644 src/common/logging/text_formatter.cpp delete mode 100644 src/common/logging/text_formatter.h delete mode 100644 src/common/logging/types.h diff --git a/src/android/app/src/main/jni/android_config.cpp b/src/android/app/src/main/jni/android_config.cpp index a79a64afbb..1d1784376b 100644 --- a/src/android/app/src/main/jni/android_config.cpp +++ b/src/android/app/src/main/jni/android_config.cpp @@ -1,7 +1,7 @@ // SPDX-FileCopyrightText: 2023 yuzu Emulator Project // SPDX-License-Identifier: GPL-2.0-or-later -#include +#include #include #include "android_config.h" #include "android_settings.h" diff --git a/src/android/app/src/main/jni/emu_window/emu_window.cpp b/src/android/app/src/main/jni/emu_window/emu_window.cpp index 06db553691..5420d14fea 100644 --- a/src/android/app/src/main/jni/emu_window/emu_window.cpp +++ b/src/android/app/src/main/jni/emu_window/emu_window.cpp @@ -4,7 +4,7 @@ #include #include "common/android/id_cache.h" -#include "common/logging/log.h" +#include "common/logging.h" #include "input_common/drivers/android.h" #include "input_common/drivers/touch_screen.h" #include "input_common/drivers/virtual_amiibo.h" diff --git a/src/android/app/src/main/jni/native.cpp b/src/android/app/src/main/jni/native.cpp index fec2e81a4b..ff319aea34 100644 --- a/src/android/app/src/main/jni/native.cpp +++ b/src/android/app/src/main/jni/native.cpp @@ -27,8 +27,8 @@ #include "common/detached_tasks.h" #include "common/dynamic_library.h" #include "common/fs/path_util.h" -#include "common/logging/backend.h" -#include "common/logging/log.h" +#include "common/logging.h" +#include "common/logging.h" #include "common/microprofile.h" #include "common/scm_rev.h" #include "common/scope_exit.h" diff --git a/src/android/app/src/main/jni/native_config.cpp b/src/android/app/src/main/jni/native_config.cpp index 619a1c887b..7293978c51 100644 --- a/src/android/app/src/main/jni/native_config.cpp +++ b/src/android/app/src/main/jni/native_config.cpp @@ -9,7 +9,7 @@ #include "android_settings.h" #include "common/android/android_common.h" #include "common/android/id_cache.h" -#include "common/logging/log.h" +#include "common/logging.h" #include "common/settings.h" #include "frontend_common/config.h" #include "native.h" diff --git a/src/android/app/src/main/jni/native_log.cpp b/src/android/app/src/main/jni/native_log.cpp index e076d4ab20..c652e23014 100644 --- a/src/android/app/src/main/jni/native_log.cpp +++ b/src/android/app/src/main/jni/native_log.cpp @@ -2,7 +2,7 @@ // SPDX-License-Identifier: GPL-2.0-or-later #include -#include +#include #include extern "C" { diff --git a/src/audio_core/adsp/apps/audio_renderer/audio_renderer.cpp b/src/audio_core/adsp/apps/audio_renderer/audio_renderer.cpp index 7a76c3d0bf..a0d5fe7eb4 100644 --- a/src/audio_core/adsp/apps/audio_renderer/audio_renderer.cpp +++ b/src/audio_core/adsp/apps/audio_renderer/audio_renderer.cpp @@ -8,7 +8,7 @@ #include "audio_core/audio_core.h" #include "audio_core/common/common.h" #include "audio_core/sink/sink.h" -#include "common/logging/log.h" +#include "common/logging.h" #include "common/microprofile.h" #include "common/thread.h" #include "core/core.h" diff --git a/src/audio_core/adsp/apps/opus/opus_decoder.cpp b/src/audio_core/adsp/apps/opus/opus_decoder.cpp index 75f0fb9ad9..2b243e529e 100644 --- a/src/audio_core/adsp/apps/opus/opus_decoder.cpp +++ b/src/audio_core/adsp/apps/opus/opus_decoder.cpp @@ -9,7 +9,7 @@ #include "audio_core/adsp/apps/opus/shared_memory.h" #include "audio_core/audio_core.h" #include "audio_core/common/common.h" -#include "common/logging/log.h" +#include "common/logging.h" #include "common/microprofile.h" #include "common/thread.h" #include "core/core.h" diff --git a/src/audio_core/audio_snoop_manager.cpp b/src/audio_core/audio_snoop_manager.cpp index 75b7a06129..1d4387609d 100644 --- a/src/audio_core/audio_snoop_manager.cpp +++ b/src/audio_core/audio_snoop_manager.cpp @@ -2,7 +2,7 @@ // SPDX-License-Identifier: GPL-2.0-or-later #include "audio_core/audio_snoop_manager.h" -#include "common/logging/log.h" +#include "common/logging.h" #include "core/core.h" #include "core/hle/result.h" diff --git a/src/audio_core/audio_system_manager.cpp b/src/audio_core/audio_system_manager.cpp index aaa88e8e67..48112625d4 100644 --- a/src/audio_core/audio_system_manager.cpp +++ b/src/audio_core/audio_system_manager.cpp @@ -4,7 +4,7 @@ #include #include "audio_core/audio_system_manager.h" -#include "common/logging/log.h" +#include "common/logging.h" #include "core/core.h" #include "core/hle/result.h" #include "core/hle/service/audio/errors.h" diff --git a/src/audio_core/common/fft.cpp b/src/audio_core/common/fft.cpp index f0f3e57e28..417749f3a8 100644 --- a/src/audio_core/common/fft.cpp +++ b/src/audio_core/common/fft.cpp @@ -6,7 +6,7 @@ #include #include "audio_core/common/fft.h" -#include "common/logging/log.h" +#include "common/logging.h" namespace AudioCore { diff --git a/src/audio_core/common/loudness_calculator.cpp b/src/audio_core/common/loudness_calculator.cpp index c9388aa9d3..1aaf87ac04 100644 --- a/src/audio_core/common/loudness_calculator.cpp +++ b/src/audio_core/common/loudness_calculator.cpp @@ -6,7 +6,7 @@ #include #include "audio_core/common/loudness_calculator.h" -#include "common/logging/log.h" +#include "common/logging.h" namespace AudioCore { diff --git a/src/audio_core/device/shared_ring_buffer.cpp b/src/audio_core/device/shared_ring_buffer.cpp index ab13a83a85..703623aaff 100644 --- a/src/audio_core/device/shared_ring_buffer.cpp +++ b/src/audio_core/device/shared_ring_buffer.cpp @@ -3,7 +3,7 @@ #include "audio_core/device/shared_ring_buffer.h" #include "audio_core/renderer/final_output_recorder/final_output_recorder_buffer.h" -#include "common/logging/log.h" +#include "common/logging.h" #include "core/memory.h" namespace AudioCore { diff --git a/src/audio_core/in/audio_in_system.cpp b/src/audio_core/in/audio_in_system.cpp index 49ee60b5d9..6465ec5979 100644 --- a/src/audio_core/in/audio_in_system.cpp +++ b/src/audio_core/in/audio_in_system.cpp @@ -6,7 +6,7 @@ #include "audio_core/audio_event.h" #include "audio_core/audio_manager.h" #include "audio_core/in/audio_in_system.h" -#include "common/logging/log.h" +#include "common/logging.h" #include "core/core.h" #include "core/core_timing.h" #include "core/hle/kernel/k_event.h" diff --git a/src/audio_core/out/audio_out_system.cpp b/src/audio_core/out/audio_out_system.cpp index 7b3ff4e881..fbe831ef35 100644 --- a/src/audio_core/out/audio_out_system.cpp +++ b/src/audio_core/out/audio_out_system.cpp @@ -6,7 +6,7 @@ #include "audio_core/audio_event.h" #include "audio_core/audio_manager.h" #include "audio_core/out/audio_out_system.h" -#include "common/logging/log.h" +#include "common/logging.h" #include "core/core.h" #include "core/core_timing.h" #include "core/hle/kernel/k_event.h" diff --git a/src/audio_core/renderer/command/data_source/decode.cpp b/src/audio_core/renderer/command/data_source/decode.cpp index 905613a5a8..305fe6a725 100644 --- a/src/audio_core/renderer/command/data_source/decode.cpp +++ b/src/audio_core/renderer/command/data_source/decode.cpp @@ -7,7 +7,7 @@ #include "audio_core/renderer/command/data_source/decode.h" #include "audio_core/renderer/command/resample/resample.h" #include "common/fixed_point.h" -#include "common/logging/log.h" +#include "common/logging.h" #include "common/scratch_buffer.h" #include "core/guest_memory.h" #include "core/memory.h" diff --git a/src/audio_core/renderer/command/mix/mix_ramp.cpp b/src/audio_core/renderer/command/mix/mix_ramp.cpp index 2f6500da5f..774458ac10 100644 --- a/src/audio_core/renderer/command/mix/mix_ramp.cpp +++ b/src/audio_core/renderer/command/mix/mix_ramp.cpp @@ -4,7 +4,7 @@ #include "audio_core/adsp/apps/audio_renderer/command_list_processor.h" #include "audio_core/renderer/command/mix/mix_ramp.h" #include "common/fixed_point.h" -#include "common/logging/log.h" +#include "common/logging.h" namespace AudioCore::Renderer { diff --git a/src/audio_core/renderer/command/mix/volume.cpp b/src/audio_core/renderer/command/mix/volume.cpp index 92baf6cc33..62f49ae8eb 100644 --- a/src/audio_core/renderer/command/mix/volume.cpp +++ b/src/audio_core/renderer/command/mix/volume.cpp @@ -4,7 +4,7 @@ #include "audio_core/adsp/apps/audio_renderer/command_list_processor.h" #include "audio_core/renderer/command/mix/volume.h" #include "common/fixed_point.h" -#include "common/logging/log.h" +#include "common/logging.h" namespace AudioCore::Renderer { /** diff --git a/src/audio_core/renderer/nodes/node_states.cpp b/src/audio_core/renderer/nodes/node_states.cpp index 028a58041a..cef07c6cc2 100644 --- a/src/audio_core/renderer/nodes/node_states.cpp +++ b/src/audio_core/renderer/nodes/node_states.cpp @@ -2,7 +2,7 @@ // SPDX-License-Identifier: GPL-2.0-or-later #include "audio_core/renderer/nodes/node_states.h" -#include "common/logging/log.h" +#include "common/logging.h" namespace AudioCore::Renderer { diff --git a/src/audio_core/sink/cubeb_sink.cpp b/src/audio_core/sink/cubeb_sink.cpp index bec7c615d3..b1348c8dd7 100644 --- a/src/audio_core/sink/cubeb_sink.cpp +++ b/src/audio_core/sink/cubeb_sink.cpp @@ -7,7 +7,7 @@ #include "audio_core/common/common.h" #include "audio_core/sink/cubeb_sink.h" #include "audio_core/sink/sink_stream.h" -#include "common/logging/log.h" +#include "common/logging.h" #include "common/scope_exit.h" #include "core/core.h" diff --git a/src/audio_core/sink/oboe_sink.cpp b/src/audio_core/sink/oboe_sink.cpp index 466a9cc8e0..362092dc84 100644 --- a/src/audio_core/sink/oboe_sink.cpp +++ b/src/audio_core/sink/oboe_sink.cpp @@ -9,7 +9,7 @@ #include "audio_core/common/common.h" #include "audio_core/sink/oboe_sink.h" #include "audio_core/sink/sink_stream.h" -#include "common/logging/log.h" +#include "common/logging.h" #include "common/scope_exit.h" #include "core/core.h" diff --git a/src/audio_core/sink/openal_sink.cpp b/src/audio_core/sink/openal_sink.cpp index 8bc0c3fe06..45c535770c 100644 --- a/src/audio_core/sink/openal_sink.cpp +++ b/src/audio_core/sink/openal_sink.cpp @@ -12,7 +12,7 @@ #include "audio_core/sink/openal_sink.h" #include "audio_core/sink/sink.h" #include "audio_core/sink/sink_stream.h" -#include "common/logging/log.h" +#include "common/logging.h" #include "common/scope_exit.h" #include "core/core.h" diff --git a/src/audio_core/sink/sdl2_sink.cpp b/src/audio_core/sink/sdl2_sink.cpp index 9697f8ab16..39608ad1d1 100644 --- a/src/audio_core/sink/sdl2_sink.cpp +++ b/src/audio_core/sink/sdl2_sink.cpp @@ -8,7 +8,7 @@ #include "audio_core/common/common.h" #include "audio_core/sink/sdl2_sink.h" #include "audio_core/sink/sink_stream.h" -#include "common/logging/log.h" +#include "common/logging.h" #include "common/scope_exit.h" #include "core/core.h" diff --git a/src/audio_core/sink/sink_details.cpp b/src/audio_core/sink/sink_details.cpp index 91b6931006..cd95c04e2a 100644 --- a/src/audio_core/sink/sink_details.cpp +++ b/src/audio_core/sink/sink_details.cpp @@ -21,7 +21,7 @@ #include "audio_core/sink/openal_sink.h" #endif #include "audio_core/sink/null_sink.h" -#include "common/logging/log.h" +#include "common/logging.h" #include "common/settings_enums.h" namespace AudioCore::Sink { diff --git a/src/citron/applets/qt_software_keyboard.cpp b/src/citron/applets/qt_software_keyboard.cpp index a8cd334cae..c884b8077e 100644 --- a/src/citron/applets/qt_software_keyboard.cpp +++ b/src/citron/applets/qt_software_keyboard.cpp @@ -5,7 +5,7 @@ #include #include -#include "common/logging/log.h" +#include "common/logging.h" #include "common/settings.h" #include "common/string_util.h" #include "core/core.h" diff --git a/src/citron/bootmanager.h b/src/citron/bootmanager.h index 66c2c721f8..02053b43a6 100644 --- a/src/citron/bootmanager.h +++ b/src/citron/bootmanager.h @@ -26,7 +26,7 @@ #include #include "common/common_types.h" -#include "common/logging/log.h" +#include "common/logging.h" #include "common/polyfill_thread.h" #include "common/thread.h" #include "core/frontend/emu_window.h" diff --git a/src/citron/compatdb.cpp b/src/citron/compatdb.cpp index 5ba0e020fd..c539edd8aa 100644 --- a/src/citron/compatdb.cpp +++ b/src/citron/compatdb.cpp @@ -5,7 +5,7 @@ #include #include #include -#include "common/logging/log.h" +#include "common/logging.h" #include "ui_compatdb.h" #include "citron/compatdb.h" diff --git a/src/citron/configuration/configure_debug.cpp b/src/citron/configuration/configure_debug.cpp index 58955756ab..63001198f9 100644 --- a/src/citron/configuration/configure_debug.cpp +++ b/src/citron/configuration/configure_debug.cpp @@ -8,8 +8,8 @@ #include "citron/debugger/console.h" #include "citron/uisettings.h" #include "common/fs/path_util.h" -#include "common/logging/backend.h" -#include "common/logging/filter.h" +#include "common/logging.h" +#include "common/logging.h" #include "common/settings.h" #include "core/core.h" #include "ui_configure_debug.h" diff --git a/src/citron/configuration/configure_dialog.cpp b/src/citron/configuration/configure_dialog.cpp index e1f425d6b0..1adcaf462c 100644 --- a/src/citron/configuration/configure_dialog.cpp +++ b/src/citron/configuration/configure_dialog.cpp @@ -44,7 +44,7 @@ #include "citron/theme.h" #include "citron/uisettings.h" #include "citron/util/rainbow_style.h" -#include "common/logging/log.h" +#include "common/logging.h" #include "common/settings.h" #include "common/settings_enums.h" #include "core/core.h" diff --git a/src/citron/configuration/configure_graphics.cpp b/src/citron/configuration/configure_graphics.cpp index b26607c719..f9a4697952 100644 --- a/src/citron/configuration/configure_graphics.cpp +++ b/src/citron/configuration/configure_graphics.cpp @@ -39,7 +39,7 @@ #include "citron/vk_device_info.h" #include "common/common_types.h" #include "common/dynamic_library.h" -#include "common/logging/log.h" +#include "common/logging.h" #include "common/settings.h" #include "common/settings_enums.h" #include "core/core.h" diff --git a/src/citron/configuration/configure_motion_touch.cpp b/src/citron/configuration/configure_motion_touch.cpp index 98d5fe1483..3a205d3dc0 100644 --- a/src/citron/configuration/configure_motion_touch.cpp +++ b/src/citron/configuration/configure_motion_touch.cpp @@ -7,7 +7,7 @@ #include #include -#include "common/logging/log.h" +#include "common/logging.h" #include "common/settings.h" #include "input_common/drivers/udp_client.h" #include "input_common/helpers/udp_protocol.h" diff --git a/src/citron/configuration/configure_per_game_addons.cpp b/src/citron/configuration/configure_per_game_addons.cpp index 2bb6b446b7..cd586f3044 100644 --- a/src/citron/configuration/configure_per_game_addons.cpp +++ b/src/citron/configuration/configure_per_game_addons.cpp @@ -10,7 +10,7 @@ #include #include #include -#include "common/logging/log.h" +#include "common/logging.h" #include #include #include diff --git a/src/citron/configuration/configure_ui.cpp b/src/citron/configuration/configure_ui.cpp index cf7f05c197..3344fb2c27 100644 --- a/src/citron/configuration/configure_ui.cpp +++ b/src/citron/configuration/configure_ui.cpp @@ -30,7 +30,7 @@ #include "common/common_types.h" #include "common/fs/path_util.h" -#include "common/logging/log.h" +#include "common/logging.h" #include "common/settings.h" #include "common/settings_enums.h" #include "core/core.h" diff --git a/src/citron/configuration/input_profiles.cpp b/src/citron/configuration/input_profiles.cpp index d9617e9f5a..412d024eb6 100644 --- a/src/citron/configuration/input_profiles.cpp +++ b/src/citron/configuration/input_profiles.cpp @@ -5,7 +5,7 @@ #include "common/fs/fs.h" #include "common/fs/path_util.h" -#include "common/logging/log.h" +#include "common/logging.h" #include "frontend_common/config.h" #include "citron/configuration/input_profiles.h" diff --git a/src/citron/configuration/qt_config.cpp b/src/citron/configuration/qt_config.cpp index 92ac78856c..3ab2fffb46 100644 --- a/src/citron/configuration/qt_config.cpp +++ b/src/citron/configuration/qt_config.cpp @@ -2,7 +2,7 @@ // SPDX-FileCopyrightText: 2025 citron Emulator Project // SPDX-License-Identifier: GPL-2.0-or-later -#include "common/logging/log.h" +#include "common/logging.h" #include "input_common/main.h" #include "qt_config.h" #include "uisettings.h" diff --git a/src/citron/configuration/shared_widget.cpp b/src/citron/configuration/shared_widget.cpp index 4d4048145d..2d4856cbd8 100644 --- a/src/citron/configuration/shared_widget.cpp +++ b/src/citron/configuration/shared_widget.cpp @@ -40,7 +40,7 @@ #include "common/assert.h" #include "common/common_types.h" -#include "common/logging/log.h" +#include "common/logging.h" #include "common/settings.h" #include "common/settings_common.h" #include "citron/configuration/shared_translation.h" diff --git a/src/citron/custom_metadata.cpp b/src/citron/custom_metadata.cpp index 2bea22b1f2..74b148fc1c 100644 --- a/src/citron/custom_metadata.cpp +++ b/src/citron/custom_metadata.cpp @@ -10,7 +10,7 @@ #include "citron/custom_metadata.h" #include "common/fs/fs.h" #include "common/fs/path_util.h" -#include "common/logging/log.h" +#include "common/logging.h" namespace Citron { diff --git a/src/citron/debugger/console.cpp b/src/citron/debugger/console.cpp index 7900e26049..ef31717acd 100644 --- a/src/citron/debugger/console.cpp +++ b/src/citron/debugger/console.cpp @@ -9,7 +9,7 @@ #include "citron/debugger/console.h" #include "citron/uisettings.h" -#include "common/logging/backend.h" +#include "common/logging.h" namespace CitronDebugger { void ToggleConsole() { diff --git a/src/citron/debugger/memory_viewer.cpp b/src/citron/debugger/memory_viewer.cpp index 59f02a1a03..21624b956e 100644 --- a/src/citron/debugger/memory_viewer.cpp +++ b/src/citron/debugger/memory_viewer.cpp @@ -29,7 +29,7 @@ #include "core/hle/kernel/k_page_table.h" #include "core/hle/kernel/k_process.h" #include "core/hle/kernel/svc_types.h" -#include "common/logging/log.h" +#include "common/logging.h" #include "core/memory.h" #include "core/memory/dmnt_cheat_types.h" diff --git a/src/citron/game_list.cpp b/src/citron/game_list.cpp index 32f6373423..9059891c61 100644 --- a/src/citron/game_list.cpp +++ b/src/citron/game_list.cpp @@ -53,7 +53,7 @@ #include "citron/util/controller_navigation.h" #include "common/common_types.h" #include "common/fs/path_util.h" -#include "common/logging/log.h" +#include "common/logging.h" #include "common/string_util.h" #include "core/core.h" #include "core/file_sys/patch_manager.h" diff --git a/src/citron/game_list_p.h b/src/citron/game_list_p.h index df4218f0ea..ff222011fa 100644 --- a/src/citron/game_list_p.h +++ b/src/citron/game_list_p.h @@ -22,7 +22,7 @@ #include "citron/uisettings.h" #include "citron/util/util.h" #include "common/common_types.h" -#include "common/logging/log.h" +#include "common/logging.h" #include "common/string_util.h" enum class GameListItemType { diff --git a/src/citron/hotkey_profile_manager.cpp b/src/citron/hotkey_profile_manager.cpp index bc6e91d5b6..60a0137b1f 100644 --- a/src/citron/hotkey_profile_manager.cpp +++ b/src/citron/hotkey_profile_manager.cpp @@ -14,7 +14,7 @@ #include "citron/hotkey_profile_manager.h" #include "common/fs/path_util.h" -#include "common/logging/log.h" +#include "common/logging.h" namespace Hotkey { diff --git a/src/citron/main.cpp b/src/citron/main.cpp index bed2cee2d1..c5e65a5423 100644 --- a/src/citron/main.cpp +++ b/src/citron/main.cpp @@ -114,8 +114,8 @@ static FileSys::VirtualFile VfsDirectoryCreateFileWrapper(const FileSys::Virtual #include "common/fs/fs.h" #include "common/fs/path_util.h" #include "common/literals.h" -#include "common/logging/backend.h" -#include "common/logging/log.h" +#include "common/logging.h" +#include "common/logging.h" #include "common/memory_detect.h" #include "common/microprofile.h" #include "common/scm_rev.h" diff --git a/src/citron/mod_manager/mod_downloader_dialog.cpp b/src/citron/mod_manager/mod_downloader_dialog.cpp index 11971b484d..2849ddfd73 100644 --- a/src/citron/mod_manager/mod_downloader_dialog.cpp +++ b/src/citron/mod_manager/mod_downloader_dialog.cpp @@ -16,7 +16,7 @@ #include "citron/mod_manager/mod_downloader_dialog.h" #include "ui_mod_downloader_dialog.h" #include "common/fs/path_util.h" -#include "common/logging/log.h" +#include "common/logging.h" namespace ModManager { diff --git a/src/citron/multiplayer/chat_room.cpp b/src/citron/multiplayer/chat_room.cpp index f46ab918c0..382989a0be 100644 --- a/src/citron/multiplayer/chat_room.cpp +++ b/src/citron/multiplayer/chat_room.cpp @@ -26,7 +26,7 @@ #include #include #include -#include "common/logging/log.h" +#include "common/logging.h" #include "network/announce_multiplayer_session.h" #include "ui_chat_room.h" #include "citron/game_list_p.h" diff --git a/src/citron/multiplayer/client_room.cpp b/src/citron/multiplayer/client_room.cpp index d6e55f8d44..e186a2c86c 100644 --- a/src/citron/multiplayer/client_room.cpp +++ b/src/citron/multiplayer/client_room.cpp @@ -9,7 +9,7 @@ #include #include #include -#include "common/logging/log.h" +#include "common/logging.h" #include "network/announce_multiplayer_session.h" #include "ui_client_room.h" #include "citron/game_list_p.h" diff --git a/src/citron/multiplayer/direct_connect.cpp b/src/citron/multiplayer/direct_connect.cpp index 909d148361..73cb047e7f 100644 --- a/src/citron/multiplayer/direct_connect.cpp +++ b/src/citron/multiplayer/direct_connect.cpp @@ -8,7 +8,7 @@ #include #include #include -#include "common/logging/log.h" +#include "common/logging.h" #include "common/settings.h" #include "core/core.h" #include "core/internal_network/network_interface.h" diff --git a/src/citron/multiplayer/host_room.cpp b/src/citron/multiplayer/host_room.cpp index 9d74be9e0d..f04234614e 100644 --- a/src/citron/multiplayer/host_room.cpp +++ b/src/citron/multiplayer/host_room.cpp @@ -12,7 +12,7 @@ #include #include #include -#include "common/logging/log.h" +#include "common/logging.h" #include "common/settings.h" #include "core/core.h" #include "core/internal_network/network_interface.h" diff --git a/src/citron/multiplayer/lobby.cpp b/src/citron/multiplayer/lobby.cpp index bd085ce266..3b620edc6b 100644 --- a/src/citron/multiplayer/lobby.cpp +++ b/src/citron/multiplayer/lobby.cpp @@ -5,7 +5,7 @@ #include #include #include -#include "common/logging/log.h" +#include "common/logging.h" #include "common/settings.h" #include "core/core.h" #include "core/hle/service/acc/profile_manager.h" diff --git a/src/citron/multiplayer/state.cpp b/src/citron/multiplayer/state.cpp index e98e8dabe9..fb1442b7f6 100644 --- a/src/citron/multiplayer/state.cpp +++ b/src/citron/multiplayer/state.cpp @@ -8,7 +8,7 @@ #include #include #include "common/announce_multiplayer_room.h" -#include "common/logging/log.h" +#include "common/logging.h" #include "core/core.h" #include "citron/game_list.h" #include "citron/multiplayer/client_room.h" diff --git a/src/citron/play_time_manager.cpp b/src/citron/play_time_manager.cpp index 72821a3ceb..08a553d7ce 100644 --- a/src/citron/play_time_manager.cpp +++ b/src/citron/play_time_manager.cpp @@ -7,7 +7,7 @@ #include "common/fs/file.h" #include "common/fs/fs.h" #include "common/fs/path_util.h" -#include "common/logging/log.h" +#include "common/logging.h" #include "common/settings.h" #include "common/thread.h" #include "core/hle/service/acc/profile_manager.h" diff --git a/src/citron/qt_common.cpp b/src/citron/qt_common.cpp index a2ee058dc3..def133fb1a 100644 --- a/src/citron/qt_common.cpp +++ b/src/citron/qt_common.cpp @@ -4,7 +4,7 @@ #include #include #include -#include "common/logging/log.h" +#include "common/logging.h" #include "core/frontend/emu_window.h" #include "citron/qt_common.h" diff --git a/src/citron/setup_wizard.cpp b/src/citron/setup_wizard.cpp index a25c6715b1..dbe54eff43 100644 --- a/src/citron/setup_wizard.cpp +++ b/src/citron/setup_wizard.cpp @@ -18,7 +18,7 @@ #include "common/fs/fs.h" #include "common/fs/path_util.h" -#include "common/logging/log.h" +#include "common/logging.h" #include "common/settings.h" #include "core/crypto/key_manager.h" #include "core/file_sys/vfs/vfs.h" diff --git a/src/citron/updater/updater_service.cpp b/src/citron/updater/updater_service.cpp index d1ee33f849..800e038b1a 100644 --- a/src/citron/updater/updater_service.cpp +++ b/src/citron/updater/updater_service.cpp @@ -4,7 +4,7 @@ #include "citron/uisettings.h" #include "citron/updater/updater_service.h" #include "common/fs/path_util.h" -#include "common/logging/log.h" +#include "common/logging.h" #include "common/scm_rev.h" #include diff --git a/src/citron/util/util.cpp b/src/citron/util/util.cpp index 52e95d38d0..d522e882a5 100644 --- a/src/citron/util/util.cpp +++ b/src/citron/util/util.cpp @@ -5,7 +5,7 @@ #include #include -#include "common/logging/log.h" +#include "common/logging.h" #include "citron/util/util.h" #ifdef _WIN32 diff --git a/src/citron/vk_device_info.cpp b/src/citron/vk_device_info.cpp index 3908ede1d2..253866a90f 100644 --- a/src/citron/vk_device_info.cpp +++ b/src/citron/vk_device_info.cpp @@ -7,7 +7,7 @@ #include "citron/qt_common.h" #include "common/dynamic_library.h" -#include "common/logging/log.h" +#include "common/logging.h" #include "video_core/vulkan_common/vulkan_device.h" #include "video_core/vulkan_common/vulkan_instance.h" #include "video_core/vulkan_common/vulkan_library.h" diff --git a/src/citron_cmd/citron.cpp b/src/citron_cmd/citron.cpp index 023686c729..59a6e594bb 100644 --- a/src/citron_cmd/citron.cpp +++ b/src/citron_cmd/citron.cpp @@ -11,8 +11,8 @@ #include #include "common/detached_tasks.h" -#include "common/logging/backend.h" -#include "common/logging/log.h" +#include "common/logging.h" +#include "common/logging.h" #include "common/microprofile.h" #include "common/nvidia_flags.h" #include "common/scm_rev.h" diff --git a/src/citron_cmd/emu_window/emu_window_sdl2.cpp b/src/citron_cmd/emu_window/emu_window_sdl2.cpp index 24d3712853..756278f02c 100644 --- a/src/citron_cmd/emu_window/emu_window_sdl2.cpp +++ b/src/citron_cmd/emu_window/emu_window_sdl2.cpp @@ -4,7 +4,7 @@ #include -#include "common/logging/log.h" +#include "common/logging.h" #include "common/scm_rev.h" #include "common/settings.h" #include "core/core.h" diff --git a/src/citron_cmd/emu_window/emu_window_sdl2_null.cpp b/src/citron_cmd/emu_window/emu_window_sdl2_null.cpp index b70369009f..0358330c46 100644 --- a/src/citron_cmd/emu_window/emu_window_sdl2_null.cpp +++ b/src/citron_cmd/emu_window/emu_window_sdl2_null.cpp @@ -7,7 +7,7 @@ #include -#include "common/logging/log.h" +#include "common/logging.h" #include "common/scm_rev.h" #include "video_core/renderer_null/renderer_null.h" #include "citron_cmd/emu_window/emu_window_sdl2_null.h" diff --git a/src/citron_cmd/emu_window/emu_window_sdl2_vk.cpp b/src/citron_cmd/emu_window/emu_window_sdl2_vk.cpp index a9ec816ab8..0b3a426fa7 100644 --- a/src/citron_cmd/emu_window/emu_window_sdl2_vk.cpp +++ b/src/citron_cmd/emu_window/emu_window_sdl2_vk.cpp @@ -7,7 +7,7 @@ #include -#include "common/logging/log.h" +#include "common/logging.h" #include "common/scm_rev.h" #include "video_core/renderer_vulkan/renderer_vulkan.h" #include "citron_cmd/emu_window/emu_window_sdl2_vk.h" diff --git a/src/citron_cmd/sdl_config.cpp b/src/citron_cmd/sdl_config.cpp index 2943d958d4..0fba4115df 100644 --- a/src/citron_cmd/sdl_config.cpp +++ b/src/citron_cmd/sdl_config.cpp @@ -5,7 +5,7 @@ #define SDL_MAIN_HANDLED #include -#include "common/logging/log.h" +#include "common/logging.h" #include "input_common/main.h" #include "sdl_config.h" diff --git a/src/common/CMakeLists.txt b/src/common/CMakeLists.txt index 226620e99f..0884d47f40 100644 --- a/src/common/CMakeLists.txt +++ b/src/common/CMakeLists.txt @@ -71,16 +71,8 @@ add_library(common STATIC input.h intrusive_red_black_tree.h literals.h - logging/backend.cpp - logging/backend.h - logging/filter.cpp - logging/filter.h - logging/formatter.h - logging/log.h - logging/log_entry.h - logging/text_formatter.cpp - logging/text_formatter.h - logging/types.h + logging.cpp + logging.h lz4_compression.cpp lz4_compression.h make_unique_for_overwrite.h diff --git a/src/common/android/applets/software_keyboard.cpp b/src/common/android/applets/software_keyboard.cpp index e3e3b85ecf..12abeacbff 100644 --- a/src/common/android/applets/software_keyboard.cpp +++ b/src/common/android/applets/software_keyboard.cpp @@ -9,7 +9,7 @@ #include "common/android/android_common.h" #include "common/android/applets/software_keyboard.h" #include "common/android/id_cache.h" -#include "common/logging/log.h" +#include "common/logging.h" #include "common/string_util.h" #include "core/core.h" diff --git a/src/common/assert.cpp b/src/common/assert.cpp index e2c2cade3f..fc158e6dca 100644 --- a/src/common/assert.cpp +++ b/src/common/assert.cpp @@ -3,7 +3,7 @@ #include "common/assert.h" #include "common/common_funcs.h" -#include "common/logging/backend.h" +#include "common/logging.h" #include "common/settings.h" diff --git a/src/common/assert.h b/src/common/assert.h index 49d40dff15..adddd9cda9 100644 --- a/src/common/assert.h +++ b/src/common/assert.h @@ -4,7 +4,7 @@ #pragma once -#include "common/logging/log.h" +#include "common/logging.h" // Sometimes we want to try to continue even after hitting an assert. // However touching this file yields a global recompilation as this header is included almost diff --git a/src/common/fs/file.cpp b/src/common/fs/file.cpp index b0b25eb432..3edeb0ee71 100644 --- a/src/common/fs/file.cpp +++ b/src/common/fs/file.cpp @@ -8,7 +8,7 @@ #ifdef ANDROID #include "common/fs/fs_android.h" #endif -#include "common/logging/log.h" +#include "common/logging.h" #ifdef _WIN32 #include diff --git a/src/common/fs/fs.cpp b/src/common/fs/fs.cpp index 0efd0a1010..ae6f6fab4c 100644 --- a/src/common/fs/fs.cpp +++ b/src/common/fs/fs.cpp @@ -8,7 +8,7 @@ #include "common/fs/fs_android.h" #endif #include "common/fs/path_util.h" -#include "common/logging/log.h" +#include "common/logging.h" namespace Common::FS { diff --git a/src/common/fs/path_util.cpp b/src/common/fs/path_util.cpp index a6f2593f05..0504293987 100644 --- a/src/common/fs/path_util.cpp +++ b/src/common/fs/path_util.cpp @@ -11,7 +11,7 @@ #endif #include "common/fs/fs_paths.h" #include "common/fs/path_util.h" -#include "common/logging/log.h" +#include "common/logging.h" #ifdef _WIN32 #include // Used in GetExeDirectory() diff --git a/src/common/host_memory.cpp b/src/common/host_memory.cpp index f632399dd7..10668777e3 100644 --- a/src/common/host_memory.cpp +++ b/src/common/host_memory.cpp @@ -34,7 +34,7 @@ #include "common/assert.h" #include "common/free_region_manager.h" #include "common/host_memory.h" -#include "common/logging/log.h" +#include "common/logging.h" namespace Common { diff --git a/src/common/input.h b/src/common/input.h index 2c4ccea22e..d9956bd1b4 100644 --- a/src/common/input.h +++ b/src/common/input.h @@ -9,7 +9,7 @@ #include #include #include -#include "common/logging/log.h" +#include "common/logging.h" #include "common/param_package.h" #include "common/uuid.h" diff --git a/src/common/linux/gamemode.cpp b/src/common/linux/gamemode.cpp index 8d3e2934a6..4cc331e17f 100644 --- a/src/common/linux/gamemode.cpp +++ b/src/common/linux/gamemode.cpp @@ -4,7 +4,7 @@ #include #include "common/linux/gamemode.h" -#include "common/logging/log.h" +#include "common/logging.h" #include "common/settings.h" namespace Common::Linux { diff --git a/src/common/log_class.inc b/src/common/log_class.inc new file mode 100644 index 0000000000..9347aac0e1 --- /dev/null +++ b/src/common/log_class.inc @@ -0,0 +1,99 @@ +CLS(Log) +CLS(Common) +SUB(Common, Filesystem) +SUB(Common, Memory) +CLS(Core) +SUB(Core, ARM) +SUB(Core, Timing) +CLS(Config) +CLS(Debug) +SUB(Debug, Emulated) +SUB(Debug, GPU) +SUB(Debug, Breakpoint) +SUB(Debug, GDBStub) +CLS(Kernel) +SUB(Kernel, SVC) +CLS(Service) +SUB(Service, ACC) +SUB(Service, Audio) +SUB(Service, AM) +SUB(Service, AOC) +SUB(Service, APM) +SUB(Service, ARP) +SUB(Service, BCAT) +SUB(Service, BPC) +SUB(Service, BGTC) +SUB(Service, BTDRV) +SUB(Service, BTM) +SUB(Service, Capture) +SUB(Service, ERPT) +SUB(Service, ETicket) +SUB(Service, EUPLD) +SUB(Service, Fatal) +SUB(Service, FGM) +SUB(Service, Friend) +SUB(Service, FS) +SUB(Service, GRC) +SUB(Service, HID) +SUB(Service, IRS) +SUB(Service, JIT) +SUB(Service, LBL) +SUB(Service, LDN) +SUB(Service, LDR) +SUB(Service, LM) +SUB(Service, Migration) +SUB(Service, Mii) +SUB(Service, MM) +SUB(Service, MNPP) +SUB(Service, NCM) +SUB(Service, NFC) +SUB(Service, NFP) +SUB(Service, NGC) +SUB(Service, NIFM) +SUB(Service, NIM) +SUB(Service, NOTIF) +SUB(Service, NPNS) +SUB(Service, NS) +SUB(Service, NVDRV) +SUB(Service, Nvnflinger) +SUB(Service, OLSC) +SUB(Service, PCIE) +SUB(Service, PCTL) +SUB(Service, PCV) +SUB(Service, PM) +SUB(Service, PREPO) +SUB(Service, PSC) +SUB(Service, PTM) +SUB(Service, SET) +SUB(Service, SM) +SUB(Service, SPL) +SUB(Service, SSL) +SUB(Service, TCAP) +SUB(Service, Time) +SUB(Service, USB) +SUB(Service, VI) +SUB(Service, WLAN) +CLS(HW) +SUB(HW, Memory) +SUB(HW, LCD) +SUB(HW, GPU) +SUB(HW, AES) +CLS(IPC) +CLS(Frontend) +CLS(Render) +SUB(Render, Software) +SUB(Render, OpenGL) +SUB(Render, Vulkan) +CLS(Shader) +SUB(Shader, SPIRV) +SUB(Shader, GLASM) +SUB(Shader, GLSL) +CLS(Audio) +SUB(Audio, DSP) +SUB(Audio, Sink) +CLS(Input) +CLS(Network) +CLS(Loader) +CLS(CheatEngine) +CLS(Crypto) +CLS(WebService) diff --git a/src/common/logging.cpp b/src/common/logging.cpp new file mode 100644 index 0000000000..89e171ed34 --- /dev/null +++ b/src/common/logging.cpp @@ -0,0 +1,395 @@ +// SPDX-FileCopyrightText: Copyright 2026 Eden Emulator Project +// SPDX-License-Identifier: GPL-3.0-or-later +// SPDX-FileCopyrightText: 2014 Citra Emulator Project +// SPDX-License-Identifier: GPL-2.0-or-later + +#include +#include +#include +#include +#include +#include +#ifdef _WIN32 +#include // For OutputDebugStringW +#else +#if defined(__ANDROID__) +#include +#endif +#include +#include +#endif +#include +#include +#include "common/fs/file.h" +#include "common/fs/fs.h" +#include "common/fs/fs_paths.h" +#include "common/fs/path_util.h" +#include "common/literals.h" +#include "common/polyfill_thread.h" +#include "common/thread.h" +#include "common/logging.h" +#include "common/settings.h" +#include "common/string_util.h" +#include "common/bounded_threadsafe_queue.h" + +namespace Common::Log { +/// @brief A log entry. Log entries are store in a structured format to permit more varied output +/// formatting on different frontends, as well as facilitating filtering and aggregation. +struct Entry { + std::string message; + const char* filename = nullptr; + const char* function = nullptr; + std::chrono::microseconds timestamp; + Class log_class{}; + Level log_level{}; + unsigned int line_num = 0; +}; +namespace { +/// @brief Returns the name of the passed log class as a C-string. Subclasses are separated by periods +/// instead of underscores as in the enumeration. +/// @note GetClassName is a macro defined by Windows.h, grrr... +const char* GetLogClassName(Class log_class) noexcept { + switch (log_class) { +#define CLS(x) case Class::x: return #x; +#define SUB(x, y) case Class::x##_##y: return #x "." #y; +#include "common/log_classes.inc" +#undef CLS +#undef SUB + default: return "?"; + } +} +/// @brief Returns the name of the passed log level as a C-string. +const char* GetLevelName(Level log_level) noexcept { + switch (log_level) { +#define LVL(x) case Level::x: return #x; + LVL(Trace) + LVL(Debug) + LVL(Info) + LVL(Warning) + LVL(Error) + LVL(Critical) +#undef LVL + default: return "?"; + } +} +} +/// @brief Some IDEs prefer : instead, so let's just do that :) +std::string FormatLogMessage(const Entry& entry) noexcept { + if (!entry.filename) return ""; + auto const time_seconds = uint32_t(entry.timestamp.count() / 1000000); + auto const time_fractional = uint32_t(entry.timestamp.count() % 1000000); + auto const class_name = GetLogClassName(entry.log_class); + auto const level_name = GetLevelName(entry.log_level); + return fmt::format("[{:4d}.{:06d}] {} <{}> {}:{}:{}: {}", time_seconds, time_fractional, class_name, level_name, entry.filename, entry.line_num, entry.function, entry.message); +} +namespace { +template Level GetLevelByName(const It begin, const It end) noexcept { + for (u32 i = 0; i < u32(Level::Count); ++i) + if (auto const name = GetLevelName(Level(i)); Common::ComparePartialString(begin, end, name)) + return Level(i); + return Level::Count; +} +template Class GetClassByName(const It begin, const It end) noexcept { + for (u32 i = 0; i < u32(Class::Count); ++i) + if (auto const name = GetLogClassName(Class(i)); Common::ComparePartialString(begin, end, name)) + return Class(i); + return Class::Count; +} +template bool ParseFilterRule(Filter& instance, Iterator begin, Iterator end) noexcept { + auto level_separator = std::find(begin, end, ':'); + if (level_separator == end) { + LOG_ERROR(Log, "Invalid log filter. Must specify a log level after `:`: {}", std::string(begin, end)); + return false; + } + const Level level = GetLevelByName(level_separator + 1, end); + if (level == Level::Count) { + LOG_ERROR(Log, "Unknown log level in filter: {}", std::string(begin, end)); + return false; + } + if (Common::ComparePartialString(begin, level_separator, "*")) { + instance.class_levels.fill(level); + return true; + } + const Class log_class = GetClassByName(begin, level_separator); + if (log_class == Class::Count) { + LOG_ERROR(Log, "Unknown log class in filter: {}", std::string(begin, end)); + return false; + } + instance.SetClassLevel(log_class, level); + return true; +} +} // Anonymous namespace +/// @brief Parses a filter string and applies it to this filter. +/// A filter string consists of a space-separated list of filter rules, each of the format +/// `:`. `` is a log class name, with subclasses separated using periods. +/// `*` is allowed as a class name and will reset all filters to the specified level. `` +/// a severity level name which will be set as the minimum logging level of the matched classes. +/// Rules are applied left to right, with each rule overriding previous ones in the sequence. +/// A few examples of filter rules: +/// - `*:Info` -- Resets the level of all classes to Info. +/// - `Service:Info` -- Sets the level of Service to Info. +/// - `Service.FS:Trace` -- Sets the level of the Service.FS class to Trace. +void Filter::ParseFilterString(std::string_view filter_view) noexcept { + auto it = filter_view.cbegin(); + while (it != filter_view.cend()) { + auto end = std::find(it, filter_view.cend(), ' '); + if (end != it) // If clause isn't empty + ParseFilterRule(*this, it, end); + if (end != filter_view.cend()) // Skip over the whitespace + ++end; + it = end; + } +} + +namespace { +/// @brief Trims up to and including the last of ../, ..\, src/, src\ in a string +/// do not be fooled this isn't generating new strings on .rodata :) +constexpr const char* TrimSourcePath(std::string_view source) noexcept { + auto const rfind = [source](const std::string_view match) { + return source.rfind(match) == source.npos ? 0 : (source.rfind(match) + match.size()); + }; + return source.data() + (std::max)({rfind("src/"), rfind("src\\"), rfind("../"), rfind("..\\")}); +} +/// @brief Interface for logging backends. +struct Backend { + virtual ~Backend() noexcept = default; + virtual void Write(const Entry& entry) noexcept = 0; + virtual void Flush() noexcept = 0; +}; +/// @brief Formatting specifier (to use with printf) of the equivalent fmt::format() expression +#define CCB_PRINTF_FMT "[%4d.%06d] %s <%s> %s:%u:%s: %s" +/// @brief Instead of using fmt::format() just use the system's formatting capabilities directly +struct DirectFormatArgs { + const char *class_name; + const char *level_name; + uint32_t time_seconds; + uint32_t time_fractional; +}; +[[nodiscard]] inline DirectFormatArgs GetDirectFormatArgs(Entry const& entry) noexcept { + return { + .class_name = GetLogClassName(entry.log_class), + .level_name = GetLevelName(entry.log_level), + .time_seconds = uint32_t(entry.timestamp.count() / 1000000), + .time_fractional = uint32_t(entry.timestamp.count() % 1000000), + }; +} +/// @brief Backend that writes to stdout and with color +struct ColorConsoleBackend final : public Backend { +#ifdef _WIN32 + explicit ColorConsoleBackend() noexcept { + console_handle = GetStdHandle(STD_ERROR_HANDLE); + GetConsoleScreenBufferInfo(console_handle, &original_info); + } + ~ColorConsoleBackend() noexcept override { + SetConsoleTextAttribute(console_handle, original_info.wAttributes); + } + void Write(const Entry& entry) noexcept override { + if (enabled && console_handle != INVALID_HANDLE_VALUE) { + SetConsoleTextAttribute(console_handle, WORD([&entry]() { + switch (entry.log_level) { + case Level::Debug: return FOREGROUND_GREEN | FOREGROUND_BLUE; // Cyan + case Level::Info: return FOREGROUND_RED | FOREGROUND_GREEN | FOREGROUND_BLUE; // Bright gray + case Level::Warning: return FOREGROUND_RED | FOREGROUND_GREEN | FOREGROUND_INTENSITY; + case Level::Error: return FOREGROUND_RED | FOREGROUND_INTENSITY; + case Level::Critical: return FOREGROUND_RED | FOREGROUND_BLUE | FOREGROUND_INTENSITY; + default: return FOREGROUND_INTENSITY; // Grey + } + }())); + auto const df = GetDirectFormatArgs(entry); + std::fprintf(stdout, CCB_PRINTF_FMT "\n", df.time_seconds, df.time_fractional, df.class_name, df.level_name, entry.filename, entry.line_num, entry.function, entry.message.c_str()); + } + } + void Flush() noexcept override {} + CONSOLE_SCREEN_BUFFER_INFO original_info = {}; + HANDLE console_handle = INVALID_HANDLE_VALUE; + std::atomic_bool enabled = false; +#else // ^^^ Windows vvv POSIX + explicit ColorConsoleBackend() noexcept {} + ~ColorConsoleBackend() noexcept override {} + void Write(const Entry& entry) noexcept override { + if (enabled) { +#define ESC "\x1b" + auto const df = GetDirectFormatArgs(entry); + std::fprintf(stdout, [&entry]() -> const char* { + switch (entry.log_level) { +#define CCB_MAKE_COLOR_FMT(X) ESC X CCB_PRINTF_FMT ESC "[0m\n" + case Level::Debug: return CCB_MAKE_COLOR_FMT("[0;36m"); // Cyan + case Level::Info: return CCB_MAKE_COLOR_FMT("[0;37m"); // Bright gray + case Level::Warning: return CCB_MAKE_COLOR_FMT("[1;33m"); // Bright yellow + case Level::Error: return CCB_MAKE_COLOR_FMT("[1;31m"); // Bright red + case Level::Critical: return CCB_MAKE_COLOR_FMT("[1;35m"); // Bright magenta + default: return CCB_MAKE_COLOR_FMT("[1;30m"); // Grey +#undef CCB_MAKE_COLOR_FMT + } + }(), df.time_seconds, df.time_fractional, df.class_name, df.level_name, entry.filename, entry.line_num, entry.function, entry.message.c_str()); +#undef ESC + } + } + void Flush() noexcept override {} + std::atomic_bool enabled = false; +#endif +}; +/// @brief Backend that writes to a file passed into the constructor +struct FileBackend final : public Backend { + explicit FileBackend(const std::filesystem::path& filename) noexcept { + auto old_filename = std::string{filename} + ".old.txt"; + // Existence checks are done within the functions themselves. + // We don't particularly care if these succeed or not. + void(FS::RemoveFile(old_filename)); + void(FS::RenameFile(filename, old_filename)); + file.emplace(filename, FS::FileAccessMode::Write, FS::FileType::TextFile); + } + ~FileBackend() noexcept override = default; + void Write(const Entry& entry) noexcept override { + if (enabled) { + bytes_written += file->WriteString(FormatLogMessage(entry).append(1, '\n')); + using namespace Common::Literals; + // Prevent logs from exceeding a set maximum size in the event that log entries are spammed. + const auto write_limit = Settings::values.extended_logging.GetValue() ? 1_GiB : 100_MiB; + const bool write_limit_exceeded = bytes_written > write_limit; + if (entry.log_level >= Level::Error || write_limit_exceeded) { + // Stop writing after the write limit is exceeded. + // Don't close the file so we can print a stacktrace if necessary + if (write_limit_exceeded) + enabled = false; + Flush(); + } + } + } + void Flush() noexcept override { file->Flush(); } + std::optional file; + std::size_t bytes_written = 0; + bool enabled = true; +}; +#ifdef _WIN32 +/// @brief Backend that writes to Visual Studio's output window +struct DebuggerBackend final : public Backend { + explicit DebuggerBackend() noexcept = default; + ~DebuggerBackend() noexcept override = default; + void Write(const Entry& entry) noexcept override { + ::OutputDebugStringW(UTF8ToUTF16W(FormatLogMessage(entry).append(1, '\n')).c_str()); + } + void Flush() noexcept override {} +}; +#endif +#ifdef ANDROID +/// @brief Backend that writes to the Android logcat +struct LogcatBackend : public Backend { + explicit LogcatBackend() noexcept = default; + ~LogcatBackend() noexcept override = default; + void Write(const Entry& entry) noexcept override { + auto const df = GetDirectFormatArgs(entry); + __android_log_print([&]() { + switch (entry.log_level) { + case Level::Debug: return ANDROID_LOG_DEBUG; + case Level::Info: return ANDROID_LOG_INFO; + case Level::Warning: return ANDROID_LOG_WARN; + case Level::Error: return ANDROID_LOG_ERROR; + case Level::Critical: return ANDROID_LOG_FATAL; + default: return ANDROID_LOG_VERBOSE; + } + }(), "YuzuNative", CCB_PRINTF_FMT, df.time_seconds, df.time_fractional, df.class_name, df.level_name, entry.filename, entry.line_num, entry.function, entry.message.c_str()); + } + void Flush() noexcept override {} +}; +#endif +/// @brief Static state as a singleton. +struct Impl { + // Well, I mean it's the default constructor! + explicit Impl() noexcept : filter(Level::Trace) {} + void StartBackendThread() noexcept { + backend_thread = std::jthread([this](std::stop_token stop_token) { + Common::SetCurrentThreadName("Logger"); + Entry entry; + const auto write_logs = [this, &entry]() { + ForEachBackend([&entry](Backend& backend) { + backend.Write(entry); + }); + }; + do { + message_queue.PopWait(entry, stop_token); + write_logs(); + } while (!stop_token.stop_requested()); + // Drain the logging queue. Only writes out up to MAX_LOGS_TO_WRITE to prevent a + // case where a system is repeatedly spamming logs even on close. + int max_logs_to_write = filter.IsDebug() ? INT_MAX : 100; + while (max_logs_to_write-- && message_queue.TryPop(entry)) + write_logs(); + }); + } + void StopBackendThread() noexcept { + backend_thread.request_stop(); + if (backend_thread.joinable()) + backend_thread.join(); + ForEachBackend([](Backend& backend) { backend.Flush(); }); + } + void ForEachBackend(auto lambda) noexcept { + lambda(static_cast(color_console_backend)); +#ifndef __OPENORBIS__ + if (file_backend) + lambda(static_cast(*file_backend)); +#endif +#ifdef _WIN32 + lambda(static_cast(debugger_backend)); +#endif +#ifdef ANDROID + lambda(static_cast(lc_backend)); +#endif + } + Filter filter; + ColorConsoleBackend color_console_backend{}; +#ifndef __OPENORBIS__ + std::optional file_backend; +#endif +#ifdef _WIN32 + DebuggerBackend debugger_backend{}; +#endif +#ifdef ANDROID + LogcatBackend lc_backend{}; +#endif + MPSCQueue message_queue{}; + std::chrono::steady_clock::time_point time_origin{std::chrono::steady_clock::now()}; + std::jthread backend_thread; +}; +} // namespace +// @brief Constructor shall NOT depend upon Settings() or whatever +// it's ran at global static ctor() time... so BE CAREFUL MFER! +static Common::Log::Impl logging_instance{}; +void Initialize() noexcept { + logging_instance.filter.ParseFilterString(Settings::values.log_filter.GetValue()); +#ifndef __OPENORBIS__ + using namespace Common::FS; + const auto& log_dir = GetEdenPath(EdenPath::LogDir); + void(CreateDir(log_dir)); + logging_instance.file_backend.emplace(log_dir / LOG_FILE); +#endif +} +/// @brief Initializes the logging system. This should be the first thing called in main. +void Start() noexcept { + logging_instance.StartBackendThread(); +} +/// @brief Explicitly stops the logger thread and flushes the buffers +void Stop() noexcept { + logging_instance.StopBackendThread(); +} +/// @brief The global filter will prevent any messages from even being processed if they are filtered. +void SetGlobalFilter(const Filter& filter) noexcept { + logging_instance.filter = filter; +} +void SetColorConsoleBackendEnabled(bool enabled) noexcept { + logging_instance.color_console_backend.enabled = enabled; +} +void FmtLogMessageImpl(Class log_class, Level log_level, const char* filename, unsigned int line_num, const char* function, fmt::string_view format, const fmt::format_args& args) { + if (logging_instance.filter.CheckMessage(log_class, log_level)) { + logging_instance.message_queue.EmplaceWait(Entry{ + .message = fmt::vformat(format, args), + .filename = TrimSourcePath(filename), + .function = function, + .timestamp = std::chrono::duration_cast(std::chrono::steady_clock::now() - logging_instance.time_origin), + .log_class = log_class, + .log_level = log_level, + .line_num = line_num, + }); + } +} +} // namespace Common::Log diff --git a/src/common/logging.h b/src/common/logging.h new file mode 100644 index 0000000000..a8dd5dc4ab --- /dev/null +++ b/src/common/logging.h @@ -0,0 +1,83 @@ +// SPDX-FileCopyrightText: Copyright 2026 Eden Emulator Project +// SPDX-License-Identifier: GPL-3.0-or-later +// SPDX-FileCopyrightText: 2014 Citra Emulator Project +// SPDX-License-Identifier: GPL-2.0-or-later + +#pragma once + +#include +#include +#include +#include +#include "common/swap.h" + +// Adapted from https://github.com/fmtlib/fmt/issues/2704 a generic formatter for enum classes +#if FMT_VERSION >= 80100 +template +struct fmt::formatter, char>> : formatter> { + template auto format(const T& value, F& ctx) const -> decltype(ctx.out()) { + return fmt::formatter>::format(std::underlying_type_t(value), ctx); + } +}; +#endif +template +struct fmt::formatter> { + constexpr auto parse(format_parse_context& ctx) { return ctx.begin(); } + template auto format(const SwapStructT& reg, F& ctx) const { + return fmt::format_to(ctx.out(), "{}", T(reg)); + } +}; + +#define LOG_TRACE(log_class, ...) ::Common::Log::FmtLogMessage(Common::Log::Class::log_class, Common::Log::Level::Trace, __FILE__, __LINE__, __func__, __VA_ARGS__) +#define LOG_DEBUG(log_class, ...) ::Common::Log::FmtLogMessage(::Common::Log::Class::log_class, ::Common::Log::Level::Debug, __FILE__, __LINE__, __func__, __VA_ARGS__) +#define LOG_INFO(log_class, ...) ::Common::Log::FmtLogMessage(::Common::Log::Class::log_class, ::Common::Log::Level::Info, __FILE__, __LINE__, __func__, __VA_ARGS__) +#define LOG_WARNING(log_class, ...) ::Common::Log::FmtLogMessage(::Common::Log::Class::log_class, ::Common::Log::Level::Warning, __FILE__, __LINE__, __func__, __VA_ARGS__) +#define LOG_ERROR(log_class, ...) ::Common::Log::FmtLogMessage(::Common::Log::Class::log_class, ::Common::Log::Level::Error, __FILE__, __LINE__, __func__, __VA_ARGS__) +#define LOG_CRITICAL(log_class, ...) ::Common::Log::FmtLogMessage(::Common::Log::Class::log_class, ::Common::Log::Level::Critical, __FILE__, __LINE__, __func__, __VA_ARGS__) + +namespace Common::Log { + +/// @brief Specifies the severity or level of detail of the log message. +enum class Level : u8 { Trace, Debug, Info, Warning, Error, Critical, Count }; +/// @brief Specifies the sub-system that generated the log message. +enum class Class : u8 { +#define SUB(A, B) A##_##B, +#define CLS(A) A, +#include "log_classes.inc" +#undef SUB +#undef CLS + Count, +}; +/// @brief Logs a message to the global logger, using fmt +void FmtLogMessageImpl(Class log_class, Level log_level, const char* filename, unsigned int line_num, const char* function, fmt::string_view format, const fmt::format_args& args); +template inline void FmtLogMessage(Class log_class, Level log_level, const char* filename, unsigned int line_num, const char* function, fmt::format_string format, const Args&... args) { + FmtLogMessageImpl(log_class, log_level, filename, line_num, function, format, fmt::make_format_args(args...)); +} +/// @brief Implements a log message filter which allows different log classes to have different minimum +/// severity levels. The filter can be changed at runtime and can be parsed from a string to allow +/// editing via the interface or loading from a configuration file. +struct Filter { + /// @brief Initializes the filter with all classes having `default_level` as the minimum level. + explicit Filter(Level level = Level::Info) noexcept { class_levels.fill(level); } + /// @brief Sets the minimum level of `log_class` (and not of its subclasses) to `level`. + void SetClassLevel(Class log_class, Level level) noexcept { class_levels[std::size_t(log_class)] = level; } + void ParseFilterString(std::string_view filter_view) noexcept; + /// @brief Matches class/level combination against the filter, returning true if it passed. + [[nodiscard]] bool CheckMessage(Class log_class, Level level) const noexcept { + return u8(level) >= u8(class_levels[std::size_t(log_class)]); + } + /// @brief Returns true if any logging classes are set to debug + [[nodiscard]] bool IsDebug() const noexcept { + return std::any_of(class_levels.begin(), class_levels.end(), [](const Level& l) { + return u8(l) <= u8(Level::Debug); + }); + } + std::array class_levels; +}; +void Initialize() noexcept; +void Start() noexcept; +void Stop() noexcept; +void SetGlobalFilter(const Filter& filter) noexcept; +void SetColorConsoleBackendEnabled(bool enabled) noexcept; + +} // namespace Common::Log diff --git a/src/common/logging/backend.cpp b/src/common/logging/backend.cpp deleted file mode 100644 index 13aa4a5d2e..0000000000 --- a/src/common/logging/backend.cpp +++ /dev/null @@ -1,353 +0,0 @@ -// SPDX-FileCopyrightText: 2014 Citra Emulator Project -// SPDX-License-Identifier: GPL-2.0-or-later - -#include -#include -#include -#include - -#include - -#ifdef _WIN32 -#include // For OutputDebugStringW -#endif - -#include "common/fs/file.h" -#include "common/fs/fs.h" -#include "common/fs/fs_paths.h" -#include "common/fs/path_util.h" -#include "common/literals.h" -#include "common/polyfill_thread.h" -#include "common/thread.h" - -#include "common/logging/backend.h" -#include "common/logging/log.h" -#include "common/logging/log_entry.h" -#include "common/logging/text_formatter.h" -#include "common/settings.h" -#ifdef _WIN32 -#include "common/string_util.h" -#endif -#include "common/bounded_threadsafe_queue.h" - -namespace Common::Log { - -namespace { - -/** - * Interface for logging backends. - */ -class Backend { -public: - virtual ~Backend() = default; - - virtual void Write(const Entry& entry) = 0; - - virtual void EnableForStacktrace() = 0; - - virtual void Flush() = 0; -}; - -/** - * Backend that writes to stderr and with color - */ -class ColorConsoleBackend final : public Backend { -public: - explicit ColorConsoleBackend() = default; - - ~ColorConsoleBackend() override = default; - - void Write(const Entry& entry) override { - if (enabled.load(std::memory_order_relaxed)) { - PrintColoredMessage(entry); - } - } - - void Flush() override { - // stderr shouldn't be buffered - } - - void EnableForStacktrace() override { - enabled = true; - } - - void SetEnabled(bool enabled_) { - enabled = enabled_; - } - -private: - std::atomic_bool enabled{false}; -}; - -/** - * Backend that writes to a file passed into the constructor - */ -class FileBackend final : public Backend { -public: - explicit FileBackend(const std::filesystem::path& filename) { - auto old_filename = filename; - old_filename += ".old.txt"; - - // Existence checks are done within the functions themselves. - // We don't particularly care if these succeed or not. - static_cast(FS::RemoveFile(old_filename)); - static_cast(FS::RenameFile(filename, old_filename)); - - file = std::make_unique(filename, FS::FileAccessMode::Write, - FS::FileType::TextFile); - } - - ~FileBackend() override = default; - - void Write(const Entry& entry) override { - if (!enabled) { - return; - } - - bytes_written += file->WriteString(FormatLogMessage(entry).append(1, '\n')); - - using namespace Common::Literals; - // Prevent logs from exceeding a set maximum size in the event that log entries are spammed. - const auto write_limit = Settings::values.extended_logging.GetValue() ? 1_GiB : 100_MiB; - const bool write_limit_exceeded = bytes_written > write_limit; - if (entry.log_level >= Level::Error || write_limit_exceeded) { - if (write_limit_exceeded) { - // Stop writing after the write limit is exceeded. - // Don't close the file so we can print a stacktrace if necessary - enabled = false; - } - file->Flush(); - } - } - - void Flush() override { - file->Flush(); - } - - void EnableForStacktrace() override { - enabled = true; - bytes_written = 0; - } - -private: - std::unique_ptr file; - bool enabled = true; - std::size_t bytes_written = 0; -}; - -/** - * Backend that writes to Visual Studio's output window - */ -class DebuggerBackend final : public Backend { -public: - explicit DebuggerBackend() = default; - - ~DebuggerBackend() override = default; - - void Write(const Entry& entry) override { -#ifdef _WIN32 - ::OutputDebugStringW(UTF8ToUTF16W(FormatLogMessage(entry).append(1, '\n')).c_str()); -#endif - } - - void Flush() override {} - - void EnableForStacktrace() override {} -}; - -#ifdef ANDROID -/** - * Backend that writes to the Android logcat - */ -class LogcatBackend : public Backend { -public: - explicit LogcatBackend() = default; - - ~LogcatBackend() override = default; - - void Write(const Entry& entry) override { - PrintMessageToLogcat(entry); - } - - void Flush() override {} - - void EnableForStacktrace() override {} -}; -#endif - -bool initialization_in_progress_suppress_logging = true; - -/** - * Static state as a singleton. - */ -class Impl { -public: - static Impl& Instance() { - if (!instance) { - throw std::runtime_error("Using Logging instance before its initialization"); - } - return *instance; - } - - static void Initialize() { - if (instance) { - LOG_WARNING(Log, "Reinitializing logging backend"); - return; - } - using namespace Common::FS; - const auto& log_dir = GetCitronPath(CitronPath::LogDir); - void(CreateDir(log_dir)); - Filter filter; - filter.ParseFilterString(Settings::values.log_filter.GetValue()); - instance = std::unique_ptr(new Impl(log_dir / LOG_FILE, filter), - Deleter); - initialization_in_progress_suppress_logging = false; - } - - static void Start() { - instance->StartBackendThread(); - } - - static void Stop() { - instance->StopBackendThread(); - } - - Impl(const Impl&) = delete; - Impl& operator=(const Impl&) = delete; - - Impl(Impl&&) = delete; - Impl& operator=(Impl&&) = delete; - - void SetGlobalFilter(const Filter& f) { - filter = f; - } - - void SetColorConsoleBackendEnabled(bool enabled) { - color_console_backend.SetEnabled(enabled); - } - - void PushEntry(Class log_class, Level log_level, const char* filename, unsigned int line_num, - const char* function, std::string&& message) { - if (!filter.CheckMessage(log_class, log_level)) { - return; - } - message_queue.EmplaceWait( - CreateEntry(log_class, log_level, filename, line_num, function, std::move(message))); - } - -private: - Impl(const std::filesystem::path& file_backend_filename, const Filter& filter_) - : filter{filter_}, file_backend{file_backend_filename} {} - - ~Impl() = default; - - void StartBackendThread() { - backend_thread = std::jthread([this](std::stop_token stop_token) { - Common::SetCurrentThreadName("Logger"); - Entry entry; - const auto write_logs = [this, &entry]() { - ForEachBackend([&entry](Backend& backend) { backend.Write(entry); }); - }; - while (!stop_token.stop_requested()) { - message_queue.PopWait(entry, stop_token); - if (entry.filename != nullptr) { - write_logs(); - } - } - // Drain the logging queue. Only writes out up to MAX_LOGS_TO_WRITE to prevent a - // case where a system is repeatedly spamming logs even on close. - int max_logs_to_write = filter.IsDebug() ? INT_MAX : 100; - while (max_logs_to_write-- && message_queue.TryPop(entry)) { - write_logs(); - } - }); - } - - void StopBackendThread() { - backend_thread.request_stop(); - if (backend_thread.joinable()) { - backend_thread.join(); - } - - ForEachBackend([](Backend& backend) { backend.Flush(); }); - } - - Entry CreateEntry(Class log_class, Level log_level, const char* filename, unsigned int line_nr, - const char* function, std::string&& message) const { - using std::chrono::duration_cast; - using std::chrono::microseconds; - using std::chrono::steady_clock; - - return { - .timestamp = duration_cast(steady_clock::now() - time_origin), - .log_class = log_class, - .log_level = log_level, - .filename = filename, - .line_num = line_nr, - .function = function, - .message = std::move(message), - }; - } - - void ForEachBackend(auto lambda) { - lambda(static_cast(debugger_backend)); - lambda(static_cast(color_console_backend)); - lambda(static_cast(file_backend)); -#ifdef ANDROID - lambda(static_cast(lc_backend)); -#endif - } - - static void Deleter(Impl* ptr) { - delete ptr; - } - - static inline std::unique_ptr instance{nullptr, Deleter}; - - Filter filter; - DebuggerBackend debugger_backend{}; - ColorConsoleBackend color_console_backend{}; - FileBackend file_backend; -#ifdef ANDROID - LogcatBackend lc_backend{}; -#endif - - MPSCQueue message_queue{}; - std::chrono::steady_clock::time_point time_origin{std::chrono::steady_clock::now()}; - std::jthread backend_thread; -}; -} // namespace - -void Initialize() { - Impl::Initialize(); -} - -void Start() { - Impl::Start(); -} - -void Stop() { - Impl::Stop(); -} - -void DisableLoggingInTests() { - initialization_in_progress_suppress_logging = true; -} - -void SetGlobalFilter(const Filter& filter) { - Impl::Instance().SetGlobalFilter(filter); -} - -void SetColorConsoleBackendEnabled(bool enabled) { - Impl::Instance().SetColorConsoleBackendEnabled(enabled); -} - -void FmtLogMessageImpl(Class log_class, Level log_level, const char* filename, - unsigned int line_num, const char* function, const char* format, - const fmt::format_args& args) { - if (!initialization_in_progress_suppress_logging) { - Impl::Instance().PushEntry(log_class, log_level, filename, line_num, function, - fmt::vformat(format, args)); - } -} -} // namespace Common::Log diff --git a/src/common/logging/backend.h b/src/common/logging/backend.h deleted file mode 100644 index 2a9926e9e9..0000000000 --- a/src/common/logging/backend.h +++ /dev/null @@ -1,28 +0,0 @@ -// SPDX-FileCopyrightText: 2014 Citra Emulator Project -// SPDX-License-Identifier: GPL-2.0-or-later - -#pragma once - -#include "common/logging/filter.h" - -namespace Common::Log { - -class Filter; - -/// Initializes the logging system. This should be the first thing called in main. -void Initialize(); - -void Start(); - -/// Explicitly stops the logger thread and flushes the buffers -void Stop(); - -void DisableLoggingInTests(); - -/** - * The global filter will prevent any messages from even being processed if they are filtered. - */ -void SetGlobalFilter(const Filter& filter); - -void SetColorConsoleBackendEnabled(bool enabled); -} // namespace Common::Log diff --git a/src/common/logging/filter.cpp b/src/common/logging/filter.cpp deleted file mode 100644 index 34e1cb289c..0000000000 --- a/src/common/logging/filter.cpp +++ /dev/null @@ -1,242 +0,0 @@ -// SPDX-FileCopyrightText: 2014 Citra Emulator Project -// SPDX-License-Identifier: GPL-2.0-or-later - -#include -#include "common/logging/filter.h" -#include "common/string_util.h" - -namespace Common::Log { -namespace { -template -Level GetLevelByName(const It begin, const It end) { - for (u8 i = 0; i < static_cast(Level::Count); ++i) { - const char* level_name = GetLevelName(static_cast(i)); - if (Common::ComparePartialString(begin, end, level_name)) { - return static_cast(i); - } - } - return Level::Count; -} - -template -Class GetClassByName(const It begin, const It end) { - for (u8 i = 0; i < static_cast(Class::Count); ++i) { - const char* level_name = GetLogClassName(static_cast(i)); - if (Common::ComparePartialString(begin, end, level_name)) { - return static_cast(i); - } - } - return Class::Count; -} - -template -bool ParseFilterRule(Filter& instance, Iterator begin, Iterator end) { - auto level_separator = std::find(begin, end, ':'); - if (level_separator == end) { - LOG_ERROR(Log, "Invalid log filter. Must specify a log level after `:`: {}", - std::string(begin, end)); - return false; - } - - const Level level = GetLevelByName(level_separator + 1, end); - if (level == Level::Count) { - LOG_ERROR(Log, "Unknown log level in filter: {}", std::string(begin, end)); - return false; - } - - if (Common::ComparePartialString(begin, level_separator, "*")) { - instance.ResetAll(level); - return true; - } - - const Class log_class = GetClassByName(begin, level_separator); - if (log_class == Class::Count) { - LOG_ERROR(Log, "Unknown log class in filter: {}", std::string(begin, end)); - return false; - } - - instance.SetClassLevel(log_class, level); - return true; -} -} // Anonymous namespace - -/// Macro listing all log classes. Code should define CLS and SUB as desired before invoking this. -#define ALL_LOG_CLASSES() \ - CLS(Log) \ - CLS(Common) \ - SUB(Common, Filesystem) \ - SUB(Common, Memory) \ - CLS(Core) \ - SUB(Core, ARM) \ - SUB(Core, Timing) \ - CLS(Config) \ - CLS(Debug) \ - SUB(Debug, Emulated) \ - SUB(Debug, GPU) \ - SUB(Debug, Breakpoint) \ - SUB(Debug, GDBStub) \ - CLS(Kernel) \ - SUB(Kernel, SVC) \ - CLS(Service) \ - SUB(Service, ACC) \ - SUB(Service, Audio) \ - SUB(Service, AM) \ - SUB(Service, AOC) \ - SUB(Service, APM) \ - SUB(Service, ARP) \ - SUB(Service, BCAT) \ - SUB(Service, BPC) \ - SUB(Service, BGTC) \ - SUB(Service, BTDRV) \ - SUB(Service, BTM) \ - SUB(Service, Capture) \ - SUB(Service, ERPT) \ - SUB(Service, ETicket) \ - SUB(Service, EUPLD) \ - SUB(Service, Fatal) \ - SUB(Service, FGM) \ - SUB(Service, Friend) \ - SUB(Service, FS) \ - SUB(Service, GRC) \ - SUB(Service, HID) \ - SUB(Service, IRS) \ - SUB(Service, JIT) \ - SUB(Service, LBL) \ - SUB(Service, LDN) \ - SUB(Service, LDR) \ - SUB(Service, LM) \ - SUB(Service, Migration) \ - SUB(Service, Mii) \ - SUB(Service, MM) \ - SUB(Service, MNPP) \ - SUB(Service, NCM) \ - SUB(Service, NFC) \ - SUB(Service, NFP) \ - SUB(Service, NGC) \ - SUB(Service, NIFM) \ - SUB(Service, NIM) \ - SUB(Service, NOTIF) \ - SUB(Service, NPNS) \ - SUB(Service, NS) \ - SUB(Service, NVDRV) \ - SUB(Service, Nvnflinger) \ - SUB(Service, OLSC) \ - SUB(Service, PCIE) \ - SUB(Service, PCTL) \ - SUB(Service, PCV) \ - SUB(Service, PM) \ - SUB(Service, PREPO) \ - SUB(Service, PSC) \ - SUB(Service, PTM) \ - SUB(Service, SET) \ - SUB(Service, SM) \ - SUB(Service, SPL) \ - SUB(Service, SSL) \ - SUB(Service, TCAP) \ - SUB(Service, Time) \ - SUB(Service, TMA) \ - SUB(Service, USB) \ - SUB(Service, VI) \ - SUB(Service, WLAN) \ - CLS(HW) \ - SUB(HW, Memory) \ - SUB(HW, LCD) \ - SUB(HW, GPU) \ - SUB(HW, AES) \ - CLS(IPC) \ - CLS(Frontend) \ - CLS(Render) \ - SUB(Render, Software) \ - SUB(Render, Vulkan) \ - CLS(Shader) \ - SUB(Shader, SPIRV) \ - SUB(Shader, GLASM) \ - SUB(Shader, GLSL) \ - CLS(Audio) \ - SUB(Audio, DSP) \ - SUB(Audio, Sink) \ - CLS(Input) \ - CLS(Network) \ - CLS(Loader) \ - CLS(CheatEngine) \ - CLS(Crypto) \ - CLS(WebService) - -// GetClassName is a macro defined by Windows.h, grrr... -const char* GetLogClassName(Class log_class) { - switch (log_class) { -#define CLS(x) \ - case Class::x: \ - return #x; -#define SUB(x, y) \ - case Class::x##_##y: \ - return #x "." #y; - ALL_LOG_CLASSES() -#undef CLS -#undef SUB - case Class::Count: - break; - } - return "Invalid"; -} - -const char* GetLevelName(Level log_level) { -#define LVL(x) \ - case Level::x: \ - return #x - switch (log_level) { - LVL(Trace); - LVL(Debug); - LVL(Info); - LVL(Warning); - LVL(Error); - LVL(Critical); - case Level::Count: - break; - } -#undef LVL - return "Invalid"; -} - -Filter::Filter(Level default_level) { - ResetAll(default_level); -} - -void Filter::ResetAll(Level level) { - class_levels.fill(level); -} - -void Filter::SetClassLevel(Class log_class, Level level) { - class_levels[static_cast(log_class)] = level; -} - -void Filter::ParseFilterString(std::string_view filter_view) { - auto clause_begin = filter_view.cbegin(); - while (clause_begin != filter_view.cend()) { - auto clause_end = std::find(clause_begin, filter_view.cend(), ' '); - - // If clause isn't empty - if (clause_end != clause_begin) { - ParseFilterRule(*this, clause_begin, clause_end); - } - - if (clause_end != filter_view.cend()) { - // Skip over the whitespace - ++clause_end; - } - clause_begin = clause_end; - } -} - -bool Filter::CheckMessage(Class log_class, Level level) const { - return static_cast(level) >= - static_cast(class_levels[static_cast(log_class)]); -} - -bool Filter::IsDebug() const { - return std::any_of(class_levels.begin(), class_levels.end(), [](const Level& l) { - return static_cast(l) <= static_cast(Level::Debug); - }); -} - -} // namespace Common::Log diff --git a/src/common/logging/filter.h b/src/common/logging/filter.h deleted file mode 100644 index 54d172cc02..0000000000 --- a/src/common/logging/filter.h +++ /dev/null @@ -1,64 +0,0 @@ -// SPDX-FileCopyrightText: 2014 Citra Emulator Project -// SPDX-License-Identifier: GPL-2.0-or-later - -#pragma once - -#include -#include -#include -#include "common/logging/log.h" - -namespace Common::Log { - -/** - * Returns the name of the passed log class as a C-string. Subclasses are separated by periods - * instead of underscores as in the enumeration. - */ -const char* GetLogClassName(Class log_class); - -/** - * Returns the name of the passed log level as a C-string. - */ -const char* GetLevelName(Level log_level); - -/** - * Implements a log message filter which allows different log classes to have different minimum - * severity levels. The filter can be changed at runtime and can be parsed from a string to allow - * editing via the interface or loading from a configuration file. - */ -class Filter { -public: - /// Initializes the filter with all classes having `default_level` as the minimum level. - explicit Filter(Level default_level = Level::Info); - - /// Resets the filter so that all classes have `level` as the minimum displayed level. - void ResetAll(Level level); - /// Sets the minimum level of `log_class` (and not of its subclasses) to `level`. - void SetClassLevel(Class log_class, Level level); - - /** - * Parses a filter string and applies it to this filter. - * - * A filter string consists of a space-separated list of filter rules, each of the format - * `:`. `` is a log class name, with subclasses separated using periods. - * `*` is allowed as a class name and will reset all filters to the specified level. `` - * a severity level name which will be set as the minimum logging level of the matched classes. - * Rules are applied left to right, with each rule overriding previous ones in the sequence. - * - * A few examples of filter rules: - * - `*:Info` -- Resets the level of all classes to Info. - * - `Service:Info` -- Sets the level of Service to Info. - * - `Service.FS:Trace` -- Sets the level of the Service.FS class to Trace. - */ - void ParseFilterString(std::string_view filter_view); - - /// Matches class/level combination against the filter, returning true if it passed. - bool CheckMessage(Class log_class, Level level) const; - - /// Returns true if any logging classes are set to debug - bool IsDebug() const; - -private: - std::array(Class::Count)> class_levels; -}; -} // namespace Common::Log diff --git a/src/common/logging/formatter.h b/src/common/logging/formatter.h deleted file mode 100644 index 16bddde8fe..0000000000 --- a/src/common/logging/formatter.h +++ /dev/null @@ -1,22 +0,0 @@ -// SPDX-FileCopyrightText: Copyright 2022 yuzu Emulator Project -// SPDX-License-Identifier: GPL-2.0-or-later - -#pragma once - -#include - -#include - -// adapted from https://github.com/fmtlib/fmt/issues/2704 -// a generic formatter for enum classes -#if FMT_VERSION >= 80100 -template -struct fmt::formatter, char>> - : formatter> { - template - auto format(const T& value, FormatContext& ctx) const -> decltype(ctx.out()) { - return fmt::formatter>::format( - static_cast>(value), ctx); - } -}; -#endif diff --git a/src/common/logging/log.h b/src/common/logging/log.h deleted file mode 100644 index c00c01a9e2..0000000000 --- a/src/common/logging/log.h +++ /dev/null @@ -1,67 +0,0 @@ -// SPDX-FileCopyrightText: 2014 Citra Emulator Project -// SPDX-License-Identifier: GPL-2.0-or-later - -#pragma once - -#include -#include - -#include - -#include "common/logging/formatter.h" -#include "common/logging/types.h" - -namespace Common::Log { - -// trims up to and including the last of ../, ..\, src/, src\ in a string -constexpr const char* TrimSourcePath(std::string_view source) { - const auto rfind = [source](const std::string_view match) { - return source.rfind(match) == source.npos ? 0 : (source.rfind(match) + match.size()); - }; - auto idx = std::max({rfind("src/"), rfind("src\\"), rfind("../"), rfind("..\\")}); - return source.data() + idx; -} - -/// Logs a message to the global logger, using fmt -void FmtLogMessageImpl(Class log_class, Level log_level, const char* filename, - unsigned int line_num, const char* function, const char* format, - const fmt::format_args& args); - -template -void FmtLogMessage(Class log_class, Level log_level, const char* filename, unsigned int line_num, - const char* function, const char* format, const Args&... args) { - FmtLogMessageImpl(log_class, log_level, filename, line_num, function, format, - fmt::make_format_args(args...)); -} - -} // namespace Common::Log - -#ifdef _DEBUG -#define LOG_TRACE(log_class, ...) \ - Common::Log::FmtLogMessage(Common::Log::Class::log_class, Common::Log::Level::Trace, \ - Common::Log::TrimSourcePath(__FILE__), __LINE__, __func__, \ - __VA_ARGS__) -#else -#define LOG_TRACE(log_class, fmt, ...) (void(0)) -#endif - -#define LOG_DEBUG(log_class, ...) \ - Common::Log::FmtLogMessage(Common::Log::Class::log_class, Common::Log::Level::Debug, \ - Common::Log::TrimSourcePath(__FILE__), __LINE__, __func__, \ - __VA_ARGS__) -#define LOG_INFO(log_class, ...) \ - Common::Log::FmtLogMessage(Common::Log::Class::log_class, Common::Log::Level::Info, \ - Common::Log::TrimSourcePath(__FILE__), __LINE__, __func__, \ - __VA_ARGS__) -#define LOG_WARNING(log_class, ...) \ - Common::Log::FmtLogMessage(Common::Log::Class::log_class, Common::Log::Level::Warning, \ - Common::Log::TrimSourcePath(__FILE__), __LINE__, __func__, \ - __VA_ARGS__) -#define LOG_ERROR(log_class, ...) \ - Common::Log::FmtLogMessage(Common::Log::Class::log_class, Common::Log::Level::Error, \ - Common::Log::TrimSourcePath(__FILE__), __LINE__, __func__, \ - __VA_ARGS__) -#define LOG_CRITICAL(log_class, ...) \ - Common::Log::FmtLogMessage(Common::Log::Class::log_class, Common::Log::Level::Critical, \ - Common::Log::TrimSourcePath(__FILE__), __LINE__, __func__, \ - __VA_ARGS__) diff --git a/src/common/logging/log_entry.h b/src/common/logging/log_entry.h deleted file mode 100644 index d8d7daf762..0000000000 --- a/src/common/logging/log_entry.h +++ /dev/null @@ -1,26 +0,0 @@ -// SPDX-FileCopyrightText: Copyright 2021 yuzu Emulator Project -// SPDX-License-Identifier: GPL-2.0-or-later - -#pragma once - -#include - -#include "common/logging/types.h" - -namespace Common::Log { - -/** - * A log entry. Log entries are store in a structured format to permit more varied output - * formatting on different frontends, as well as facilitating filtering and aggregation. - */ -struct Entry { - std::chrono::microseconds timestamp; - Class log_class{}; - Level log_level{}; - const char* filename = nullptr; - unsigned int line_num = 0; - std::string function; - std::string message; -}; - -} // namespace Common::Log diff --git a/src/common/logging/text_formatter.cpp b/src/common/logging/text_formatter.cpp deleted file mode 100644 index b92cde15ce..0000000000 --- a/src/common/logging/text_formatter.cpp +++ /dev/null @@ -1,144 +0,0 @@ -// SPDX-FileCopyrightText: 2014 Citra Emulator Project -// SPDX-License-Identifier: GPL-2.0-or-later - -#include -#include - -#ifdef _WIN32 -#include -#endif - -#ifdef ANDROID -#include -#endif - -#include "common/assert.h" -#include "common/logging/filter.h" -#include "common/logging/log.h" -#include "common/logging/log_entry.h" -#include "common/logging/text_formatter.h" - -namespace Common::Log { - -std::string FormatLogMessage(const Entry& entry) { - unsigned int time_seconds = static_cast(entry.timestamp.count() / 1000000); - unsigned int time_fractional = static_cast(entry.timestamp.count() % 1000000); - - const char* class_name = GetLogClassName(entry.log_class); - const char* level_name = GetLevelName(entry.log_level); - - return fmt::format("[{:4d}.{:06d}] {} <{}> {}:{}:{}: {}", time_seconds, time_fractional, - class_name, level_name, entry.filename, entry.function, entry.line_num, - entry.message); -} - -void PrintMessage(const Entry& entry) { - const auto str = FormatLogMessage(entry).append(1, '\n'); - fputs(str.c_str(), stderr); -} - -void PrintColoredMessage(const Entry& entry) { -#ifdef _WIN32 - HANDLE console_handle = GetStdHandle(STD_ERROR_HANDLE); - if (console_handle == INVALID_HANDLE_VALUE) { - return; - } - - CONSOLE_SCREEN_BUFFER_INFO original_info = {}; - GetConsoleScreenBufferInfo(console_handle, &original_info); - - WORD color = 0; - switch (entry.log_level) { - case Level::Trace: // Grey - color = FOREGROUND_INTENSITY; - break; - case Level::Debug: // Cyan - color = FOREGROUND_GREEN | FOREGROUND_BLUE; - break; - case Level::Info: // Bright gray - color = FOREGROUND_RED | FOREGROUND_GREEN | FOREGROUND_BLUE; - break; - case Level::Warning: // Bright yellow - color = FOREGROUND_RED | FOREGROUND_GREEN | FOREGROUND_INTENSITY; - break; - case Level::Error: // Bright red - color = FOREGROUND_RED | FOREGROUND_INTENSITY; - break; - case Level::Critical: // Bright magenta - color = FOREGROUND_RED | FOREGROUND_BLUE | FOREGROUND_INTENSITY; - break; - case Level::Count: - UNREACHABLE(); - } - - SetConsoleTextAttribute(console_handle, color); -#else -#define ESC "\x1b" - const char* color = ""; - switch (entry.log_level) { - case Level::Trace: // Grey - color = ESC "[1;30m"; - break; - case Level::Debug: // Cyan - color = ESC "[0;36m"; - break; - case Level::Info: // Bright gray - color = ESC "[0;37m"; - break; - case Level::Warning: // Bright yellow - color = ESC "[1;33m"; - break; - case Level::Error: // Bright red - color = ESC "[1;31m"; - break; - case Level::Critical: // Bright magenta - color = ESC "[1;35m"; - break; - case Level::Count: - UNREACHABLE(); - } - - fputs(color, stderr); -#endif - - PrintMessage(entry); - -#ifdef _WIN32 - SetConsoleTextAttribute(console_handle, original_info.wAttributes); -#else - fputs(ESC "[0m", stderr); -#undef ESC -#endif -} - -void PrintMessageToLogcat(const Entry& entry) { -#ifdef ANDROID - const auto str = FormatLogMessage(entry); - - android_LogPriority android_log_priority; - switch (entry.log_level) { - case Level::Trace: - android_log_priority = ANDROID_LOG_VERBOSE; - break; - case Level::Debug: - android_log_priority = ANDROID_LOG_DEBUG; - break; - case Level::Info: - android_log_priority = ANDROID_LOG_INFO; - break; - case Level::Warning: - android_log_priority = ANDROID_LOG_WARN; - break; - case Level::Error: - android_log_priority = ANDROID_LOG_ERROR; - break; - case Level::Critical: - android_log_priority = ANDROID_LOG_FATAL; - break; - case Level::Count: - UNREACHABLE(); - } - __android_log_print(android_log_priority, "CitronNative", "%s", str.c_str()); -#endif -} -} // namespace Common::Log diff --git a/src/common/logging/text_formatter.h b/src/common/logging/text_formatter.h deleted file mode 100644 index 68417420bb..0000000000 --- a/src/common/logging/text_formatter.h +++ /dev/null @@ -1,20 +0,0 @@ -// SPDX-FileCopyrightText: 2014 Citra Emulator Project -// SPDX-License-Identifier: GPL-2.0-or-later - -#pragma once - -#include - -namespace Common::Log { - -struct Entry; - -/// Formats a log entry into the provided text buffer. -std::string FormatLogMessage(const Entry& entry); -/// Formats and prints a log entry to stderr. -void PrintMessage(const Entry& entry); -/// Prints the same message as `PrintMessage`, but colored according to the severity level. -void PrintColoredMessage(const Entry& entry); -/// Formats and prints a log entry to the android logcat. -void PrintMessageToLogcat(const Entry& entry); -} // namespace Common::Log diff --git a/src/common/logging/types.h b/src/common/logging/types.h deleted file mode 100644 index 859beeb574..0000000000 --- a/src/common/logging/types.h +++ /dev/null @@ -1,135 +0,0 @@ -// SPDX-FileCopyrightText: Copyright 2021 yuzu Emulator Project -// SPDX-License-Identifier: GPL-2.0-or-later - -#pragma once - -#include "common/common_types.h" - -namespace Common::Log { - -/// Specifies the severity or level of detail of the log message. -enum class Level : u8 { - Trace, ///< Extremely detailed and repetitive debugging information that is likely to - ///< pollute logs. - Debug, ///< Less detailed debugging information. - Info, ///< Status information from important points during execution. - Warning, ///< Minor or potential problems found during execution of a task. - Error, ///< Major problems found during execution of a task that prevent it from being - ///< completed. - Critical, ///< Major problems during execution that threaten the stability of the entire - ///< application. - - Count ///< Total number of logging levels -}; - -/** - * Specifies the sub-system that generated the log message. - * - * @note If you add a new entry here, also add a corresponding one to `ALL_LOG_CLASSES` in - * filter.cpp. - */ -enum class Class : u8 { - Log, ///< Messages about the log system itself - Common, ///< Library routines - Common_Filesystem, ///< Filesystem interface library - Common_Memory, ///< Memory mapping and management functions - Core, ///< LLE emulation core - Core_ARM, ///< ARM CPU core - Core_Timing, ///< CoreTiming functions - Config, ///< Emulator configuration (including commandline) - Debug, ///< Debugging tools - Debug_Emulated, ///< Debug messages from the emulated programs - Debug_GPU, ///< GPU debugging tools - Debug_Breakpoint, ///< Logging breakpoints and watchpoints - Debug_GDBStub, ///< GDB Stub - Kernel, ///< The HLE implementation of the CTR kernel - Kernel_SVC, ///< Kernel system calls - Service, ///< HLE implementation of system services. Each major service - ///< should have its own subclass. - Service_ACC, ///< The ACC (Accounts) service - Service_AM, ///< The AM (Applet manager) service - Service_AOC, ///< The AOC (AddOn Content) service - Service_APM, ///< The APM (Performance) service - Service_ARP, ///< The ARP service - Service_Audio, ///< The Audio (Audio control) service - Service_BCAT, ///< The BCAT service - Service_BGTC, ///< The BGTC (Background Task Controller) service - Service_BPC, ///< The BPC service - Service_BTDRV, ///< The Bluetooth driver service - Service_BTM, ///< The BTM service - Service_Capture, ///< The capture service - Service_ERPT, ///< The error reporting service - Service_ETicket, ///< The ETicket service - Service_EUPLD, ///< The error upload service - Service_Fatal, ///< The Fatal service - Service_FGM, ///< The FGM service - Service_Friend, ///< The friend service - Service_FS, ///< The FS (Filesystem) service - Service_GRC, ///< The game recording service - Service_HID, ///< The HID (Human interface device) service - Service_IRS, ///< The IRS service - Service_JIT, ///< The JIT service - Service_LBL, ///< The LBL (LCD backlight) service - Service_LDN, ///< The LDN (Local domain network) service - Service_LDR, ///< The loader service - Service_LM, ///< The LM (Logger) service - Service_Migration, ///< The migration service - Service_Mii, ///< The Mii service - Service_MM, ///< The MM (Multimedia) service - Service_MNPP, ///< The MNPP service - Service_NCM, ///< The NCM service - Service_NFC, ///< The NFC (Near-field communication) service - Service_NFP, ///< The NFP service - Service_NGC, ///< The NGC (No Good Content) service - Service_NIFM, ///< The NIFM (Network interface) service - Service_NIM, ///< The NIM service - Service_NOTIF, ///< The NOTIF (Notification) service - Service_NPNS, ///< The NPNS service - Service_NS, ///< The NS services - Service_NVDRV, ///< The NVDRV (Nvidia driver) service - Service_Nvnflinger, ///< The Nvnflinger service - Service_OLSC, ///< The OLSC service - Service_PCIE, ///< The PCIe service - Service_PCTL, ///< The PCTL (Parental control) service - Service_PCV, ///< The PCV service - Service_PM, ///< The PM service - Service_PREPO, ///< The PREPO (Play report) service - Service_PSC, ///< The PSC service - Service_PTM, ///< The PTM service - Service_SET, ///< The SET (Settings) service - Service_SM, ///< The SM (Service manager) service - Service_SPL, ///< The SPL service - Service_SSL, ///< The SSL service - Service_TCAP, ///< The TCAP service. - Service_Time, ///< The time service - Service_TMA, ///< The TMA (Target Manager Agent) service - Service_USB, ///< The USB (Universal Serial Bus) service - Service_VI, ///< The VI (Video interface) service - Service_WLAN, ///< The WLAN (Wireless local area network) service - HW, ///< Low-level hardware emulation - HW_Memory, ///< Memory-map and address translation - HW_LCD, ///< LCD register emulation - HW_GPU, ///< GPU control emulation - HW_AES, ///< AES engine emulation - IPC, ///< IPC interface - Frontend, ///< Emulator UI - Render, ///< Emulator video output and hardware acceleration - Render_Software, ///< Software renderer backend - Render_Vulkan, ///< Vulkan backend - Shader, ///< Shader recompiler - Shader_SPIRV, ///< Shader SPIR-V code generation - Shader_GLASM, ///< Shader GLASM code generation - Shader_GLSL, ///< Shader GLSL code generation - Audio, ///< Audio emulation - Audio_DSP, ///< The HLE implementation of the DSP - Audio_Sink, ///< Emulator audio output backend - Loader, ///< ROM loader - CheatEngine, ///< Memory manipulation and engine VM functions - Crypto, ///< Cryptographic engine/functions - Input, ///< Input emulation - Network, ///< Network emulation - WebService, ///< Interface to citron Web Services - Count ///< Total number of logging classes -}; - -} // namespace Common::Log diff --git a/src/common/param_package.cpp b/src/common/param_package.cpp index 629babb811..102fb7bb9b 100644 --- a/src/common/param_package.cpp +++ b/src/common/param_package.cpp @@ -6,7 +6,7 @@ #include #include -#include "common/logging/log.h" +#include "common/logging.h" #include "common/param_package.h" #include "common/string_util.h" diff --git a/src/common/settings.cpp b/src/common/settings.cpp index c14abecdb9..14fd452933 100644 --- a/src/common/settings.cpp +++ b/src/common/settings.cpp @@ -20,7 +20,7 @@ #include "common/assert.h" #include "common/fs/fs_util.h" #include "common/fs/path_util.h" -#include "common/logging/log.h" +#include "common/logging.h" #include "common/settings.h" #include "common/time_zone.h" diff --git a/src/common/thread.cpp b/src/common/thread.cpp index bc46a317cb..1648975afe 100644 --- a/src/common/thread.cpp +++ b/src/common/thread.cpp @@ -5,7 +5,7 @@ #include #include "common/error.h" -#include "common/logging/log.h" +#include "common/logging.h" #include "common/thread.h" #ifdef __APPLE__ #include diff --git a/src/common/time_zone.cpp b/src/common/time_zone.cpp index f77df604f4..23915b0634 100644 --- a/src/common/time_zone.cpp +++ b/src/common/time_zone.cpp @@ -10,7 +10,7 @@ #include #include -#include "common/logging/log.h" +#include "common/logging.h" #include "common/time_zone.h" namespace Common::TimeZone { diff --git a/src/common/x64/cpu_detect.cpp b/src/common/x64/cpu_detect.cpp index 4cf6bce7fa..7f03ac0a5f 100644 --- a/src/common/x64/cpu_detect.cpp +++ b/src/common/x64/cpu_detect.cpp @@ -12,7 +12,7 @@ #include #include "common/bit_util.h" #include "common/common_types.h" -#include "common/logging/log.h" +#include "common/logging.h" #include "common/x64/cpu_detect.h" #include "common/x64/rdtsc.h" diff --git a/src/common/xci_trimmer.cpp b/src/common/xci_trimmer.cpp index c94d729137..dae6779ba1 100644 --- a/src/common/xci_trimmer.cpp +++ b/src/common/xci_trimmer.cpp @@ -7,7 +7,7 @@ #include "common/fs/file.h" #include "common/fs/fs.h" -#include "common/logging/log.h" +#include "common/logging.h" #include "common/xci_trimmer.h" namespace Common { diff --git a/src/common/zstd_compression.cpp b/src/common/zstd_compression.cpp index 9aad959020..a4fa274374 100644 --- a/src/common/zstd_compression.cpp +++ b/src/common/zstd_compression.cpp @@ -5,7 +5,7 @@ #include #include -#include "common/logging/log.h" +#include "common/logging.h" #include "common/zstd_compression.h" namespace Common::Compression { diff --git a/src/core/arm/arm_interface.cpp b/src/core/arm/arm_interface.cpp index 0b7904c642..a452998e11 100644 --- a/src/core/arm/arm_interface.cpp +++ b/src/core/arm/arm_interface.cpp @@ -1,7 +1,7 @@ // SPDX-FileCopyrightText: Copyright 2018 yuzu Emulator Project // SPDX-License-Identifier: GPL-2.0-or-later -#include "common/logging/log.h" +#include "common/logging.h" #include "core/arm/arm_interface.h" #include "core/arm/debug.h" #include "core/core.h" diff --git a/src/core/arm/dynarmic/dynarmic_cp15.cpp b/src/core/arm/dynarmic/dynarmic_cp15.cpp index ee97ac6395..ced2dcba28 100644 --- a/src/core/arm/dynarmic/dynarmic_cp15.cpp +++ b/src/core/arm/dynarmic/dynarmic_cp15.cpp @@ -2,7 +2,7 @@ // SPDX-License-Identifier: GPL-2.0-or-later #include -#include "common/logging/log.h" +#include "common/logging.h" #include "core/arm/dynarmic/arm_dynarmic_32.h" #include "core/arm/dynarmic/dynarmic_cp15.h" #include "core/core.h" diff --git a/src/core/core.cpp b/src/core/core.cpp index 3da198f11c..fd9f201725 100644 --- a/src/core/core.cpp +++ b/src/core/core.cpp @@ -34,7 +34,7 @@ #include "audio_core/audio_core.h" #include "common/fs/fs.h" -#include "common/logging/log.h" +#include "common/logging.h" #include "common/microprofile.h" #include "common/settings.h" #include "common/settings_enums.h" diff --git a/src/core/crypto/aes_util.cpp b/src/core/crypto/aes_util.cpp index cd7e15a582..98dc7a6f4d 100644 --- a/src/core/crypto/aes_util.cpp +++ b/src/core/crypto/aes_util.cpp @@ -4,7 +4,7 @@ #include #include #include "common/assert.h" -#include "common/logging/log.h" +#include "common/logging.h" #include "core/crypto/aes_util.h" #include "core/crypto/key_manager.h" diff --git a/src/core/crypto/key_manager.cpp b/src/core/crypto/key_manager.cpp index f02cbf278d..ba0c170b83 100644 --- a/src/core/crypto/key_manager.cpp +++ b/src/core/crypto/key_manager.cpp @@ -19,7 +19,7 @@ #include "common/fs/fs.h" #include "common/fs/path_util.h" #include "common/hex_util.h" -#include "common/logging/log.h" +#include "common/logging.h" #include "common/settings.h" #include "common/string_util.h" #include "core/crypto/aes_util.h" diff --git a/src/core/crypto/partition_data_manager.cpp b/src/core/crypto/partition_data_manager.cpp index 57aa7b83f3..782025300d 100644 --- a/src/core/crypto/partition_data_manager.cpp +++ b/src/core/crypto/partition_data_manager.cpp @@ -14,7 +14,7 @@ #include "common/common_funcs.h" #include "common/common_types.h" #include "common/hex_util.h" -#include "common/logging/log.h" +#include "common/logging.h" #include "common/string_util.h" #include "common/swap.h" #include "core/crypto/key_manager.h" diff --git a/src/core/debugger/debugger.cpp b/src/core/debugger/debugger.cpp index fa67edfc0b..f31fba97ba 100644 --- a/src/core/debugger/debugger.cpp +++ b/src/core/debugger/debugger.cpp @@ -11,7 +11,7 @@ #include #endif -#include "common/logging/log.h" +#include "common/logging.h" #include "common/polyfill_thread.h" #include "common/thread.h" #include "core/core.h" diff --git a/src/core/debugger/gdbstub.cpp b/src/core/debugger/gdbstub.cpp index 51f0583eba..9581cb3236 100644 --- a/src/core/debugger/gdbstub.cpp +++ b/src/core/debugger/gdbstub.cpp @@ -14,7 +14,7 @@ #include #include "common/hex_util.h" -#include "common/logging/log.h" +#include "common/logging.h" #include "common/scope_exit.h" #include "common/settings.h" #include "common/string_util.h" diff --git a/src/core/file_sys/card_image.cpp b/src/core/file_sys/card_image.cpp index 0bcf40cf86..f250be240e 100644 --- a/src/core/file_sys/card_image.cpp +++ b/src/core/file_sys/card_image.cpp @@ -6,7 +6,7 @@ #include -#include "common/logging/log.h" +#include "common/logging.h" #include "core/crypto/key_manager.h" #include "core/file_sys/card_image.h" #include "core/file_sys/content_archive.h" diff --git a/src/core/file_sys/content_archive.cpp b/src/core/file_sys/content_archive.cpp index 6652523589..78ceb6abc4 100644 --- a/src/core/file_sys/content_archive.cpp +++ b/src/core/file_sys/content_archive.cpp @@ -6,7 +6,7 @@ #include #include -#include "common/logging/log.h" +#include "common/logging.h" #include "common/polyfill_ranges.h" #include "core/crypto/aes_util.h" #include "core/crypto/ctr_encryption_layer.h" diff --git a/src/core/file_sys/control_metadata.cpp b/src/core/file_sys/control_metadata.cpp index 871b37a81e..17c3537cc9 100644 --- a/src/core/file_sys/control_metadata.cpp +++ b/src/core/file_sys/control_metadata.cpp @@ -3,7 +3,7 @@ #include -#include "common/logging/log.h" +#include "common/logging.h" #include "common/settings.h" #include "common/string_util.h" #include "common/swap.h" diff --git a/src/core/file_sys/directory_save_data_filesystem.cpp b/src/core/file_sys/directory_save_data_filesystem.cpp index c4eee713f2..38b68f358c 100644 --- a/src/core/file_sys/directory_save_data_filesystem.cpp +++ b/src/core/file_sys/directory_save_data_filesystem.cpp @@ -3,7 +3,7 @@ #include #include -#include "common/logging/log.h" +#include "common/logging.h" #include "common/settings.h" #include "core/file_sys/directory_save_data_filesystem.h" #include "core/file_sys/errors.h" diff --git a/src/core/file_sys/ips_layer.cpp b/src/core/file_sys/ips_layer.cpp index d1ac24072e..8e80bab462 100644 --- a/src/core/file_sys/ips_layer.cpp +++ b/src/core/file_sys/ips_layer.cpp @@ -9,7 +9,7 @@ #include #include "common/hex_util.h" -#include "common/logging/log.h" +#include "common/logging.h" #include "common/swap.h" #include "core/file_sys/ips_layer.h" #include "core/file_sys/vfs/vfs_vector.h" diff --git a/src/core/file_sys/nca_metadata.cpp b/src/core/file_sys/nca_metadata.cpp index 9e855c50d1..7b189fbce8 100644 --- a/src/core/file_sys/nca_metadata.cpp +++ b/src/core/file_sys/nca_metadata.cpp @@ -3,7 +3,7 @@ #include #include "common/common_types.h" -#include "common/logging/log.h" +#include "common/logging.h" #include "common/swap.h" #include "core/file_sys/nca_metadata.h" #include "core/file_sys/vfs/vfs.h" diff --git a/src/core/file_sys/partition_filesystem.cpp b/src/core/file_sys/partition_filesystem.cpp index dd8de9d8aa..a2f3665e4a 100644 --- a/src/core/file_sys/partition_filesystem.cpp +++ b/src/core/file_sys/partition_filesystem.cpp @@ -7,7 +7,7 @@ #include #include -#include "common/logging/log.h" +#include "common/logging.h" #include "core/file_sys/partition_filesystem.h" #include "core/file_sys/vfs/vfs_offset.h" #include "core/loader/loader.h" diff --git a/src/core/file_sys/patch_manager.cpp b/src/core/file_sys/patch_manager.cpp index 9ac3d04876..8d6473f11d 100644 --- a/src/core/file_sys/patch_manager.cpp +++ b/src/core/file_sys/patch_manager.cpp @@ -11,7 +11,7 @@ #include #include "common/fs/path_util.h" #include "common/hex_util.h" -#include "common/logging/log.h" +#include "common/logging.h" #include "common/settings.h" #ifndef _WIN32 #include "common/string_util.h" diff --git a/src/core/file_sys/program_metadata.cpp b/src/core/file_sys/program_metadata.cpp index 289969cc4c..fde96453fe 100644 --- a/src/core/file_sys/program_metadata.cpp +++ b/src/core/file_sys/program_metadata.cpp @@ -4,7 +4,7 @@ #include #include -#include "common/logging/log.h" +#include "common/logging.h" #include "common/scope_exit.h" #include "core/file_sys/program_metadata.h" #include "core/file_sys/vfs/vfs.h" diff --git a/src/core/file_sys/registered_cache.cpp b/src/core/file_sys/registered_cache.cpp index 3adf620d68..b8bbe1df32 100644 --- a/src/core/file_sys/registered_cache.cpp +++ b/src/core/file_sys/registered_cache.cpp @@ -11,7 +11,7 @@ #include "common/assert.h" #include "common/fs/path_util.h" #include "common/hex_util.h" -#include "common/logging/log.h" +#include "common/logging.h" #include "common/scope_exit.h" #include "core/crypto/key_manager.h" #include "core/file_sys/card_image.h" diff --git a/src/core/file_sys/romfs_factory.cpp b/src/core/file_sys/romfs_factory.cpp index 35e1499055..93b0834ba1 100644 --- a/src/core/file_sys/romfs_factory.cpp +++ b/src/core/file_sys/romfs_factory.cpp @@ -4,7 +4,7 @@ #include #include "common/assert.h" #include "common/common_types.h" -#include "common/logging/log.h" +#include "common/logging.h" #include "core/file_sys/common_funcs.h" #include "core/file_sys/content_archive.h" #include "core/file_sys/nca_metadata.h" diff --git a/src/core/file_sys/savedata_extra_data_accessor.cpp b/src/core/file_sys/savedata_extra_data_accessor.cpp index ead1372ddd..2037229e18 100644 --- a/src/core/file_sys/savedata_extra_data_accessor.cpp +++ b/src/core/file_sys/savedata_extra_data_accessor.cpp @@ -2,7 +2,7 @@ // SPDX-License-Identifier: GPL-2.0-or-later #include -#include "common/logging/log.h" +#include "common/logging.h" #include "core/file_sys/errors.h" #include "core/file_sys/savedata_extra_data_accessor.h" diff --git a/src/core/file_sys/savedata_factory.cpp b/src/core/file_sys/savedata_factory.cpp index ff256c4ce0..9de233f8e6 100644 --- a/src/core/file_sys/savedata_factory.cpp +++ b/src/core/file_sys/savedata_factory.cpp @@ -8,7 +8,7 @@ #include #include "common/assert.h" #include "common/common_types.h" -#include "common/logging/log.h" +#include "common/logging.h" #include "common/settings.h" #include "common/uuid.h" #include "core/core.h" diff --git a/src/core/file_sys/submission_package.cpp b/src/core/file_sys/submission_package.cpp index 68e8ec22fc..d408612cc5 100644 --- a/src/core/file_sys/submission_package.cpp +++ b/src/core/file_sys/submission_package.cpp @@ -7,7 +7,7 @@ #include #include "common/hex_util.h" -#include "common/logging/log.h" +#include "common/logging.h" #include "core/crypto/key_manager.h" #include "core/file_sys/content_archive.h" #include "core/file_sys/nca_metadata.h" diff --git a/src/core/file_sys/system_archive/system_archive.cpp b/src/core/file_sys/system_archive/system_archive.cpp index b53eef877a..b5c3ff3248 100644 --- a/src/core/file_sys/system_archive/system_archive.cpp +++ b/src/core/file_sys/system_archive/system_archive.cpp @@ -1,7 +1,7 @@ // SPDX-FileCopyrightText: Copyright 2018 yuzu Emulator Project // SPDX-License-Identifier: GPL-2.0-or-later -#include "common/logging/log.h" +#include "common/logging.h" #include "core/file_sys/romfs.h" #include "core/file_sys/system_archive/mii_model.h" #include "core/file_sys/system_archive/ng_word.h" diff --git a/src/core/file_sys/system_archive/system_version.cpp b/src/core/file_sys/system_archive/system_version.cpp index 5662004b7a..7b682957b1 100644 --- a/src/core/file_sys/system_archive/system_version.cpp +++ b/src/core/file_sys/system_archive/system_version.cpp @@ -1,7 +1,7 @@ // SPDX-FileCopyrightText: Copyright 2019 yuzu Emulator Project // SPDX-License-Identifier: GPL-2.0-or-later -#include "common/logging/log.h" +#include "common/logging.h" #include "core/file_sys/system_archive/system_version.h" #include "core/file_sys/vfs/vfs_vector.h" #include "core/hle/api_version.h" diff --git a/src/core/file_sys/vfs/vfs_real.cpp b/src/core/file_sys/vfs/vfs_real.cpp index 997205fac4..0397ffa2d2 100644 --- a/src/core/file_sys/vfs/vfs_real.cpp +++ b/src/core/file_sys/vfs/vfs_real.cpp @@ -9,7 +9,7 @@ #include "common/fs/file.h" #include "common/fs/fs.h" #include "common/fs/path_util.h" -#include "common/logging/log.h" +#include "common/logging.h" #include "core/file_sys/vfs/vfs.h" #include "core/file_sys/vfs/vfs_real.h" diff --git a/src/core/frontend/applets/cabinet.cpp b/src/core/frontend/applets/cabinet.cpp index c33ce248b5..4116d2673e 100644 --- a/src/core/frontend/applets/cabinet.cpp +++ b/src/core/frontend/applets/cabinet.cpp @@ -1,7 +1,7 @@ // SPDX-FileCopyrightText: Copyright 2022 yuzu Emulator Project // SPDX-License-Identifier: GPL-2.0-or-later -#include "common/logging/log.h" +#include "common/logging.h" #include "core/frontend/applets/cabinet.h" #include diff --git a/src/core/frontend/applets/controller.cpp b/src/core/frontend/applets/controller.cpp index e04d884bab..bd700f3399 100644 --- a/src/core/frontend/applets/controller.cpp +++ b/src/core/frontend/applets/controller.cpp @@ -2,7 +2,7 @@ // SPDX-License-Identifier: GPL-2.0-or-later #include "common/assert.h" -#include "common/logging/log.h" +#include "common/logging.h" #include "common/settings.h" #include "common/settings_enums.h" #include "core/frontend/applets/controller.h" diff --git a/src/core/frontend/applets/error.cpp b/src/core/frontend/applets/error.cpp index 53d4be2e54..0260d8d60c 100644 --- a/src/core/frontend/applets/error.cpp +++ b/src/core/frontend/applets/error.cpp @@ -1,7 +1,7 @@ // SPDX-FileCopyrightText: Copyright 2019 yuzu Emulator Project // SPDX-License-Identifier: GPL-2.0-or-later -#include "common/logging/log.h" +#include "common/logging.h" #include "core/frontend/applets/error.h" namespace Core::Frontend { diff --git a/src/core/frontend/applets/general.cpp b/src/core/frontend/applets/general.cpp index 4c299ee9c7..3f6908f40f 100644 --- a/src/core/frontend/applets/general.cpp +++ b/src/core/frontend/applets/general.cpp @@ -1,7 +1,7 @@ // SPDX-FileCopyrightText: Copyright 2019 yuzu Emulator Project // SPDX-License-Identifier: GPL-2.0-or-later -#include "common/logging/log.h" +#include "common/logging.h" #include "core/frontend/applets/general.h" namespace Core::Frontend { diff --git a/src/core/frontend/applets/mii_edit.cpp b/src/core/frontend/applets/mii_edit.cpp index 2988c3e720..2b6c54d7a4 100644 --- a/src/core/frontend/applets/mii_edit.cpp +++ b/src/core/frontend/applets/mii_edit.cpp @@ -1,7 +1,7 @@ // SPDX-FileCopyrightText: Copyright 2022 yuzu Emulator Project // SPDX-License-Identifier: GPL-2.0-or-later -#include "common/logging/log.h" +#include "common/logging.h" #include "core/frontend/applets/mii_edit.h" namespace Core::Frontend { diff --git a/src/core/frontend/applets/software_keyboard.cpp b/src/core/frontend/applets/software_keyboard.cpp index d0e3bd6c10..3ae34cc88f 100644 --- a/src/core/frontend/applets/software_keyboard.cpp +++ b/src/core/frontend/applets/software_keyboard.cpp @@ -4,7 +4,7 @@ #include -#include "common/logging/log.h" +#include "common/logging.h" #include "common/string_util.h" #include "core/frontend/applets/software_keyboard.h" diff --git a/src/core/frontend/applets/web_browser.cpp b/src/core/frontend/applets/web_browser.cpp index eca8d6d98d..2267494c9c 100644 --- a/src/core/frontend/applets/web_browser.cpp +++ b/src/core/frontend/applets/web_browser.cpp @@ -1,7 +1,7 @@ // SPDX-FileCopyrightText: Copyright 2018 yuzu Emulator Project // SPDX-License-Identifier: GPL-2.0-or-later -#include "common/logging/log.h" +#include "common/logging.h" #include "core/frontend/applets/web_browser.h" namespace Core::Frontend { diff --git a/src/core/hle/kernel/k_scheduler.cpp b/src/core/hle/kernel/k_scheduler.cpp index 4ea76708f7..dedb641f48 100644 --- a/src/core/hle/kernel/k_scheduler.cpp +++ b/src/core/hle/kernel/k_scheduler.cpp @@ -6,7 +6,7 @@ #include "common/assert.h" #include "common/bit_util.h" #include "common/fiber.h" -#include "common/logging/log.h" +#include "common/logging.h" #include "core/arm/arm_interface.h" #include "core/core.h" #include "core/core_timing.h" diff --git a/src/core/hle/kernel/k_server_session.cpp b/src/core/hle/kernel/k_server_session.cpp index 40c3323ef3..0e2600c46f 100644 --- a/src/core/hle/kernel/k_server_session.cpp +++ b/src/core/hle/kernel/k_server_session.cpp @@ -6,7 +6,7 @@ #include "common/assert.h" #include "common/common_types.h" -#include "common/logging/log.h" +#include "common/logging.h" #include "common/scope_exit.h" #include "common/scratch_buffer.h" #include "core/core.h" diff --git a/src/core/hle/kernel/k_thread.cpp b/src/core/hle/kernel/k_thread.cpp index 8a360a839b..a64c34071e 100644 --- a/src/core/hle/kernel/k_thread.cpp +++ b/src/core/hle/kernel/k_thread.cpp @@ -14,7 +14,7 @@ #include "common/common_funcs.h" #include "common/common_types.h" #include "common/fiber.h" -#include "common/logging/log.h" +#include "common/logging.h" #include "common/settings.h" #include "core/core.h" #include "core/cpu_manager.h" diff --git a/src/core/hle/kernel/kernel.cpp b/src/core/hle/kernel/kernel.cpp index 9e5eaeec43..c6e590fb7b 100644 --- a/src/core/hle/kernel/kernel.cpp +++ b/src/core/hle/kernel/kernel.cpp @@ -11,7 +11,7 @@ #include #include "common/assert.h" -#include "common/logging/log.h" +#include "common/logging.h" #include "common/microprofile.h" #include "common/scope_exit.h" #include "common/thread.h" diff --git a/src/core/hle/kernel/svc/svc_interrupt_event.cpp b/src/core/hle/kernel/svc/svc_interrupt_event.cpp index 07c02211b1..9bd8ed6260 100644 --- a/src/core/hle/kernel/svc/svc_interrupt_event.cpp +++ b/src/core/hle/kernel/svc/svc_interrupt_event.cpp @@ -2,7 +2,7 @@ // SPDX-FileCopyrightText: Copyright 2025 citron Emulator Project // SPDX-License-Identifier: GPL-2.0-or-later -#include "common/logging/log.h" +#include "common/logging.h" #include "common/scope_exit.h" #include "core/hle/kernel/k_event.h" #include "core/hle/kernel/k_process.h" diff --git a/src/core/hle/kernel/svc/svc_processor.cpp b/src/core/hle/kernel/svc/svc_processor.cpp index 7602ce6c03..7becb08c10 100644 --- a/src/core/hle/kernel/svc/svc_processor.cpp +++ b/src/core/hle/kernel/svc/svc_processor.cpp @@ -1,7 +1,7 @@ // SPDX-FileCopyrightText: Copyright 2023 yuzu Emulator Project // SPDX-License-Identifier: GPL-2.0-or-later -#include "common/logging/log.h" +#include "common/logging.h" #include "core/core.h" #include "core/hle/kernel/physical_core.h" #include "core/hle/kernel/svc.h" diff --git a/src/core/hle/service/acc/acc.cpp b/src/core/hle/service/acc/acc.cpp index 67997b390c..167640b688 100644 --- a/src/core/hle/service/acc/acc.cpp +++ b/src/core/hle/service/acc/acc.cpp @@ -8,7 +8,7 @@ #include "common/common_types.h" #include "common/fs/file.h" #include "common/fs/path_util.h" -#include "common/logging/log.h" +#include "common/logging.h" #include "common/polyfill_ranges.h" #include "common/stb.h" #include "common/string_util.h" diff --git a/src/core/hle/service/am/frontend/applet_cabinet.cpp b/src/core/hle/service/am/frontend/applet_cabinet.cpp index 4cbc80d639..f4c0bf2243 100644 --- a/src/core/hle/service/am/frontend/applet_cabinet.cpp +++ b/src/core/hle/service/am/frontend/applet_cabinet.cpp @@ -2,7 +2,7 @@ // SPDX-License-Identifier: GPL-2.0-or-later #include "common/assert.h" -#include "common/logging/log.h" +#include "common/logging.h" #include "core/core.h" #include "core/frontend/applets/cabinet.h" #include "core/hle/kernel/k_event.h" diff --git a/src/core/hle/service/am/frontend/applet_controller.cpp b/src/core/hle/service/am/frontend/applet_controller.cpp index 66f52686d7..ab8a1374d2 100644 --- a/src/core/hle/service/am/frontend/applet_controller.cpp +++ b/src/core/hle/service/am/frontend/applet_controller.cpp @@ -5,7 +5,7 @@ #include #include "common/assert.h" -#include "common/logging/log.h" +#include "common/logging.h" #include "common/string_util.h" #include "core/core.h" #include "core/frontend/applets/controller.h" diff --git a/src/core/hle/service/am/frontend/applet_error.cpp b/src/core/hle/service/am/frontend/applet_error.cpp index 34ec7013b5..68f62c860f 100644 --- a/src/core/hle/service/am/frontend/applet_error.cpp +++ b/src/core/hle/service/am/frontend/applet_error.cpp @@ -4,7 +4,7 @@ #include #include #include "common/assert.h" -#include "common/logging/log.h" +#include "common/logging.h" #include "common/string_util.h" #include "core/core.h" #include "core/frontend/applets/error.h" diff --git a/src/core/hle/service/am/frontend/applet_general.cpp b/src/core/hle/service/am/frontend/applet_general.cpp index 72cfe67e15..7300d14ca7 100644 --- a/src/core/hle/service/am/frontend/applet_general.cpp +++ b/src/core/hle/service/am/frontend/applet_general.cpp @@ -3,7 +3,7 @@ #include "common/assert.h" #include "common/hex_util.h" -#include "common/logging/log.h" +#include "common/logging.h" #include "core/core.h" #include "core/frontend/applets/general.h" #include "core/hle/result.h" diff --git a/src/core/hle/service/am/frontend/applet_mii_edit.cpp b/src/core/hle/service/am/frontend/applet_mii_edit.cpp index 0180ab761a..1dd4225780 100644 --- a/src/core/hle/service/am/frontend/applet_mii_edit.cpp +++ b/src/core/hle/service/am/frontend/applet_mii_edit.cpp @@ -2,7 +2,7 @@ // SPDX-License-Identifier: GPL-2.0-or-later #include "common/assert.h" -#include "common/logging/log.h" +#include "common/logging.h" #include "core/core.h" #include "core/frontend/applets/mii_edit.h" #include "core/hle/service/am/am.h" diff --git a/src/core/hle/service/am/frontend/applet_web_browser.cpp b/src/core/hle/service/am/frontend/applet_web_browser.cpp index 90c280ce4a..4f7caeb38d 100644 --- a/src/core/hle/service/am/frontend/applet_web_browser.cpp +++ b/src/core/hle/service/am/frontend/applet_web_browser.cpp @@ -5,7 +5,7 @@ #include "common/fs/file.h" #include "common/fs/fs.h" #include "common/fs/path_util.h" -#include "common/logging/log.h" +#include "common/logging.h" #include "common/string_util.h" #include "core/core.h" #include "core/file_sys/content_archive.h" diff --git a/src/core/hle/service/am/service/self_controller.cpp b/src/core/hle/service/am/service/self_controller.cpp index 6e494bf286..cba4adc990 100644 --- a/src/core/hle/service/am/service/self_controller.cpp +++ b/src/core/hle/service/am/service/self_controller.cpp @@ -2,7 +2,7 @@ // SPDX-FileCopyrightText: Copyright 2026 citron Emulator Project // SPDX-License-Identifier: GPL-2.0-or-later -#include "common/logging/log.h" +#include "common/logging.h" #include "core/hle/result.h" #include "core/hle/service/am/am_results.h" #include "core/hle/service/am/frontend/applets.h" diff --git a/src/core/hle/service/aoc/addon_content_manager.cpp b/src/core/hle/service/aoc/addon_content_manager.cpp index a5d61464b0..a21934308b 100644 --- a/src/core/hle/service/aoc/addon_content_manager.cpp +++ b/src/core/hle/service/aoc/addon_content_manager.cpp @@ -6,7 +6,7 @@ #include #include -#include "common/logging/log.h" +#include "common/logging.h" #include "common/settings.h" #include "core/core.h" #include "core/file_sys/common_funcs.h" diff --git a/src/core/hle/service/aoc/contents_service_manager.cpp b/src/core/hle/service/aoc/contents_service_manager.cpp index 18ac3375c6..8c370ba4f0 100644 --- a/src/core/hle/service/aoc/contents_service_manager.cpp +++ b/src/core/hle/service/aoc/contents_service_manager.cpp @@ -4,7 +4,7 @@ #include "core/hle/service/aoc/contents_service_manager.h" #include "core/hle/service/cmif_serialization.h" #include "core/hle/kernel/k_event.h" -#include "common/logging/log.h" +#include "common/logging.h" namespace Service::AOC { diff --git a/src/core/hle/service/apm/apm_controller.cpp b/src/core/hle/service/apm/apm_controller.cpp index 4f1aa5cc27..75f19b5d4a 100644 --- a/src/core/hle/service/apm/apm_controller.cpp +++ b/src/core/hle/service/apm/apm_controller.cpp @@ -5,7 +5,7 @@ #include #include -#include "common/logging/log.h" +#include "common/logging.h" #include "common/settings.h" #include "common/settings_enums.h" #include "core/core_timing.h" diff --git a/src/core/hle/service/apm/apm_interface.cpp b/src/core/hle/service/apm/apm_interface.cpp index d29051ee77..b820263f8c 100644 --- a/src/core/hle/service/apm/apm_interface.cpp +++ b/src/core/hle/service/apm/apm_interface.cpp @@ -1,7 +1,7 @@ // SPDX-FileCopyrightText: Copyright 2018 yuzu Emulator Project // SPDX-License-Identifier: GPL-2.0-or-later -#include "common/logging/log.h" +#include "common/logging.h" #include "core/hle/service/apm/apm.h" #include "core/hle/service/apm/apm_controller.h" #include "core/hle/service/apm/apm_interface.h" diff --git a/src/core/hle/service/audio/audio_controller.cpp b/src/core/hle/service/audio/audio_controller.cpp index a7a50c0939..039a3b8345 100644 --- a/src/core/hle/service/audio/audio_controller.cpp +++ b/src/core/hle/service/audio/audio_controller.cpp @@ -2,7 +2,7 @@ // SPDX-FileCopyrightText: Copyright 2026 citron Emulator Project // SPDX-License-Identifier: GPL-2.0-or-later -#include "common/logging/log.h" +#include "common/logging.h" #include "core/hle/service/audio/audio_controller.h" #include "core/hle/service/cmif_serialization.h" #include "core/hle/service/ipc_helpers.h" diff --git a/src/core/hle/service/audio/audio_device_service.cpp b/src/core/hle/service/audio/audio_device_service.cpp index 0af5d67fb2..a13dc617a5 100644 --- a/src/core/hle/service/audio/audio_device_service.cpp +++ b/src/core/hle/service/audio/audio_device_service.cpp @@ -1,7 +1,7 @@ // SPDX-FileCopyrightText: Copyright 2025 citron Emulator Project // SPDX-License-Identifier: GPL-2.0-or-later -#include "common/logging/log.h" +#include "common/logging.h" #include "core/hle/service/audio/audio_device_service.h" #include "core/hle/service/cmif_serialization.h" diff --git a/src/core/hle/service/audio/audio_snoop_manager.cpp b/src/core/hle/service/audio/audio_snoop_manager.cpp index df50613271..39407d19d8 100644 --- a/src/core/hle/service/audio/audio_snoop_manager.cpp +++ b/src/core/hle/service/audio/audio_snoop_manager.cpp @@ -1,7 +1,7 @@ // SPDX-FileCopyrightText: Copyright 2025 citron Emulator Project // SPDX-License-Identifier: GPL-2.0-or-later -#include "common/logging/log.h" +#include "common/logging.h" #include "core/hle/service/audio/audio_snoop_manager.h" #include "core/hle/service/cmif_serialization.h" #include diff --git a/src/core/hle/service/audio/audio_system_manager.cpp b/src/core/hle/service/audio/audio_system_manager.cpp index f91fa297d8..bc22ad4ce3 100644 --- a/src/core/hle/service/audio/audio_system_manager.cpp +++ b/src/core/hle/service/audio/audio_system_manager.cpp @@ -1,7 +1,7 @@ // SPDX-FileCopyrightText: Copyright 2025 citron Emulator Project // SPDX-License-Identifier: GPL-2.0-or-later -#include "common/logging/log.h" +#include "common/logging.h" #include "core/hle/service/audio/audio_system_manager.h" #include "core/hle/service/cmif_serialization.h" #include diff --git a/src/core/hle/service/audio/codecctl.cpp b/src/core/hle/service/audio/codecctl.cpp index c873f192a9..30a4ab8d04 100644 --- a/src/core/hle/service/audio/codecctl.cpp +++ b/src/core/hle/service/audio/codecctl.cpp @@ -1,7 +1,7 @@ // SPDX-FileCopyrightText: Copyright 2025 citron Emulator Project // SPDX-License-Identifier: GPL-2.0-or-later -#include "common/logging/log.h" +#include "common/logging.h" #include "core/hle/service/audio/codecctl.h" #include "core/hle/service/cmif_serialization.h" diff --git a/src/core/hle/service/bcat/backend/backend.cpp b/src/core/hle/service/bcat/backend/backend.cpp index 1993493a9e..b42fbf5ada 100644 --- a/src/core/hle/service/bcat/backend/backend.cpp +++ b/src/core/hle/service/bcat/backend/backend.cpp @@ -2,7 +2,7 @@ // SPDX-License-Identifier: GPL-2.0-or-later #include "common/hex_util.h" -#include "common/logging/log.h" +#include "common/logging.h" #include "core/core.h" #include "core/hle/kernel/k_event.h" #include "core/hle/service/bcat/backend/backend.h" diff --git a/src/core/hle/service/bcat/news/download_context.cpp b/src/core/hle/service/bcat/news/download_context.cpp index 0bfd29076e..6c0d0fa2e1 100644 --- a/src/core/hle/service/bcat/news/download_context.cpp +++ b/src/core/hle/service/bcat/news/download_context.cpp @@ -1,7 +1,7 @@ // SPDX-FileCopyrightText: Copyright 2025 citron Emulator Project // SPDX-License-Identifier: GPL-3.0-or-later -#include "common/logging/log.h" +#include "common/logging.h" #include "core/hle/service/bcat/news/download_context.h" #include "core/hle/service/cmif_serialization.h" diff --git a/src/core/hle/service/btdrv/btdrv.cpp b/src/core/hle/service/btdrv/btdrv.cpp index 83618a956b..0b99f26f04 100644 --- a/src/core/hle/service/btdrv/btdrv.cpp +++ b/src/core/hle/service/btdrv/btdrv.cpp @@ -1,7 +1,7 @@ // SPDX-FileCopyrightText: Copyright 2018 yuzu Emulator Project // SPDX-License-Identifier: GPL-2.0-or-later -#include "common/logging/log.h" +#include "common/logging.h" #include "core/core.h" #include "core/hle/kernel/k_event.h" #include "core/hle/service/btdrv/btdrv.h" diff --git a/src/core/hle/service/btm/btm_system.cpp b/src/core/hle/service/btm/btm_system.cpp index 99718a7b01..355df1376c 100644 --- a/src/core/hle/service/btm/btm_system.cpp +++ b/src/core/hle/service/btm/btm_system.cpp @@ -1,7 +1,7 @@ // SPDX-FileCopyrightText: Copyright 2024 yuzu Emulator Project // SPDX-License-Identifier: GPL-3.0-or-later -#include "common/logging/log.h" +#include "common/logging.h" #include "core/hle/service/btm/btm_system.h" #include "core/hle/service/btm/btm_system_core.h" #include "core/hle/service/cmif_serialization.h" diff --git a/src/core/hle/service/btm/btm_system_core.cpp b/src/core/hle/service/btm/btm_system_core.cpp index 4bc8a9e8ba..1aaf5164a1 100644 --- a/src/core/hle/service/btm/btm_system_core.cpp +++ b/src/core/hle/service/btm/btm_system_core.cpp @@ -1,7 +1,7 @@ // SPDX-FileCopyrightText: Copyright 2024 yuzu Emulator Project // SPDX-License-Identifier: GPL-3.0-or-later -#include "common/logging/log.h" +#include "common/logging.h" #include "core/hle/service/btm/btm_system_core.h" #include "core/hle/service/cmif_serialization.h" #include "core/hle/service/set/system_settings_server.h" diff --git a/src/core/hle/service/btm/btm_user.cpp b/src/core/hle/service/btm/btm_user.cpp index d2e228f8d1..551052af66 100644 --- a/src/core/hle/service/btm/btm_user.cpp +++ b/src/core/hle/service/btm/btm_user.cpp @@ -1,7 +1,7 @@ // SPDX-FileCopyrightText: Copyright 2024 yuzu Emulator Project // SPDX-License-Identifier: GPL-3.0-or-later -#include "common/logging/log.h" +#include "common/logging.h" #include "core/hle/service/btm/btm_user.h" #include "core/hle/service/btm/btm_user_core.h" #include "core/hle/service/cmif_serialization.h" diff --git a/src/core/hle/service/btm/btm_user_core.cpp b/src/core/hle/service/btm/btm_user_core.cpp index 6f9fa589b8..3f622af545 100644 --- a/src/core/hle/service/btm/btm_user_core.cpp +++ b/src/core/hle/service/btm/btm_user_core.cpp @@ -3,7 +3,7 @@ #include -#include "common/logging/log.h" +#include "common/logging.h" #include "core/core.h" #include "core/hle/kernel/k_event.h" #include "core/hle/service/btm/btm_user_core.h" diff --git a/src/core/hle/service/caps/caps_a.cpp b/src/core/hle/service/caps/caps_a.cpp index 8ebec832a7..a1689d8258 100644 --- a/src/core/hle/service/caps/caps_a.cpp +++ b/src/core/hle/service/caps/caps_a.cpp @@ -1,7 +1,7 @@ // SPDX-FileCopyrightText: Copyright 2020 yuzu Emulator Project // SPDX-License-Identifier: GPL-2.0-or-later -#include "common/logging/log.h" +#include "common/logging.h" #include "core/hle/service/caps/caps_a.h" #include "core/hle/service/caps/caps_manager.h" #include "core/hle/service/caps/caps_result.h" diff --git a/src/core/hle/service/caps/caps_c.cpp b/src/core/hle/service/caps/caps_c.cpp index 6993c04c2c..957ae695bb 100644 --- a/src/core/hle/service/caps/caps_c.cpp +++ b/src/core/hle/service/caps/caps_c.cpp @@ -1,7 +1,7 @@ // SPDX-FileCopyrightText: Copyright 2020 yuzu Emulator Project // SPDX-License-Identifier: GPL-2.0-or-later -#include "common/logging/log.h" +#include "common/logging.h" #include "core/hle/service/caps/caps_c.h" #include "core/hle/service/caps/caps_manager.h" #include "core/hle/service/caps/caps_result.h" diff --git a/src/core/hle/service/caps/caps_manager.cpp b/src/core/hle/service/caps/caps_manager.cpp index 0a2b4e8bfe..ed647668ea 100644 --- a/src/core/hle/service/caps/caps_manager.cpp +++ b/src/core/hle/service/caps/caps_manager.cpp @@ -5,7 +5,7 @@ #include "common/fs/file.h" #include "common/fs/path_util.h" -#include "common/logging/log.h" +#include "common/logging.h" #include "common/stb.h" #include "core/core.h" #include "core/hle/service/caps/caps_manager.h" diff --git a/src/core/hle/service/caps/caps_ss.cpp b/src/core/hle/service/caps/caps_ss.cpp index dfa7f1a840..dc85898179 100644 --- a/src/core/hle/service/caps/caps_ss.cpp +++ b/src/core/hle/service/caps/caps_ss.cpp @@ -1,7 +1,7 @@ // SPDX-FileCopyrightText: Copyright 2020 yuzu Emulator Project // SPDX-License-Identifier: GPL-2.0-or-later -#include "common/logging/log.h" +#include "common/logging.h" #include "core/hle/service/caps/caps_manager.h" #include "core/hle/service/caps/caps_ss.h" #include "core/hle/service/cmif_serialization.h" diff --git a/src/core/hle/service/caps/caps_su.cpp b/src/core/hle/service/caps/caps_su.cpp index 528f364f5f..ef476c39f2 100644 --- a/src/core/hle/service/caps/caps_su.cpp +++ b/src/core/hle/service/caps/caps_su.cpp @@ -1,7 +1,7 @@ // SPDX-FileCopyrightText: Copyright 2020 yuzu Emulator Project // SPDX-License-Identifier: GPL-2.0-or-later -#include "common/logging/log.h" +#include "common/logging.h" #include "core/core.h" #include "core/hle/service/caps/caps_manager.h" #include "core/hle/service/caps/caps_su.h" diff --git a/src/core/hle/service/caps/caps_u.cpp b/src/core/hle/service/caps/caps_u.cpp index 40d4d05fe5..a6a4cc7216 100644 --- a/src/core/hle/service/caps/caps_u.cpp +++ b/src/core/hle/service/caps/caps_u.cpp @@ -1,7 +1,7 @@ // SPDX-FileCopyrightText: Copyright 2020 yuzu Emulator Project // SPDX-License-Identifier: GPL-2.0-or-later -#include "common/logging/log.h" +#include "common/logging.h" #include "core/hle/service/caps/caps_manager.h" #include "core/hle/service/caps/caps_types.h" #include "core/hle/service/caps/caps_u.h" diff --git a/src/core/hle/service/erpt/erpt.cpp b/src/core/hle/service/erpt/erpt.cpp index 6b7eab5efd..7aa8479a04 100644 --- a/src/core/hle/service/erpt/erpt.cpp +++ b/src/core/hle/service/erpt/erpt.cpp @@ -3,7 +3,7 @@ #include -#include "common/logging/log.h" +#include "common/logging.h" #include "core/hle/service/cmif_serialization.h" #include "core/hle/service/erpt/erpt.h" #include "core/hle/service/server_manager.h" diff --git a/src/core/hle/service/fatal/fatal.cpp b/src/core/hle/service/fatal/fatal.cpp index 25261db801..92f9d3abe9 100644 --- a/src/core/hle/service/fatal/fatal.cpp +++ b/src/core/hle/service/fatal/fatal.cpp @@ -6,7 +6,7 @@ #include #include #include -#include "common/logging/log.h" +#include "common/logging.h" #include "common/scm_rev.h" #include "common/swap.h" #include "core/core.h" diff --git a/src/core/hle/service/filesystem/fsp/fsp_srv.cpp b/src/core/hle/service/filesystem/fsp/fsp_srv.cpp index ac69a10c73..0b3ad96f58 100644 --- a/src/core/hle/service/filesystem/fsp/fsp_srv.cpp +++ b/src/core/hle/service/filesystem/fsp/fsp_srv.cpp @@ -12,7 +12,7 @@ #include "common/assert.h" #include "common/common_types.h" #include "common/hex_util.h" -#include "common/logging/log.h" +#include "common/logging.h" #include "common/settings.h" #include "common/string_util.h" #include "core/core.h" diff --git a/src/core/hle/service/friend/friend.cpp b/src/core/hle/service/friend/friend.cpp index 736171453f..e097293c20 100644 --- a/src/core/hle/service/friend/friend.cpp +++ b/src/core/hle/service/friend/friend.cpp @@ -3,7 +3,7 @@ // SPDX-License-Identifier: GPL-2.0-or-later #include -#include "common/logging/log.h" +#include "common/logging.h" #include "common/uuid.h" #include "core/core.h" #include "core/hle/kernel/k_event.h" diff --git a/src/core/hle/service/glue/arp.cpp b/src/core/hle/service/glue/arp.cpp index 11eda51e36..a104e24929 100644 --- a/src/core/hle/service/glue/arp.cpp +++ b/src/core/hle/service/glue/arp.cpp @@ -4,7 +4,7 @@ #include -#include "common/logging/log.h" +#include "common/logging.h" #include "core/core.h" #include "core/hle/kernel/k_process.h" #include "core/hle/kernel/kernel.h" diff --git a/src/core/hle/service/glue/bgtc.cpp b/src/core/hle/service/glue/bgtc.cpp index ae22ac4f79..b92c1f9356 100644 --- a/src/core/hle/service/glue/bgtc.cpp +++ b/src/core/hle/service/glue/bgtc.cpp @@ -1,7 +1,7 @@ // SPDX-FileCopyrightText: Copyright 2019 yuzu Emulator Project // SPDX-License-Identifier: GPL-2.0-or-later -#include "common/logging/log.h" +#include "common/logging.h" #include "core/core.h" #include "core/hle/service/glue/bgtc.h" #include "core/hle/service/ipc_helpers.h" diff --git a/src/core/hle/service/glue/notif.cpp b/src/core/hle/service/glue/notif.cpp index 5a03d34c12..2cb61daae0 100644 --- a/src/core/hle/service/glue/notif.cpp +++ b/src/core/hle/service/glue/notif.cpp @@ -5,7 +5,7 @@ #include #include "common/assert.h" -#include "common/logging/log.h" +#include "common/logging.h" #include "core/hle/service/cmif_serialization.h" #include "core/hle/service/glue/notif.h" #include "core/hle/service/ipc_helpers.h" diff --git a/src/core/hle/service/grc/continuous_recorder.cpp b/src/core/hle/service/grc/continuous_recorder.cpp index c3a21f2f6f..89297afb2c 100644 --- a/src/core/hle/service/grc/continuous_recorder.cpp +++ b/src/core/hle/service/grc/continuous_recorder.cpp @@ -1,7 +1,7 @@ // SPDX-FileCopyrightText: Copyright 2025 citron Emulator Project // SPDX-License-Identifier: GPL-2.0-or-later -#include "common/logging/log.h" +#include "common/logging.h" #include "core/hle/service/cmif_serialization.h" #include "core/hle/service/grc/continuous_recorder.h" diff --git a/src/core/hle/service/hid/active_vibration_device_list.cpp b/src/core/hle/service/hid/active_vibration_device_list.cpp index c440f8382c..948f4af761 100644 --- a/src/core/hle/service/hid/active_vibration_device_list.cpp +++ b/src/core/hle/service/hid/active_vibration_device_list.cpp @@ -1,7 +1,7 @@ // SPDX-FileCopyrightText: Copyright 2024 yuzu Emulator Project // SPDX-License-Identifier: GPL-3.0-or-later -#include "common/logging/log.h" +#include "common/logging.h" #include "core/hle/service/cmif_serialization.h" #include "core/hle/service/hid/active_vibration_device_list.h" #include "hid_core/hid_result.h" diff --git a/src/core/hle/service/hid/applet_resource.cpp b/src/core/hle/service/hid/applet_resource.cpp index 4814d7ad51..816c4b995a 100644 --- a/src/core/hle/service/hid/applet_resource.cpp +++ b/src/core/hle/service/hid/applet_resource.cpp @@ -1,7 +1,7 @@ // SPDX-FileCopyrightText: Copyright 2024 yuzu Emulator Project // SPDX-License-Identifier: GPL-3.0-or-later -#include "common/logging/log.h" +#include "common/logging.h" #include "core/hle/kernel/k_shared_memory.h" #include "core/hle/service/cmif_serialization.h" #include "core/hle/service/hid/applet_resource.h" diff --git a/src/core/hle/service/hid/hid_server.cpp b/src/core/hle/service/hid/hid_server.cpp index 99789008f0..26340c71e1 100644 --- a/src/core/hle/service/hid/hid_server.cpp +++ b/src/core/hle/service/hid/hid_server.cpp @@ -5,7 +5,7 @@ #include #include "common/common_types.h" -#include "common/logging/log.h" +#include "common/logging.h" #include "common/settings.h" #include "core/hle/kernel/k_shared_memory.h" #include "core/hle/kernel/k_transfer_memory.h" diff --git a/src/core/hle/service/hid/hidbus.cpp b/src/core/hle/service/hid/hidbus.cpp index 4fb002bc41..f766177da9 100644 --- a/src/core/hle/service/hid/hidbus.cpp +++ b/src/core/hle/service/hid/hidbus.cpp @@ -1,7 +1,7 @@ // SPDX-FileCopyrightText: Copyright 2021 yuzu Emulator Project // SPDX-License-Identifier: GPL-2.0-or-later -#include "common/logging/log.h" +#include "common/logging.h" #include "common/settings.h" #include "core/core.h" #include "core/core_timing.h" diff --git a/src/core/hle/service/hle_ipc.cpp b/src/core/hle/service/hle_ipc.cpp index 386221ab5f..3fc31cae39 100644 --- a/src/core/hle/service/hle_ipc.cpp +++ b/src/core/hle/service/hle_ipc.cpp @@ -10,7 +10,7 @@ #include "common/assert.h" #include "common/common_funcs.h" #include "common/common_types.h" -#include "common/logging/log.h" +#include "common/logging.h" #include "common/scratch_buffer.h" #include "core/guest_memory.h" #include "core/hle/kernel/k_auto_object.h" diff --git a/src/core/hle/service/jit/jit_context.cpp b/src/core/hle/service/jit/jit_context.cpp index 406b145a40..87397bbb26 100644 --- a/src/core/hle/service/jit/jit_context.cpp +++ b/src/core/hle/service/jit/jit_context.cpp @@ -13,7 +13,7 @@ #include "common/common_funcs.h" #include "common/div_ceil.h" #include "common/elf.h" -#include "common/logging/log.h" +#include "common/logging.h" #include "core/hle/service/jit/jit_context.h" #include "core/memory.h" diff --git a/src/core/hle/service/lbl/lbl.cpp b/src/core/hle/service/lbl/lbl.cpp index c14b241428..5f30ecc2c4 100644 --- a/src/core/hle/service/lbl/lbl.cpp +++ b/src/core/hle/service/lbl/lbl.cpp @@ -4,7 +4,7 @@ #include #include -#include "common/logging/log.h" +#include "common/logging.h" #include "core/hle/service/ipc_helpers.h" #include "core/hle/service/lbl/lbl.h" #include "core/hle/service/server_manager.h" diff --git a/src/core/hle/service/ldn/lan_discovery.h b/src/core/hle/service/ldn/lan_discovery.h index 213602ad23..43cd2a6eb4 100644 --- a/src/core/hle/service/ldn/lan_discovery.h +++ b/src/core/hle/service/ldn/lan_discovery.h @@ -15,7 +15,7 @@ #include #include -#include "common/logging/log.h" +#include "common/logging.h" #include "common/socket_types.h" #include "core/hle/result.h" #include "core/hle/service/ldn/ldn_results.h" diff --git a/src/core/hle/service/lm/lm.cpp b/src/core/hle/service/lm/lm.cpp index 20df002330..6454f55b46 100644 --- a/src/core/hle/service/lm/lm.cpp +++ b/src/core/hle/service/lm/lm.cpp @@ -6,7 +6,7 @@ #include #include #include -#include "common/logging/log.h" +#include "common/logging.h" #include "core/core.h" #include "core/hle/service/ipc_helpers.h" #include "core/hle/service/lm/lm.h" diff --git a/src/core/hle/service/mig/mig.cpp b/src/core/hle/service/mig/mig.cpp index 14a0469b57..36be36836c 100644 --- a/src/core/hle/service/mig/mig.cpp +++ b/src/core/hle/service/mig/mig.cpp @@ -4,7 +4,7 @@ #include -#include "common/logging/log.h" +#include "common/logging.h" #include "core/hle/service/cmif_serialization.h" #include "core/hle/service/mig/mig.h" #include "core/hle/service/server_manager.h" diff --git a/src/core/hle/service/mii/mii.cpp b/src/core/hle/service/mii/mii.cpp index adaaea571a..92ff916748 100644 --- a/src/core/hle/service/mii/mii.cpp +++ b/src/core/hle/service/mii/mii.cpp @@ -3,7 +3,7 @@ #include -#include "common/logging/log.h" +#include "common/logging.h" #include "core/hle/service/cmif_serialization.h" #include "core/hle/service/ipc_helpers.h" #include "core/hle/service/mii/mii.h" diff --git a/src/core/hle/service/mii/mii_database_manager.cpp b/src/core/hle/service/mii/mii_database_manager.cpp index fc51985838..4fe64d244e 100644 --- a/src/core/hle/service/mii/mii_database_manager.cpp +++ b/src/core/hle/service/mii/mii_database_manager.cpp @@ -5,7 +5,7 @@ #include "common/fs/file.h" #include "common/fs/fs.h" #include "common/fs/path_util.h" -#include "common/logging/log.h" +#include "common/logging.h" #include "common/string_util.h" #include "core/hle/service/mii/mii_database_manager.h" diff --git a/src/core/hle/service/mii/mii_manager.cpp b/src/core/hle/service/mii/mii_manager.cpp index dcfd6b2e2a..6c0df89ca9 100644 --- a/src/core/hle/service/mii/mii_manager.cpp +++ b/src/core/hle/service/mii/mii_manager.cpp @@ -1,7 +1,7 @@ // SPDX-FileCopyrightText: Copyright 2020 yuzu Emulator Project // SPDX-License-Identifier: GPL-2.0-or-later -#include "common/logging/log.h" +#include "common/logging.h" #include "core/hle/service/mii/mii_database_manager.h" #include "core/hle/service/mii/mii_manager.h" #include "core/hle/service/mii/mii_result.h" diff --git a/src/core/hle/service/mm/mm_u.cpp b/src/core/hle/service/mm/mm_u.cpp index 6f43b19684..995e333a56 100644 --- a/src/core/hle/service/mm/mm_u.cpp +++ b/src/core/hle/service/mm/mm_u.cpp @@ -1,7 +1,7 @@ // SPDX-FileCopyrightText: Copyright 2018 yuzu Emulator Project // SPDX-License-Identifier: GPL-2.0-or-later -#include "common/logging/log.h" +#include "common/logging.h" #include "core/hle/service/ipc_helpers.h" #include "core/hle/service/mm/mm_u.h" #include "core/hle/service/server_manager.h" diff --git a/src/core/hle/service/mnpp/mnpp_app.cpp b/src/core/hle/service/mnpp/mnpp_app.cpp index 19ceb7457c..7f50c41f35 100644 --- a/src/core/hle/service/mnpp/mnpp_app.cpp +++ b/src/core/hle/service/mnpp/mnpp_app.cpp @@ -1,7 +1,7 @@ // SPDX-FileCopyrightText: Copyright 2022 yuzu Emulator Project // SPDX-License-Identifier: GPL-2.0-or-later -#include "common/logging/log.h" +#include "common/logging.h" #include "core/hle/service/ipc_helpers.h" #include "core/hle/service/mnpp/mnpp_app.h" #include "core/hle/service/server_manager.h" diff --git a/src/core/hle/service/nex/nex.cpp b/src/core/hle/service/nex/nex.cpp index d797a4b511..690cb67e60 100644 --- a/src/core/hle/service/nex/nex.cpp +++ b/src/core/hle/service/nex/nex.cpp @@ -6,7 +6,7 @@ #include "core/hle/service/ipc_helpers.h" #include "core/hle/service/server_manager.h" #include "core/hle/service/service.h" -#include "common/logging/log.h" +#include "common/logging.h" namespace Service::Nex { diff --git a/src/core/hle/service/nfc/common/amiibo_crypto.cpp b/src/core/hle/service/nfc/common/amiibo_crypto.cpp index 2815149ebf..18523aa32d 100644 --- a/src/core/hle/service/nfc/common/amiibo_crypto.cpp +++ b/src/core/hle/service/nfc/common/amiibo_crypto.cpp @@ -11,7 +11,7 @@ #include "common/fs/file.h" #include "common/fs/fs.h" #include "common/fs/path_util.h" -#include "common/logging/log.h" +#include "common/logging.h" #include "core/hle/service/nfc/common/amiibo_crypto.h" namespace Service::NFP::AmiiboCrypto { diff --git a/src/core/hle/service/nfc/common/device.cpp b/src/core/hle/service/nfc/common/device.cpp index d3bf5d4342..5bf93f3f87 100644 --- a/src/core/hle/service/nfc/common/device.cpp +++ b/src/core/hle/service/nfc/common/device.cpp @@ -21,7 +21,7 @@ #include "common/fs/fs.h" #include "common/fs/path_util.h" #include "common/input.h" -#include "common/logging/log.h" +#include "common/logging.h" #include "common/string_util.h" #include "common/tiny_mt.h" #include "core/core.h" diff --git a/src/core/hle/service/nfc/common/device_manager.cpp b/src/core/hle/service/nfc/common/device_manager.cpp index 2dd3e9f892..739fce8223 100644 --- a/src/core/hle/service/nfc/common/device_manager.cpp +++ b/src/core/hle/service/nfc/common/device_manager.cpp @@ -3,7 +3,7 @@ #include -#include "common/logging/log.h" +#include "common/logging.h" #include "core/core.h" #include "core/hle/kernel/k_event.h" #include "core/hle/service/glue/time/static.h" diff --git a/src/core/hle/service/nfc/nfc.cpp b/src/core/hle/service/nfc/nfc.cpp index 9d4808dbec..0f74078906 100644 --- a/src/core/hle/service/nfc/nfc.cpp +++ b/src/core/hle/service/nfc/nfc.cpp @@ -3,7 +3,7 @@ #include -#include "common/logging/log.h" +#include "common/logging.h" #include "common/settings.h" #include "core/hle/service/ipc_helpers.h" #include "core/hle/service/nfc/nfc.h" diff --git a/src/core/hle/service/nfc/nfc_interface.cpp b/src/core/hle/service/nfc/nfc_interface.cpp index c28e55431e..23d711e8d4 100644 --- a/src/core/hle/service/nfc/nfc_interface.cpp +++ b/src/core/hle/service/nfc/nfc_interface.cpp @@ -1,7 +1,7 @@ // SPDX-FileCopyrightText: Copyright 2022 yuzu Emulator Project // SPDX-License-Identifier: GPL-2.0-or-later -#include "common/logging/log.h" +#include "common/logging.h" #include "core/core.h" #include "core/hle/kernel/k_event.h" #include "core/hle/service/ipc_helpers.h" diff --git a/src/core/hle/service/nfp/nfp.cpp b/src/core/hle/service/nfp/nfp.cpp index 2eeabc1387..a557661db2 100644 --- a/src/core/hle/service/nfp/nfp.cpp +++ b/src/core/hle/service/nfp/nfp.cpp @@ -1,7 +1,7 @@ // SPDX-FileCopyrightText: Copyright 2018 yuzu Emulator Project // SPDX-License-Identifier: GPL-2.0-or-later -#include "common/logging/log.h" +#include "common/logging.h" #include "core/hle/service/ipc_helpers.h" #include "core/hle/service/nfp/nfp.h" #include "core/hle/service/nfp/nfp_interface.h" diff --git a/src/core/hle/service/nfp/nfp_interface.cpp b/src/core/hle/service/nfp/nfp_interface.cpp index 5ba6d17424..e909588a43 100644 --- a/src/core/hle/service/nfp/nfp_interface.cpp +++ b/src/core/hle/service/nfp/nfp_interface.cpp @@ -1,7 +1,7 @@ // SPDX-FileCopyrightText: Copyright 2023 yuzu Emulator Project // SPDX-License-Identifier: GPL-2.0-or-later -#include "common/logging/log.h" +#include "common/logging.h" #include "core/core.h" #include "core/hle/kernel/k_event.h" #include "core/hle/service/ipc_helpers.h" diff --git a/src/core/hle/service/ns/notify_service.cpp b/src/core/hle/service/ns/notify_service.cpp index e272e554a6..0ad7d39926 100644 --- a/src/core/hle/service/ns/notify_service.cpp +++ b/src/core/hle/service/ns/notify_service.cpp @@ -1,7 +1,7 @@ // SPDX-FileCopyrightText: Copyright 2025 citron Emulator Project // SPDX-License-Identifier: GPL-2.0-or-later -#include "common/logging/log.h" +#include "common/logging.h" #include "core/hle/service/cmif_serialization.h" #include "core/hle/service/ns/notify_service.h" #include "core/hle/service/ns/service_getter_interface.h" diff --git a/src/core/hle/service/ns/platform_service_manager.cpp b/src/core/hle/service/ns/platform_service_manager.cpp index c32ad3b242..524274a4b2 100644 --- a/src/core/hle/service/ns/platform_service_manager.cpp +++ b/src/core/hle/service/ns/platform_service_manager.cpp @@ -8,7 +8,7 @@ #include "common/assert.h" #include "common/common_types.h" -#include "common/logging/log.h" +#include "common/logging.h" #include "common/swap.h" #include "core/core.h" #include "core/file_sys/content_archive.h" diff --git a/src/core/hle/service/ns/query_service.cpp b/src/core/hle/service/ns/query_service.cpp index 41bc565b4a..7cbeec8113 100644 --- a/src/core/hle/service/ns/query_service.cpp +++ b/src/core/hle/service/ns/query_service.cpp @@ -2,7 +2,7 @@ // SPDX-License-Identifier: GPL-2.0-or-later #include -#include "common/logging/log.h" +#include "common/logging.h" #include "common/uuid.h" #include "core/core.h" #include "core/file_sys/nca_metadata.h" diff --git a/src/core/hle/service/nvdrv/core/nvmap.cpp b/src/core/hle/service/nvdrv/core/nvmap.cpp index 344fcbf517..bd9394b3ba 100644 --- a/src/core/hle/service/nvdrv/core/nvmap.cpp +++ b/src/core/hle/service/nvdrv/core/nvmap.cpp @@ -7,7 +7,7 @@ #include "common/alignment.h" #include "common/assert.h" -#include "common/logging/log.h" +#include "common/logging.h" #include "core/hle/service/nvdrv/core/container.h" #include "core/hle/service/nvdrv/core/heap_mapper.h" #include "core/hle/service/nvdrv/core/nvmap.h" diff --git a/src/core/hle/service/nvdrv/devices/nvdisp_disp0.cpp b/src/core/hle/service/nvdrv/devices/nvdisp_disp0.cpp index 995646e250..14b5d9129c 100644 --- a/src/core/hle/service/nvdrv/devices/nvdisp_disp0.cpp +++ b/src/core/hle/service/nvdrv/devices/nvdisp_disp0.cpp @@ -4,7 +4,7 @@ #include #include "common/assert.h" -#include "common/logging/log.h" +#include "common/logging.h" #include "core/core.h" #include "core/core_timing.h" #include "core/hle/service/nvdrv/core/container.h" diff --git a/src/core/hle/service/nvdrv/devices/nvhost_as_gpu.cpp b/src/core/hle/service/nvdrv/devices/nvhost_as_gpu.cpp index 8dccaf8416..098dba815b 100644 --- a/src/core/hle/service/nvdrv/devices/nvhost_as_gpu.cpp +++ b/src/core/hle/service/nvdrv/devices/nvhost_as_gpu.cpp @@ -8,7 +8,7 @@ #include "common/alignment.h" #include "common/assert.h" -#include "common/logging/log.h" +#include "common/logging.h" #include "core/core.h" #include "core/hle/service/nvdrv/core/container.h" #include "core/hle/service/nvdrv/core/nvmap.h" diff --git a/src/core/hle/service/nvdrv/devices/nvhost_ctrl.cpp b/src/core/hle/service/nvdrv/devices/nvhost_ctrl.cpp index 0265d55f27..3dd56e0ce3 100644 --- a/src/core/hle/service/nvdrv/devices/nvhost_ctrl.cpp +++ b/src/core/hle/service/nvdrv/devices/nvhost_ctrl.cpp @@ -8,7 +8,7 @@ #include #include "common/assert.h" -#include "common/logging/log.h" +#include "common/logging.h" #include "common/scope_exit.h" #include "core/core.h" #include "core/hle/kernel/k_event.h" diff --git a/src/core/hle/service/nvdrv/devices/nvhost_ctrl_gpu.cpp b/src/core/hle/service/nvdrv/devices/nvhost_ctrl_gpu.cpp index 7e4b5e30dc..26c700fa19 100644 --- a/src/core/hle/service/nvdrv/devices/nvhost_ctrl_gpu.cpp +++ b/src/core/hle/service/nvdrv/devices/nvhost_ctrl_gpu.cpp @@ -4,7 +4,7 @@ #include #include "common/assert.h" -#include "common/logging/log.h" +#include "common/logging.h" #include "core/core.h" #include "core/core_timing.h" #include "core/hle/service/nvdrv/devices/ioctl_serialization.h" diff --git a/src/core/hle/service/nvdrv/devices/nvhost_gpu.cpp b/src/core/hle/service/nvdrv/devices/nvhost_gpu.cpp index efc9cca1cc..1c45b18fc6 100644 --- a/src/core/hle/service/nvdrv/devices/nvhost_gpu.cpp +++ b/src/core/hle/service/nvdrv/devices/nvhost_gpu.cpp @@ -3,7 +3,7 @@ #include #include "common/assert.h" -#include "common/logging/log.h" +#include "common/logging.h" #include "core/core.h" #include "core/hle/kernel/k_process.h" #include "core/hle/service/nvdrv/core/container.h" diff --git a/src/core/hle/service/nvdrv/devices/nvhost_nvdec.cpp b/src/core/hle/service/nvdrv/devices/nvhost_nvdec.cpp index 2c0ac2a46e..32b2f135d9 100644 --- a/src/core/hle/service/nvdrv/devices/nvhost_nvdec.cpp +++ b/src/core/hle/service/nvdrv/devices/nvhost_nvdec.cpp @@ -3,7 +3,7 @@ #include "audio_core/audio_core.h" #include "common/assert.h" -#include "common/logging/log.h" +#include "common/logging.h" #include "core/core.h" #include "core/hle/service/nvdrv/core/container.h" #include "core/hle/service/nvdrv/devices/ioctl_serialization.h" diff --git a/src/core/hle/service/nvdrv/devices/nvhost_nvdec_common.cpp b/src/core/hle/service/nvdrv/devices/nvhost_nvdec_common.cpp index 5486b6711d..0f11687d64 100644 --- a/src/core/hle/service/nvdrv/devices/nvhost_nvdec_common.cpp +++ b/src/core/hle/service/nvdrv/devices/nvhost_nvdec_common.cpp @@ -7,7 +7,7 @@ #include "common/assert.h" #include "common/common_types.h" -#include "common/logging/log.h" +#include "common/logging.h" #include "core/core.h" #include "core/hle/kernel/k_process.h" #include "core/hle/service/nvdrv/core/container.h" diff --git a/src/core/hle/service/nvdrv/devices/nvhost_nvjpg.cpp b/src/core/hle/service/nvdrv/devices/nvhost_nvjpg.cpp index f87d53f12c..a00bbc6598 100644 --- a/src/core/hle/service/nvdrv/devices/nvhost_nvjpg.cpp +++ b/src/core/hle/service/nvdrv/devices/nvhost_nvjpg.cpp @@ -4,7 +4,7 @@ #include #include "common/assert.h" -#include "common/logging/log.h" +#include "common/logging.h" #include "core/hle/service/nvdrv/devices/ioctl_serialization.h" #include "core/hle/service/nvdrv/devices/nvhost_nvjpg.h" diff --git a/src/core/hle/service/nvdrv/devices/nvhost_vic.cpp b/src/core/hle/service/nvdrv/devices/nvhost_vic.cpp index bf090f5eb2..7712290049 100644 --- a/src/core/hle/service/nvdrv/devices/nvhost_vic.cpp +++ b/src/core/hle/service/nvdrv/devices/nvhost_vic.cpp @@ -2,7 +2,7 @@ // SPDX-License-Identifier: GPL-2.0-or-later #include "common/assert.h" -#include "common/logging/log.h" +#include "common/logging.h" #include "core/core.h" #include "core/hle/service/nvdrv/core/container.h" #include "core/hle/service/nvdrv/devices/ioctl_serialization.h" diff --git a/src/core/hle/service/nvdrv/devices/nvmap.cpp b/src/core/hle/service/nvdrv/devices/nvmap.cpp index 1304db96a0..f80baa9685 100644 --- a/src/core/hle/service/nvdrv/devices/nvmap.cpp +++ b/src/core/hle/service/nvdrv/devices/nvmap.cpp @@ -7,7 +7,7 @@ #include "common/alignment.h" #include "common/assert.h" -#include "common/logging/log.h" +#include "common/logging.h" #include "core/core.h" #include "core/hle/kernel/k_page_table.h" #include "core/hle/kernel/k_process.h" diff --git a/src/core/hle/service/nvdrv/nvdrv_interface.cpp b/src/core/hle/service/nvdrv/nvdrv_interface.cpp index b2b5dfee1b..d40ce2582e 100644 --- a/src/core/hle/service/nvdrv/nvdrv_interface.cpp +++ b/src/core/hle/service/nvdrv/nvdrv_interface.cpp @@ -2,7 +2,7 @@ // SPDX-FileCopyrightText: 2021 Skyline Team and Contributors // SPDX-License-Identifier: GPL-3.0-or-later -#include "common/logging/log.h" +#include "common/logging.h" #include "common/scope_exit.h" #include "common/string_util.h" #include "core/core.h" diff --git a/src/core/hle/service/nvdrv/nvmemp.cpp b/src/core/hle/service/nvdrv/nvmemp.cpp index fc10f6406f..bd6072cf7b 100644 --- a/src/core/hle/service/nvdrv/nvmemp.cpp +++ b/src/core/hle/service/nvdrv/nvmemp.cpp @@ -2,7 +2,7 @@ // SPDX-License-Identifier: GPL-2.0-or-later #include "common/assert.h" -#include "common/logging/log.h" +#include "common/logging.h" #include "core/hle/service/nvdrv/nvmemp.h" namespace Service::Nvidia { diff --git a/src/core/hle/service/nvnflinger/buffer_item_consumer.cpp b/src/core/hle/service/nvnflinger/buffer_item_consumer.cpp index 123507123e..65e513f463 100644 --- a/src/core/hle/service/nvnflinger/buffer_item_consumer.cpp +++ b/src/core/hle/service/nvnflinger/buffer_item_consumer.cpp @@ -5,7 +5,7 @@ // https://cs.android.com/android/platform/superproject/+/android-5.1.1_r38:frameworks/native/libs/gui/BufferItemConsumer.cpp #include "common/assert.h" -#include "common/logging/log.h" +#include "common/logging.h" #include "core/hle/service/nvnflinger/buffer_item.h" #include "core/hle/service/nvnflinger/buffer_item_consumer.h" #include "core/hle/service/nvnflinger/buffer_queue_consumer.h" diff --git a/src/core/hle/service/nvnflinger/buffer_queue_consumer.cpp b/src/core/hle/service/nvnflinger/buffer_queue_consumer.cpp index 3bc23aa976..aaf0cc5cfc 100644 --- a/src/core/hle/service/nvnflinger/buffer_queue_consumer.cpp +++ b/src/core/hle/service/nvnflinger/buffer_queue_consumer.cpp @@ -5,7 +5,7 @@ // https://cs.android.com/android/platform/superproject/+/android-5.1.1_r38:frameworks/native/libs/gui/BufferQueueConsumer.cpp #include "common/assert.h" -#include "common/logging/log.h" +#include "common/logging.h" #include "core/hle/service/nvnflinger/buffer_item.h" #include "core/hle/service/nvnflinger/buffer_queue_consumer.h" #include "core/hle/service/nvnflinger/buffer_queue_core.h" diff --git a/src/core/hle/service/nvnflinger/buffer_queue_producer.cpp b/src/core/hle/service/nvnflinger/buffer_queue_producer.cpp index ea3296f6fd..4445928712 100644 --- a/src/core/hle/service/nvnflinger/buffer_queue_producer.cpp +++ b/src/core/hle/service/nvnflinger/buffer_queue_producer.cpp @@ -6,7 +6,7 @@ #include #include "common/assert.h" -#include "common/logging/log.h" +#include "common/logging.h" #include "core/hle/kernel/k_event.h" #include "core/hle/kernel/k_readable_event.h" #include "core/hle/kernel/kernel.h" diff --git a/src/core/hle/service/nvnflinger/consumer_base.cpp b/src/core/hle/service/nvnflinger/consumer_base.cpp index e360ebfd8e..f9be41b908 100644 --- a/src/core/hle/service/nvnflinger/consumer_base.cpp +++ b/src/core/hle/service/nvnflinger/consumer_base.cpp @@ -5,7 +5,7 @@ // https://cs.android.com/android/platform/superproject/+/android-5.1.1_r38:frameworks/native/libs/gui/ConsumerBase.cpp #include "common/assert.h" -#include "common/logging/log.h" +#include "common/logging.h" #include "core/hle/service/nvnflinger/buffer_item.h" #include "core/hle/service/nvnflinger/buffer_queue_consumer.h" #include "core/hle/service/nvnflinger/buffer_queue_core.h" diff --git a/src/core/hle/service/prepo/prepo.cpp b/src/core/hle/service/prepo/prepo.cpp index 0d4f17d934..48aefd8d4d 100644 --- a/src/core/hle/service/prepo/prepo.cpp +++ b/src/core/hle/service/prepo/prepo.cpp @@ -2,7 +2,7 @@ // SPDX-License-Identifier: GPL-2.0-or-later #include "common/hex_util.h" -#include "common/logging/log.h" +#include "common/logging.h" #include "core/core.h" #include "core/hle/service/acc/profile_manager.h" #include "core/hle/service/ipc_helpers.h" diff --git a/src/core/hle/service/ptm/psm.cpp b/src/core/hle/service/ptm/psm.cpp index 136313d7b1..78c234d7b9 100644 --- a/src/core/hle/service/ptm/psm.cpp +++ b/src/core/hle/service/ptm/psm.cpp @@ -3,7 +3,7 @@ #include -#include "common/logging/log.h" +#include "common/logging.h" #include "core/core.h" #include "core/hle/kernel/k_event.h" #include "core/hle/service/ipc_helpers.h" diff --git a/src/core/hle/service/service.cpp b/src/core/hle/service/service.cpp index ce5e3b5b4c..68c49408ea 100644 --- a/src/core/hle/service/service.cpp +++ b/src/core/hle/service/service.cpp @@ -3,7 +3,7 @@ #include #include "common/assert.h" -#include "common/logging/log.h" +#include "common/logging.h" #include "common/settings.h" #include "core/core.h" #include "core/hle/ipc.h" diff --git a/src/core/hle/service/set/firmware_debug_settings_server.cpp b/src/core/hle/service/set/firmware_debug_settings_server.cpp index 5767f6bc51..b5246b8020 100644 --- a/src/core/hle/service/set/firmware_debug_settings_server.cpp +++ b/src/core/hle/service/set/firmware_debug_settings_server.cpp @@ -2,7 +2,7 @@ // SPDX-FileCopyrightText: Copyright 2025 citron Emulator Project // SPDX-License-Identifier: GPL-2.0-or-later -#include "common/logging/log.h" +#include "common/logging.h" #include "core/hle/service/cmif_serialization.h" #include "core/hle/service/set/firmware_debug_settings_server.h" diff --git a/src/core/hle/service/set/settings_server.cpp b/src/core/hle/service/set/settings_server.cpp index 309d2a6fa4..72f8b08825 100644 --- a/src/core/hle/service/set/settings_server.cpp +++ b/src/core/hle/service/set/settings_server.cpp @@ -4,7 +4,7 @@ #include #include #include -#include "common/logging/log.h" +#include "common/logging.h" #include "common/settings.h" #include "core/hle/service/cmif_serialization.h" #include "core/hle/service/ipc_helpers.h" diff --git a/src/core/hle/service/set/system_settings_server.cpp b/src/core/hle/service/set/system_settings_server.cpp index 0f7254d8bb..3338094745 100644 --- a/src/core/hle/service/set/system_settings_server.cpp +++ b/src/core/hle/service/set/system_settings_server.cpp @@ -9,7 +9,7 @@ #include "common/fs/file.h" #include "common/fs/fs.h" #include "common/fs/path_util.h" -#include "common/logging/log.h" +#include "common/logging.h" #include "common/settings.h" #include "common/string_util.h" #include "core/core.h" diff --git a/src/core/hle/service/sm/sm_controller.cpp b/src/core/hle/service/sm/sm_controller.cpp index 384fc752f6..1979aff80e 100644 --- a/src/core/hle/service/sm/sm_controller.cpp +++ b/src/core/hle/service/sm/sm_controller.cpp @@ -3,7 +3,7 @@ #include "common/assert.h" #include "common/alignment.h" -#include "common/logging/log.h" +#include "common/logging.h" #include "core/core.h" #include "core/hle/kernel/k_client_port.h" #include "core/hle/kernel/k_port.h" diff --git a/src/core/hle/service/sockets/sockets_translate.cpp b/src/core/hle/service/sockets/sockets_translate.cpp index 5f3c5a441f..f82319dbee 100644 --- a/src/core/hle/service/sockets/sockets_translate.cpp +++ b/src/core/hle/service/sockets/sockets_translate.cpp @@ -4,7 +4,7 @@ #include #include "common/assert.h" -#include "common/logging/log.h" +#include "common/logging.h" #include "common/common_types.h" #include "core/hle/service/sockets/sockets.h" #include "core/hle/service/sockets/sockets_translate.h" diff --git a/src/core/hle/service/spl/spl_module.cpp b/src/core/hle/service/spl/spl_module.cpp index 549e6f4fa8..4c6fd8b71e 100644 --- a/src/core/hle/service/spl/spl_module.cpp +++ b/src/core/hle/service/spl/spl_module.cpp @@ -5,7 +5,7 @@ #include #include #include -#include "common/logging/log.h" +#include "common/logging.h" #include "common/settings.h" #include "core/hle/api_version.h" #include "core/hle/service/ipc_helpers.h" diff --git a/src/core/hle/service/ssl/ssl_backend_none.cpp b/src/core/hle/service/ssl/ssl_backend_none.cpp index 0ca06ac12c..6ff318a0c3 100644 --- a/src/core/hle/service/ssl/ssl_backend_none.cpp +++ b/src/core/hle/service/ssl/ssl_backend_none.cpp @@ -2,7 +2,7 @@ // SPDX-FileCopyrightText: Copyright 2025 citron Emulator Project // SPDX-License-Identifier: GPL-2.0-or-later -#include "common/logging/log.h" +#include "common/logging.h" #include "core/hle/service/ssl/ssl_backend.h" #include "core/internal_network/network.h" #include "core/internal_network/sockets.h" diff --git a/src/core/hle/service/usb/usb.cpp b/src/core/hle/service/usb/usb.cpp index f29fff1dd5..c2ef6122d4 100644 --- a/src/core/hle/service/usb/usb.cpp +++ b/src/core/hle/service/usb/usb.cpp @@ -3,7 +3,7 @@ #include -#include "common/logging/log.h" +#include "common/logging.h" #include "core/hle/service/ipc_helpers.h" #include "core/hle/service/server_manager.h" #include "core/hle/service/service.h" diff --git a/src/core/internal_network/network.cpp b/src/core/internal_network/network.cpp index 64f7d094c6..b7e4218827 100644 --- a/src/core/internal_network/network.cpp +++ b/src/core/internal_network/network.cpp @@ -29,7 +29,7 @@ #include "common/assert.h" #include "common/common_types.h" #include "common/expected.h" -#include "common/logging/log.h" +#include "common/logging.h" #include "common/settings.h" #include "core/internal_network/network.h" #include "core/internal_network/network_interface.h" diff --git a/src/core/internal_network/network_interface.cpp b/src/core/internal_network/network_interface.cpp index 62a026e6e4..f9d89d80cd 100644 --- a/src/core/internal_network/network_interface.cpp +++ b/src/core/internal_network/network_interface.cpp @@ -9,7 +9,7 @@ #include "common/bit_cast.h" #include "common/common_types.h" -#include "common/logging/log.h" +#include "common/logging.h" #include "common/polyfill_ranges.h" #include "common/settings.h" #include "common/string_util.h" diff --git a/src/core/internal_network/socket_proxy.cpp b/src/core/internal_network/socket_proxy.cpp index 486eddc6b7..95db16f0d9 100644 --- a/src/core/internal_network/socket_proxy.cpp +++ b/src/core/internal_network/socket_proxy.cpp @@ -6,7 +6,7 @@ #include #include "common/assert.h" -#include "common/logging/log.h" +#include "common/logging.h" #include "common/zstd_compression.h" #include "core/internal_network/network.h" #include "core/internal_network/network_interface.h" diff --git a/src/core/loader/deconstructed_rom_directory.cpp b/src/core/loader/deconstructed_rom_directory.cpp index 9b75c660c1..d285b7327d 100644 --- a/src/core/loader/deconstructed_rom_directory.cpp +++ b/src/core/loader/deconstructed_rom_directory.cpp @@ -2,7 +2,7 @@ // SPDX-License-Identifier: GPL-2.0-or-later #include -#include "common/logging/log.h" +#include "common/logging.h" #include "common/settings.h" #include "core/core.h" #include "core/file_sys/content_archive.h" diff --git a/src/core/loader/loader.cpp b/src/core/loader/loader.cpp index b6e355622e..ecfe1bac6d 100644 --- a/src/core/loader/loader.cpp +++ b/src/core/loader/loader.cpp @@ -7,7 +7,7 @@ #include #include "common/concepts.h" #include "common/fs/path_util.h" -#include "common/logging/log.h" +#include "common/logging.h" #include "common/string_util.h" #include "core/core.h" #include "core/hle/kernel/k_process.h" diff --git a/src/core/loader/nro.cpp b/src/core/loader/nro.cpp index 58570dcfeb..047565a173 100644 --- a/src/core/loader/nro.cpp +++ b/src/core/loader/nro.cpp @@ -6,7 +6,7 @@ #include "common/common_funcs.h" #include "common/common_types.h" -#include "common/logging/log.h" +#include "common/logging.h" #include "common/settings.h" #include "common/swap.h" #include "core/core.h" diff --git a/src/core/loader/nso.cpp b/src/core/loader/nso.cpp index 1e5aade29a..69a39eba71 100644 --- a/src/core/loader/nso.cpp +++ b/src/core/loader/nso.cpp @@ -7,7 +7,7 @@ #include "common/common_funcs.h" #include "common/hex_util.h" -#include "common/logging/log.h" +#include "common/logging.h" #include "common/lz4_compression.h" #include "common/settings.h" #include "common/swap.h" diff --git a/src/core/memory.cpp b/src/core/memory.cpp index a5cf7fcbbb..cc17b4b561 100644 --- a/src/core/memory.cpp +++ b/src/core/memory.cpp @@ -10,7 +10,7 @@ #include "common/assert.h" #include "common/atomic_ops.h" #include "common/common_types.h" -#include "common/logging/log.h" +#include "common/logging.h" #include "common/page_table.h" #include "common/scope_exit.h" #include "common/settings.h" diff --git a/src/core/perf_stats.cpp b/src/core/perf_stats.cpp index 576ec64322..cc94960a0c 100644 --- a/src/core/perf_stats.cpp +++ b/src/core/perf_stats.cpp @@ -14,7 +14,7 @@ #include "common/fs/file.h" #include "common/fs/fs.h" #include "common/fs/path_util.h" -#include "common/logging/log.h" +#include "common/logging.h" #include "common/settings.h" #include "core/perf_stats.h" diff --git a/src/core/tools/freezer.cpp b/src/core/tools/freezer.cpp index 9d42c726e4..a10f602728 100644 --- a/src/core/tools/freezer.cpp +++ b/src/core/tools/freezer.cpp @@ -2,7 +2,7 @@ // SPDX-License-Identifier: GPL-2.0-or-later #include "common/assert.h" -#include "common/logging/log.h" +#include "common/logging.h" #include "core/core.h" #include "core/core_timing.h" #include "core/memory.h" diff --git a/src/dedicated_room/citron_room.cpp b/src/dedicated_room/citron_room.cpp index 4ebc01f25a..271d89f54a 100644 --- a/src/dedicated_room/citron_room.cpp +++ b/src/dedicated_room/citron_room.cpp @@ -22,8 +22,8 @@ #include "common/fs/file.h" #include "common/fs/fs.h" #include "common/fs/path_util.h" -#include "common/logging/backend.h" -#include "common/logging/log.h" +#include "common/logging.h" +#include "common/logging.h" #include "common/scm_rev.h" #include "common/settings.h" #include "common/string_util.h" diff --git a/src/frontend_common/config.cpp b/src/frontend_common/config.cpp index d53e022e29..5a042d0ac3 100644 --- a/src/frontend_common/config.cpp +++ b/src/frontend_common/config.cpp @@ -6,7 +6,7 @@ #include #include "common/fs/fs.h" #include "common/fs/path_util.h" -#include "common/logging/log.h" +#include "common/logging.h" #include "common/settings.h" #include "common/settings_common.h" #include "common/settings_enums.h" diff --git a/src/hid_core/resource_manager.cpp b/src/hid_core/resource_manager.cpp index 62fec03b1a..d6b46ae764 100644 --- a/src/hid_core/resource_manager.cpp +++ b/src/hid_core/resource_manager.cpp @@ -1,7 +1,7 @@ // SPDX-FileCopyrightText: Copyright 2023 yuzu Emulator Project // SPDX-License-Identifier: GPL-3.0-or-later -#include "common/logging/log.h" +#include "common/logging.h" #include "core/core.h" #include "core/core_timing.h" #include "core/hle/service/ipc_helpers.h" diff --git a/src/hid_core/resources/npad/npad.cpp b/src/hid_core/resources/npad/npad.cpp index 0e2c5d8998..1dcb435ea3 100644 --- a/src/hid_core/resources/npad/npad.cpp +++ b/src/hid_core/resources/npad/npad.cpp @@ -9,7 +9,7 @@ #include "common/assert.h" #include "common/bit_field.h" #include "common/common_types.h" -#include "common/logging/log.h" +#include "common/logging.h" #include "common/settings.h" #include "core/core_timing.h" #include "core/hle/kernel/k_event.h" diff --git a/src/hid_core/resources/touch_screen/touch_screen_resource.cpp b/src/hid_core/resources/touch_screen/touch_screen_resource.cpp index 79ddaa4dfa..4647b215d5 100644 --- a/src/hid_core/resources/touch_screen/touch_screen_resource.cpp +++ b/src/hid_core/resources/touch_screen/touch_screen_resource.cpp @@ -1,7 +1,7 @@ // SPDX-FileCopyrightText: Copyright 2024 yuzu Emulator Project // SPDX-License-Identifier: GPL-3.0-or-later -#include "common/logging/log.h" +#include "common/logging.h" #include "core/core_timing.h" #include "core/hle/kernel/k_event.h" #include "core/hle/kernel/k_shared_memory.h" diff --git a/src/input_common/drivers/gc_adapter.cpp b/src/input_common/drivers/gc_adapter.cpp index f1184a5fa0..c238e5e4fb 100644 --- a/src/input_common/drivers/gc_adapter.cpp +++ b/src/input_common/drivers/gc_adapter.cpp @@ -4,7 +4,7 @@ #include #include -#include "common/logging/log.h" +#include "common/logging.h" #include "common/param_package.h" #include "common/polyfill_thread.h" #include "common/settings_input.h" diff --git a/src/input_common/drivers/sdl_driver.cpp b/src/input_common/drivers/sdl_driver.cpp index fa78e10d36..267d3d6f96 100644 --- a/src/input_common/drivers/sdl_driver.cpp +++ b/src/input_common/drivers/sdl_driver.cpp @@ -1,7 +1,7 @@ // SPDX-FileCopyrightText: 2018 Citra Emulator Project // SPDX-License-Identifier: GPL-2.0-or-later -#include "common/logging/log.h" +#include "common/logging.h" #include "common/math_util.h" #include "common/param_package.h" #include "common/settings.h" diff --git a/src/input_common/drivers/tas_input.cpp b/src/input_common/drivers/tas_input.cpp index f418714c12..57e0a990b6 100644 --- a/src/input_common/drivers/tas_input.cpp +++ b/src/input_common/drivers/tas_input.cpp @@ -8,7 +8,7 @@ #include "common/fs/file.h" #include "common/fs/fs_types.h" #include "common/fs/path_util.h" -#include "common/logging/log.h" +#include "common/logging.h" #include "common/settings.h" #include "input_common/drivers/tas_input.h" diff --git a/src/input_common/drivers/udp_client.cpp b/src/input_common/drivers/udp_client.cpp index 533f601fab..d3643aa7e0 100644 --- a/src/input_common/drivers/udp_client.cpp +++ b/src/input_common/drivers/udp_client.cpp @@ -6,7 +6,7 @@ #include #include -#include "common/logging/log.h" +#include "common/logging.h" #include "common/param_package.h" #include "common/settings.h" #include "input_common/drivers/udp_client.h" diff --git a/src/input_common/drivers/virtual_amiibo.cpp b/src/input_common/drivers/virtual_amiibo.cpp index 180eb53ef1..4fc7966fe7 100644 --- a/src/input_common/drivers/virtual_amiibo.cpp +++ b/src/input_common/drivers/virtual_amiibo.cpp @@ -7,7 +7,7 @@ #include "common/fs/file.h" #include "common/fs/fs.h" #include "common/fs/path_util.h" -#include "common/logging/log.h" +#include "common/logging.h" #include "common/settings.h" #include "input_common/drivers/virtual_amiibo.h" diff --git a/src/input_common/helpers/joycon_driver.cpp b/src/input_common/helpers/joycon_driver.cpp index 559a2a67a0..293b35e990 100644 --- a/src/input_common/helpers/joycon_driver.cpp +++ b/src/input_common/helpers/joycon_driver.cpp @@ -2,7 +2,7 @@ // SPDX-License-Identifier: GPL-2.0-or-later #include "common/input.h" -#include "common/logging/log.h" +#include "common/logging.h" #include "common/scope_exit.h" #include "common/swap.h" #include "common/thread.h" diff --git a/src/input_common/helpers/joycon_protocol/common_protocol.cpp b/src/input_common/helpers/joycon_protocol/common_protocol.cpp index 8328bdb2a5..12456471e8 100644 --- a/src/input_common/helpers/joycon_protocol/common_protocol.cpp +++ b/src/input_common/helpers/joycon_protocol/common_protocol.cpp @@ -2,7 +2,7 @@ // SPDX-License-Identifier: GPL-2.0-or-later #include "common/input.h" -#include "common/logging/log.h" +#include "common/logging.h" #include "input_common/helpers/joycon_protocol/common_protocol.h" namespace InputCommon::Joycon { diff --git a/src/input_common/helpers/joycon_protocol/generic_functions.cpp b/src/input_common/helpers/joycon_protocol/generic_functions.cpp index e9a056448c..1ec079b22f 100644 --- a/src/input_common/helpers/joycon_protocol/generic_functions.cpp +++ b/src/input_common/helpers/joycon_protocol/generic_functions.cpp @@ -2,7 +2,7 @@ // SPDX-License-Identifier: GPL-2.0-or-later #include "common/input.h" -#include "common/logging/log.h" +#include "common/logging.h" #include "input_common/helpers/joycon_protocol/generic_functions.h" namespace InputCommon::Joycon { diff --git a/src/input_common/helpers/joycon_protocol/irs.cpp b/src/input_common/helpers/joycon_protocol/irs.cpp index 5bf72114da..21be3e49a6 100644 --- a/src/input_common/helpers/joycon_protocol/irs.cpp +++ b/src/input_common/helpers/joycon_protocol/irs.cpp @@ -2,7 +2,7 @@ // SPDX-License-Identifier: GPL-2.0-or-later #include "common/input.h" -#include "common/logging/log.h" +#include "common/logging.h" #include "input_common/helpers/joycon_protocol/irs.h" namespace InputCommon::Joycon { diff --git a/src/input_common/helpers/joycon_protocol/nfc.cpp b/src/input_common/helpers/joycon_protocol/nfc.cpp index db83f9ef48..d1f2469333 100644 --- a/src/input_common/helpers/joycon_protocol/nfc.cpp +++ b/src/input_common/helpers/joycon_protocol/nfc.cpp @@ -2,7 +2,7 @@ // SPDX-License-Identifier: GPL-2.0-or-later #include "common/input.h" -#include "common/logging/log.h" +#include "common/logging.h" #include "input_common/helpers/joycon_protocol/nfc.h" namespace InputCommon::Joycon { diff --git a/src/input_common/helpers/joycon_protocol/poller.cpp b/src/input_common/helpers/joycon_protocol/poller.cpp index 1aab9e12a3..612b385790 100644 --- a/src/input_common/helpers/joycon_protocol/poller.cpp +++ b/src/input_common/helpers/joycon_protocol/poller.cpp @@ -1,7 +1,7 @@ // SPDX-FileCopyrightText: Copyright 2022 yuzu Emulator Project // SPDX-License-Identifier: GPL-2.0-or-later -#include "common/logging/log.h" +#include "common/logging.h" #include "input_common/helpers/joycon_protocol/poller.h" namespace InputCommon::Joycon { diff --git a/src/input_common/helpers/joycon_protocol/ringcon.cpp b/src/input_common/helpers/joycon_protocol/ringcon.cpp index 96414fb676..00f66ad084 100644 --- a/src/input_common/helpers/joycon_protocol/ringcon.cpp +++ b/src/input_common/helpers/joycon_protocol/ringcon.cpp @@ -2,7 +2,7 @@ // SPDX-License-Identifier: GPL-2.0-or-later #include "common/input.h" -#include "common/logging/log.h" +#include "common/logging.h" #include "input_common/helpers/joycon_protocol/ringcon.h" namespace InputCommon::Joycon { diff --git a/src/input_common/helpers/joycon_protocol/rumble.cpp b/src/input_common/helpers/joycon_protocol/rumble.cpp index 9fd0b84708..5e049946b6 100644 --- a/src/input_common/helpers/joycon_protocol/rumble.cpp +++ b/src/input_common/helpers/joycon_protocol/rumble.cpp @@ -5,7 +5,7 @@ #include #include "common/input.h" -#include "common/logging/log.h" +#include "common/logging.h" #include "input_common/helpers/joycon_protocol/rumble.h" namespace InputCommon::Joycon { diff --git a/src/input_common/helpers/udp_protocol.cpp b/src/input_common/helpers/udp_protocol.cpp index e54a8fce1d..dc103b462d 100644 --- a/src/input_common/helpers/udp_protocol.cpp +++ b/src/input_common/helpers/udp_protocol.cpp @@ -3,7 +3,7 @@ #include #include -#include "common/logging/log.h" +#include "common/logging.h" #include "input_common/helpers/udp_protocol.h" namespace InputCommon::CemuhookUDP { diff --git a/src/input_common/input_engine.cpp b/src/input_common/input_engine.cpp index e4c5b5b3c7..721b849831 100644 --- a/src/input_common/input_engine.cpp +++ b/src/input_common/input_engine.cpp @@ -1,7 +1,7 @@ // SPDX-FileCopyrightText: Copyright 2021 yuzu Emulator Project // SPDX-License-Identifier: GPL-2.0-or-later -#include "common/logging/log.h" +#include "common/logging.h" #include "input_common/input_engine.h" namespace InputCommon { diff --git a/src/network/network.cpp b/src/network/network.cpp index 6652a186bb..65e71cff5d 100644 --- a/src/network/network.cpp +++ b/src/network/network.cpp @@ -2,7 +2,7 @@ // SPDX-License-Identifier: GPL-2.0-or-later #include "common/assert.h" -#include "common/logging/log.h" +#include "common/logging.h" #include "enet/enet.h" #include "network/network.h" diff --git a/src/network/room.cpp b/src/network/room.cpp index 6bc483a2eb..8856754f53 100644 --- a/src/network/room.cpp +++ b/src/network/room.cpp @@ -11,7 +11,7 @@ #include #include #include -#include "common/logging/log.h" +#include "common/logging.h" #include "enet/enet.h" #include "network/packet.h" #include "network/room.h" diff --git a/src/network/verify_user.h b/src/network/verify_user.h index df0e9160df..e2cb111744 100644 --- a/src/network/verify_user.h +++ b/src/network/verify_user.h @@ -4,7 +4,7 @@ #pragma once #include -#include "common/logging/log.h" +#include "common/logging.h" namespace Network::VerifyUser { diff --git a/src/shader_recompiler/backend/spirv/emit_spirv.cpp b/src/shader_recompiler/backend/spirv/emit_spirv.cpp index 7dd7476f65..1a99c2b396 100644 --- a/src/shader_recompiler/backend/spirv/emit_spirv.cpp +++ b/src/shader_recompiler/backend/spirv/emit_spirv.cpp @@ -11,7 +11,7 @@ #include #include "common/settings.h" -#include "common/logging/log.h" +#include "common/logging.h" #include "common/settings.h" #include "shader_recompiler/backend/spirv/emit_spirv.h" #include "shader_recompiler/backend/spirv/emit_spirv_instructions.h" diff --git a/src/tests/common/param_package.cpp b/src/tests/common/param_package.cpp index 41575def44..f25ababe12 100644 --- a/src/tests/common/param_package.cpp +++ b/src/tests/common/param_package.cpp @@ -3,7 +3,7 @@ #include #include -#include "common/logging/backend.h" +#include "common/logging.h" #include "common/param_package.h" namespace Common { diff --git a/src/video_core/engines/fermi_2d.cpp b/src/video_core/engines/fermi_2d.cpp index 933449069b..1e0223bd1b 100644 --- a/src/video_core/engines/fermi_2d.cpp +++ b/src/video_core/engines/fermi_2d.cpp @@ -3,7 +3,7 @@ // SPDX-License-Identifier: GPL-2.0-or-later #include "common/assert.h" -#include "common/logging/log.h" +#include "common/logging.h" #include "common/microprofile.h" #include "video_core/engines/fermi_2d.h" #include "video_core/engines/sw_blitter/blitter.h" diff --git a/src/video_core/engines/kepler_compute.cpp b/src/video_core/engines/kepler_compute.cpp index cd61ab222b..9d06323701 100644 --- a/src/video_core/engines/kepler_compute.cpp +++ b/src/video_core/engines/kepler_compute.cpp @@ -3,7 +3,7 @@ #include #include "common/assert.h" -#include "common/logging/log.h" +#include "common/logging.h" #include "core/core.h" #include "video_core/engines/kepler_compute.h" #include "video_core/engines/maxwell_3d.h" diff --git a/src/video_core/engines/kepler_memory.cpp b/src/video_core/engines/kepler_memory.cpp index c026801a35..98cf01c3d2 100644 --- a/src/video_core/engines/kepler_memory.cpp +++ b/src/video_core/engines/kepler_memory.cpp @@ -2,7 +2,7 @@ // SPDX-License-Identifier: GPL-2.0-or-later #include "common/assert.h" -#include "common/logging/log.h" +#include "common/logging.h" #include "core/core.h" #include "video_core/engines/kepler_memory.h" #include "video_core/engines/maxwell_3d.h" diff --git a/src/video_core/engines/maxwell_dma.cpp b/src/video_core/engines/maxwell_dma.cpp index 91c117de74..4e7c8ab1e8 100644 --- a/src/video_core/engines/maxwell_dma.cpp +++ b/src/video_core/engines/maxwell_dma.cpp @@ -4,7 +4,7 @@ #include "common/algorithm.h" #include "common/assert.h" -#include "common/logging/log.h" +#include "common/logging.h" #include "common/microprofile.h" #include "common/polyfill_ranges.h" #include "common/settings.h" diff --git a/src/video_core/engines/puller.cpp b/src/video_core/engines/puller.cpp index 8dd34c04ab..5a9d14d2e2 100644 --- a/src/video_core/engines/puller.cpp +++ b/src/video_core/engines/puller.cpp @@ -2,7 +2,7 @@ // SPDX-License-Identifier: GPL-3.0-or-later #include "common/assert.h" -#include "common/logging/log.h" +#include "common/logging.h" #include "common/settings.h" #include "core/core.h" #include "video_core/control/channel_state.h" diff --git a/src/video_core/frame_skipping.cpp b/src/video_core/frame_skipping.cpp index 1de3c5e28b..807ab3cbdb 100644 --- a/src/video_core/frame_skipping.cpp +++ b/src/video_core/frame_skipping.cpp @@ -2,7 +2,7 @@ // SPDX-License-Identifier: GPL-2.0-or-later #include "video_core/frame_skipping.h" -#include "common/logging/log.h" +#include "common/logging.h" namespace VideoCore { diff --git a/src/video_core/host1x/ffmpeg/ffmpeg.cpp b/src/video_core/host1x/ffmpeg/ffmpeg.cpp index 1003cd38df..d3eb55e4c5 100644 --- a/src/video_core/host1x/ffmpeg/ffmpeg.cpp +++ b/src/video_core/host1x/ffmpeg/ffmpeg.cpp @@ -2,7 +2,7 @@ // SPDX-License-Identifier: GPL-2.0-or-later #include "common/assert.h" -#include "common/logging/log.h" +#include "common/logging.h" #include "common/scope_exit.h" #include "common/settings.h" #include "video_core/host1x/ffmpeg/ffmpeg.h" diff --git a/src/video_core/host1x/vic.cpp b/src/video_core/host1x/vic.cpp index 6760424219..61a42c94ea 100644 --- a/src/video_core/host1x/vic.cpp +++ b/src/video_core/host1x/vic.cpp @@ -17,7 +17,7 @@ extern "C" { #include "common/assert.h" #include "common/bit_field.h" -#include "common/logging/log.h" +#include "common/logging.h" #include "video_core/engines/maxwell_3d.h" #include "video_core/host1x/host1x.h" diff --git a/src/video_core/macro/macro_interpreter.cpp b/src/video_core/macro/macro_interpreter.cpp index 0d63495a9d..c16bda7cdb 100644 --- a/src/video_core/macro/macro_interpreter.cpp +++ b/src/video_core/macro/macro_interpreter.cpp @@ -5,7 +5,7 @@ #include #include "common/assert.h" -#include "common/logging/log.h" +#include "common/logging.h" #include "common/microprofile.h" #include "video_core/engines/maxwell_3d.h" #include "video_core/macro/macro_interpreter.h" diff --git a/src/video_core/macro/macro_jit_x64.cpp b/src/video_core/macro/macro_jit_x64.cpp index 14f265ad71..250644be35 100644 --- a/src/video_core/macro/macro_jit_x64.cpp +++ b/src/video_core/macro/macro_jit_x64.cpp @@ -9,7 +9,7 @@ #include "common/assert.h" #include "common/bit_field.h" -#include "common/logging/log.h" +#include "common/logging.h" #include "common/microprofile.h" #include "common/x64/xbyak_abi.h" #include "common/x64/xbyak_util.h" diff --git a/src/video_core/memory_manager.cpp b/src/video_core/memory_manager.cpp index ffafc48eff..b25683859d 100644 --- a/src/video_core/memory_manager.cpp +++ b/src/video_core/memory_manager.cpp @@ -5,7 +5,7 @@ #include "common/alignment.h" #include "common/assert.h" -#include "common/logging/log.h" +#include "common/logging.h" #include "core/core.h" #include "core/hle/kernel/k_page_table.h" #include "core/hle/kernel/k_process.h" diff --git a/src/video_core/query_cache/query_cache.h b/src/video_core/query_cache/query_cache.h index 2a1c92c476..e1105a31b3 100644 --- a/src/video_core/query_cache/query_cache.h +++ b/src/video_core/query_cache/query_cache.h @@ -12,7 +12,7 @@ #include "common/assert.h" #include "common/common_types.h" -#include "common/logging/log.h" +#include "common/logging.h" #include "common/scope_exit.h" #include "common/settings.h" #include "video_core/engines/maxwell_3d.h" diff --git a/src/video_core/renderer_base.cpp b/src/video_core/renderer_base.cpp index 4002fa72bb..4795450c27 100644 --- a/src/video_core/renderer_base.cpp +++ b/src/video_core/renderer_base.cpp @@ -3,7 +3,7 @@ #include -#include "common/logging/log.h" +#include "common/logging.h" #include "core/frontend/emu_window.h" #include "core/frontend/graphics_context.h" #include "video_core/renderer_base.h" diff --git a/src/video_core/renderer_vulkan/maxwell_to_vk.cpp b/src/video_core/renderer_vulkan/maxwell_to_vk.cpp index c751193b85..d06c9efa97 100644 --- a/src/video_core/renderer_vulkan/maxwell_to_vk.cpp +++ b/src/video_core/renderer_vulkan/maxwell_to_vk.cpp @@ -6,7 +6,7 @@ #include "common/assert.h" #include "common/common_types.h" -#include "common/logging/log.h" +#include "common/logging.h" #include "common/settings.h" #include "video_core/engines/maxwell_3d.h" #include "video_core/renderer_vulkan/maxwell_to_vk.h" diff --git a/src/video_core/renderer_vulkan/pipeline_statistics.cpp b/src/video_core/renderer_vulkan/pipeline_statistics.cpp index fcd160a326..019bd9a4e5 100644 --- a/src/video_core/renderer_vulkan/pipeline_statistics.cpp +++ b/src/video_core/renderer_vulkan/pipeline_statistics.cpp @@ -6,7 +6,7 @@ #include #include "common/common_types.h" -#include "common/logging/log.h" +#include "common/logging.h" #include "video_core/renderer_vulkan/pipeline_statistics.h" #include "video_core/vulkan_common/vulkan_device.h" #include "video_core/vulkan_common/vulkan_wrapper.h" diff --git a/src/video_core/renderer_vulkan/present/taa.cpp b/src/video_core/renderer_vulkan/present/taa.cpp index 5110e22bcd..a02b786de9 100644 --- a/src/video_core/renderer_vulkan/present/taa.cpp +++ b/src/video_core/renderer_vulkan/present/taa.cpp @@ -10,7 +10,7 @@ #include "video_core/renderer_vulkan/vk_scheduler.h" #include "video_core/renderer_vulkan/vk_shader_util.h" #include "video_core/vulkan_common/vulkan_device.h" -#include "common/logging/log.h" +#include "common/logging.h" namespace Vulkan { diff --git a/src/video_core/renderer_vulkan/renderer_vulkan.cpp b/src/video_core/renderer_vulkan/renderer_vulkan.cpp index a62030f7e2..279a446527 100644 --- a/src/video_core/renderer_vulkan/renderer_vulkan.cpp +++ b/src/video_core/renderer_vulkan/renderer_vulkan.cpp @@ -12,7 +12,7 @@ #include #include -#include "common/logging/log.h" +#include "common/logging.h" #include "common/polyfill_ranges.h" #include "common/scope_exit.h" #include "common/settings.h" diff --git a/src/video_core/renderer_vulkan/vk_rasterizer.cpp b/src/video_core/renderer_vulkan/vk_rasterizer.cpp index d3ca9c51f6..e00d12d1f6 100644 --- a/src/video_core/renderer_vulkan/vk_rasterizer.cpp +++ b/src/video_core/renderer_vulkan/vk_rasterizer.cpp @@ -11,7 +11,7 @@ #include "citron/util/title_ids.h" #include "common/assert.h" -#include "common/logging/log.h" +#include "common/logging.h" #include "common/microprofile.h" #include "common/scope_exit.h" #include "common/settings.h" diff --git a/src/video_core/renderer_vulkan/vk_swapchain.cpp b/src/video_core/renderer_vulkan/vk_swapchain.cpp index 456dcf17cf..a6bb644c02 100644 --- a/src/video_core/renderer_vulkan/vk_swapchain.cpp +++ b/src/video_core/renderer_vulkan/vk_swapchain.cpp @@ -7,7 +7,7 @@ #include #include -#include "common/logging/log.h" +#include "common/logging.h" #include "common/polyfill_ranges.h" #include "common/settings.h" #include "core/core.h" diff --git a/src/video_core/renderer_vulkan/vk_turbo_mode.cpp b/src/video_core/renderer_vulkan/vk_turbo_mode.cpp index 8530799e10..39c9e6c46e 100644 --- a/src/video_core/renderer_vulkan/vk_turbo_mode.cpp +++ b/src/video_core/renderer_vulkan/vk_turbo_mode.cpp @@ -7,7 +7,7 @@ #endif #include "common/literals.h" -#include "common/logging/log.h" +#include "common/logging.h" #include "video_core/host_shaders/vulkan_turbo_mode_comp_spv.h" #include "video_core/renderer_vulkan/renderer_vulkan.h" #include "video_core/renderer_vulkan/vk_shader_util.h" diff --git a/src/video_core/renderer_vulkan/vk_update_descriptor.cpp b/src/video_core/renderer_vulkan/vk_update_descriptor.cpp index 52259b9e50..b2f363f676 100644 --- a/src/video_core/renderer_vulkan/vk_update_descriptor.cpp +++ b/src/video_core/renderer_vulkan/vk_update_descriptor.cpp @@ -5,7 +5,7 @@ #include #include -#include "common/logging/log.h" +#include "common/logging.h" #include "video_core/renderer_vulkan/vk_scheduler.h" #include "video_core/renderer_vulkan/vk_update_descriptor.h" #include "video_core/vulkan_common/vulkan_device.h" diff --git a/src/video_core/renderer_vulkan/vk_zbc_clear.cpp b/src/video_core/renderer_vulkan/vk_zbc_clear.cpp index 200bd7bf6d..1f010feafa 100644 --- a/src/video_core/renderer_vulkan/vk_zbc_clear.cpp +++ b/src/video_core/renderer_vulkan/vk_zbc_clear.cpp @@ -2,7 +2,7 @@ // SPDX-License-Identifier: GPL-2.0-or-later #include "video_core/renderer_vulkan/vk_zbc_clear.h" -#include "common/logging/log.h" +#include "common/logging.h" #include "video_core/zbc_manager.h" namespace Vulkan { diff --git a/src/video_core/shader_environment.cpp b/src/video_core/shader_environment.cpp index 18ae76420d..c6792db650 100644 --- a/src/video_core/shader_environment.cpp +++ b/src/video_core/shader_environment.cpp @@ -16,7 +16,7 @@ #include "common/div_ceil.h" #include "common/fs/fs.h" #include "common/fs/path_util.h" -#include "common/logging/log.h" +#include "common/logging.h" #include "common/polyfill_ranges.h" #include "shader_recompiler/environment.h" #include "video_core/engines/kepler_compute.h" diff --git a/src/video_core/surface.h b/src/video_core/surface.h index a133de0208..77a76d4e1f 100644 --- a/src/video_core/surface.h +++ b/src/video_core/surface.h @@ -7,7 +7,7 @@ #include #include "common/assert.h" #include "common/common_types.h" -#include "common/logging/log.h" +#include "common/logging.h" #include "video_core/gpu.h" #include "video_core/textures/texture.h" diff --git a/src/video_core/texture_cache/format_lookup_table.cpp b/src/video_core/texture_cache/format_lookup_table.cpp index e6e7e1aa62..269bb4bdb0 100644 --- a/src/video_core/texture_cache/format_lookup_table.cpp +++ b/src/video_core/texture_cache/format_lookup_table.cpp @@ -3,7 +3,7 @@ // SPDX-License-Identifier: GPL-2.0-or-later #include "common/common_types.h" -#include "common/logging/log.h" +#include "common/logging.h" #include "video_core/texture_cache/format_lookup_table.h" namespace VideoCommon { diff --git a/src/video_core/video_core.cpp b/src/video_core/video_core.cpp index c6e00811f5..463ddf5447 100644 --- a/src/video_core/video_core.cpp +++ b/src/video_core/video_core.cpp @@ -3,7 +3,7 @@ #include -#include "common/logging/log.h" +#include "common/logging.h" #include "common/settings.h" #include "core/core.h" #include "core/frontend/emu_window.h" diff --git a/src/video_core/vulkan_common/nsight_aftermath_tracker.cpp b/src/video_core/vulkan_common/nsight_aftermath_tracker.cpp index 60f62fb6f7..25d98ee59b 100644 --- a/src/video_core/vulkan_common/nsight_aftermath_tracker.cpp +++ b/src/video_core/vulkan_common/nsight_aftermath_tracker.cpp @@ -16,7 +16,7 @@ #include "common/fs/file.h" #include "common/fs/fs.h" #include "common/fs/path_util.h" -#include "common/logging/log.h" +#include "common/logging.h" #include "common/scope_exit.h" #include "video_core/vulkan_common/nsight_aftermath_tracker.h" diff --git a/src/video_core/vulkan_common/vulkan_debug_callback.cpp b/src/video_core/vulkan_common/vulkan_debug_callback.cpp index 448df2d3ab..d0a489dbfd 100644 --- a/src/video_core/vulkan_common/vulkan_debug_callback.cpp +++ b/src/video_core/vulkan_common/vulkan_debug_callback.cpp @@ -2,7 +2,7 @@ // SPDX-License-Identifier: GPL-2.0-or-later #include -#include "common/logging/log.h" +#include "common/logging.h" #include "video_core/vulkan_common/vulkan_debug_callback.h" namespace Vulkan { diff --git a/src/video_core/vulkan_common/vulkan_device.h b/src/video_core/vulkan_common/vulkan_device.h index d2615c87ed..760eadc526 100644 --- a/src/video_core/vulkan_common/vulkan_device.h +++ b/src/video_core/vulkan_common/vulkan_device.h @@ -10,7 +10,7 @@ #include #include "common/common_types.h" -#include "common/logging/log.h" +#include "common/logging.h" #include "common/settings.h" #include "video_core/vulkan_common/vulkan_wrapper.h" diff --git a/src/video_core/vulkan_common/vulkan_instance.cpp b/src/video_core/vulkan_common/vulkan_instance.cpp index 180657a75a..539e15f5d1 100644 --- a/src/video_core/vulkan_common/vulkan_instance.cpp +++ b/src/video_core/vulkan_common/vulkan_instance.cpp @@ -8,7 +8,7 @@ #include "common/common_types.h" #include "common/dynamic_library.h" -#include "common/logging/log.h" +#include "common/logging.h" #include "common/polyfill_ranges.h" #include "core/frontend/emu_window.h" #include "video_core/vulkan_common/vulkan_instance.h" diff --git a/src/video_core/vulkan_common/vulkan_library.cpp b/src/video_core/vulkan_common/vulkan_library.cpp index 0130f6a0d9..6cb99bf3f5 100644 --- a/src/video_core/vulkan_common/vulkan_library.cpp +++ b/src/video_core/vulkan_common/vulkan_library.cpp @@ -5,7 +5,7 @@ #include "common/dynamic_library.h" #include "common/fs/path_util.h" -#include "common/logging/log.h" +#include "common/logging.h" #include "video_core/vulkan_common/vulkan_library.h" namespace Vulkan { diff --git a/src/video_core/vulkan_common/vulkan_memory_allocator.cpp b/src/video_core/vulkan_common/vulkan_memory_allocator.cpp index b8efdbbf46..466b49a0a0 100644 --- a/src/video_core/vulkan_common/vulkan_memory_allocator.cpp +++ b/src/video_core/vulkan_common/vulkan_memory_allocator.cpp @@ -11,7 +11,7 @@ #include "common/assert.h" #include "common/common_types.h" #include "common/literals.h" -#include "common/logging/log.h" +#include "common/logging.h" #include "common/polyfill_ranges.h" #include "video_core/vulkan_common/vma.h" #include "video_core/vulkan_common/vulkan_device.h" diff --git a/src/video_core/vulkan_common/vulkan_surface.cpp b/src/video_core/vulkan_common/vulkan_surface.cpp index e45f8e43fb..3d1d416cb8 100644 --- a/src/video_core/vulkan_common/vulkan_surface.cpp +++ b/src/video_core/vulkan_common/vulkan_surface.cpp @@ -1,7 +1,7 @@ // SPDX-FileCopyrightText: Copyright 2020 yuzu Emulator Project // SPDX-License-Identifier: GPL-2.0-or-later -#include "common/logging/log.h" +#include "common/logging.h" #include "core/frontend/emu_window.h" #include "video_core/vulkan_common/vulkan_surface.h" #include "video_core/vulkan_common/vulkan_wrapper.h" diff --git a/src/video_core/vulkan_common/vulkan_wrapper.cpp b/src/video_core/vulkan_common/vulkan_wrapper.cpp index d6ac531486..381b23a62b 100644 --- a/src/video_core/vulkan_common/vulkan_wrapper.cpp +++ b/src/video_core/vulkan_common/vulkan_wrapper.cpp @@ -8,7 +8,7 @@ #include #include "common/common_types.h" -#include "common/logging/log.h" +#include "common/logging.h" #include "video_core/vulkan_common/vk_enum_string_helper.h" #include "video_core/vulkan_common/vma.h" #include "video_core/vulkan_common/vulkan_wrapper.h" diff --git a/src/video_core/zbc_manager.cpp b/src/video_core/zbc_manager.cpp index 49b21dfc2f..86e9272a0a 100644 --- a/src/video_core/zbc_manager.cpp +++ b/src/video_core/zbc_manager.cpp @@ -2,7 +2,7 @@ // SPDX-License-Identifier: GPL-2.0-or-later #include "video_core/zbc_manager.h" -#include "common/logging/log.h" +#include "common/logging.h" namespace VideoCore { diff --git a/src/web_service/announce_room_json.cpp b/src/web_service/announce_room_json.cpp index f1020a5b88..2e736d348d 100644 --- a/src/web_service/announce_room_json.cpp +++ b/src/web_service/announce_room_json.cpp @@ -4,7 +4,7 @@ #include #include #include "common/detached_tasks.h" -#include "common/logging/log.h" +#include "common/logging.h" #include "web_service/announce_room_json.h" #include "web_service/web_backend.h" diff --git a/src/web_service/verify_user_jwt.cpp b/src/web_service/verify_user_jwt.cpp index f88f676206..96e23c70e5 100644 --- a/src/web_service/verify_user_jwt.cpp +++ b/src/web_service/verify_user_jwt.cpp @@ -12,7 +12,7 @@ #endif #include -#include "common/logging/log.h" +#include "common/logging.h" #include "web_service/verify_user_jwt.h" #include "web_service/web_backend.h" #include "web_service/web_result.h" diff --git a/src/web_service/web_backend.cpp b/src/web_service/web_backend.cpp index 74fe8ec52a..76460ebbd0 100644 --- a/src/web_service/web_backend.cpp +++ b/src/web_service/web_backend.cpp @@ -19,7 +19,7 @@ #pragma GCC diagnostic pop #endif -#include "common/logging/log.h" +#include "common/logging.h" #include "web_service/web_backend.h" #include "web_service/web_result.h"