summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorGravatar Liam2022-10-03 18:43:56 -0400
committerGravatar Liam2022-10-03 18:43:56 -0400
commit35d3e7db2a0413a921e0846a3d76f9d9f36a2500 (patch)
tree12f749fe914b16cbc0a8b424c1738495b4c154b7 /src
parentMerge pull request #8955 from german77/amiibo-rewrite (diff)
downloadyuzu-35d3e7db2a0413a921e0846a3d76f9d9f36a2500.tar.gz
yuzu-35d3e7db2a0413a921e0846a3d76f9d9f36a2500.tar.xz
yuzu-35d3e7db2a0413a921e0846a3d76f9d9f36a2500.zip
common: remove "yuzu:" prefix from thread names
Diffstat (limited to 'src')
-rw-r--r--src/audio_core/renderer/adsp/audio_renderer.cpp2
-rw-r--r--src/audio_core/renderer/system_manager.cpp2
-rw-r--r--src/common/logging/backend.cpp2
-rw-r--r--src/core/core_timing.cpp2
-rw-r--r--src/core/cpu_manager.cpp4
-rw-r--r--src/core/debugger/debugger.cpp2
-rw-r--r--src/core/hle/kernel/k_worker_task_manager.cpp2
-rw-r--r--src/core/hle/kernel/kernel.cpp2
-rw-r--r--src/core/hle/kernel/service_thread.cpp2
-rw-r--r--src/core/hle/service/nvflinger/nvflinger.cpp2
-rw-r--r--src/input_common/drivers/gc_adapter.cpp4
-rw-r--r--src/input_common/drivers/mouse.cpp2
-rw-r--r--src/input_common/drivers/sdl_driver.cpp4
-rw-r--r--src/video_core/gpu_thread.cpp2
-rw-r--r--src/video_core/renderer_opengl/gl_shader_cache.cpp2
-rw-r--r--src/video_core/renderer_vulkan/vk_pipeline_cache.cpp4
-rw-r--r--src/video_core/renderer_vulkan/vk_scheduler.cpp2
-rw-r--r--src/video_core/textures/astc.cpp2
-rw-r--r--src/yuzu/bootmanager.cpp2
19 files changed, 23 insertions, 23 deletions
diff --git a/src/audio_core/renderer/adsp/audio_renderer.cpp b/src/audio_core/renderer/adsp/audio_renderer.cpp
index ab2257bd8..d982ef630 100644
--- a/src/audio_core/renderer/adsp/audio_renderer.cpp
+++ b/src/audio_core/renderer/adsp/audio_renderer.cpp
@@ -132,7 +132,7 @@ void AudioRenderer::CreateSinkStreams() {
132} 132}
133 133
134void AudioRenderer::ThreadFunc() { 134void AudioRenderer::ThreadFunc() {
135 constexpr char name[]{"yuzu:AudioRenderer"}; 135 constexpr char name[]{"AudioRenderer"};
136 MicroProfileOnThreadCreate(name); 136 MicroProfileOnThreadCreate(name);
137 Common::SetCurrentThreadName(name); 137 Common::SetCurrentThreadName(name);
138 Common::SetCurrentThreadPriority(Common::ThreadPriority::Critical); 138 Common::SetCurrentThreadPriority(Common::ThreadPriority::Critical);
diff --git a/src/audio_core/renderer/system_manager.cpp b/src/audio_core/renderer/system_manager.cpp
index 9c1331e19..f66b2b890 100644
--- a/src/audio_core/renderer/system_manager.cpp
+++ b/src/audio_core/renderer/system_manager.cpp
@@ -94,7 +94,7 @@ bool SystemManager::Remove(System& system_) {
94} 94}
95 95
96void SystemManager::ThreadFunc() { 96void SystemManager::ThreadFunc() {
97 constexpr char name[]{"yuzu:AudioRenderSystemManager"}; 97 constexpr char name[]{"AudioRenderSystemManager"};
98 MicroProfileOnThreadCreate(name); 98 MicroProfileOnThreadCreate(name);
99 Common::SetCurrentThreadName(name); 99 Common::SetCurrentThreadName(name);
100 Common::SetCurrentThreadPriority(Common::ThreadPriority::High); 100 Common::SetCurrentThreadPriority(Common::ThreadPriority::High);
diff --git a/src/common/logging/backend.cpp b/src/common/logging/backend.cpp
index 8ce1c2fd1..15d92505e 100644
--- a/src/common/logging/backend.cpp
+++ b/src/common/logging/backend.cpp
@@ -219,7 +219,7 @@ private:
219 219
220 void StartBackendThread() { 220 void StartBackendThread() {
221 backend_thread = std::jthread([this](std::stop_token stop_token) { 221 backend_thread = std::jthread([this](std::stop_token stop_token) {
222 Common::SetCurrentThreadName("yuzu:Log"); 222 Common::SetCurrentThreadName("Logger");
223 Entry entry; 223 Entry entry;
224 const auto write_logs = [this, &entry]() { 224 const auto write_logs = [this, &entry]() {
225 ForEachBackend([&entry](Backend& backend) { backend.Write(entry); }); 225 ForEachBackend([&entry](Backend& backend) { backend.Write(entry); });
diff --git a/src/core/core_timing.cpp b/src/core/core_timing.cpp
index f6c4567ba..6c0fcb7b5 100644
--- a/src/core/core_timing.cpp
+++ b/src/core/core_timing.cpp
@@ -43,7 +43,7 @@ CoreTiming::CoreTiming()
43CoreTiming::~CoreTiming() = default; 43CoreTiming::~CoreTiming() = default;
44 44
45void CoreTiming::ThreadEntry(CoreTiming& instance) { 45void CoreTiming::ThreadEntry(CoreTiming& instance) {
46 constexpr char name[] = "yuzu:HostTiming"; 46 constexpr char name[] = "HostTiming";
47 MicroProfileOnThreadCreate(name); 47 MicroProfileOnThreadCreate(name);
48 Common::SetCurrentThreadName(name); 48 Common::SetCurrentThreadName(name);
49 Common::SetCurrentThreadPriority(Common::ThreadPriority::Critical); 49 Common::SetCurrentThreadPriority(Common::ThreadPriority::Critical);
diff --git a/src/core/cpu_manager.cpp b/src/core/cpu_manager.cpp
index 9b1565ae1..0dd4c2196 100644
--- a/src/core/cpu_manager.cpp
+++ b/src/core/cpu_manager.cpp
@@ -189,9 +189,9 @@ void CpuManager::RunThread(std::size_t core) {
189 system.RegisterCoreThread(core); 189 system.RegisterCoreThread(core);
190 std::string name; 190 std::string name;
191 if (is_multicore) { 191 if (is_multicore) {
192 name = "yuzu:CPUCore_" + std::to_string(core); 192 name = "CPUCore_" + std::to_string(core);
193 } else { 193 } else {
194 name = "yuzu:CPUThread"; 194 name = "CPUThread";
195 } 195 }
196 MicroProfileOnThreadCreate(name.c_str()); 196 MicroProfileOnThreadCreate(name.c_str());
197 Common::SetCurrentThreadName(name.c_str()); 197 Common::SetCurrentThreadName(name.c_str());
diff --git a/src/core/debugger/debugger.cpp b/src/core/debugger/debugger.cpp
index e42bdd17d..339f971e6 100644
--- a/src/core/debugger/debugger.cpp
+++ b/src/core/debugger/debugger.cpp
@@ -140,7 +140,7 @@ private:
140 } 140 }
141 141
142 void ThreadLoop(std::stop_token stop_token) { 142 void ThreadLoop(std::stop_token stop_token) {
143 Common::SetCurrentThreadName("yuzu:Debugger"); 143 Common::SetCurrentThreadName("Debugger");
144 144
145 // Set up the client signals for new data. 145 // Set up the client signals for new data.
146 AsyncReceiveInto(signal_pipe, pipe_data, [&](auto d) { PipeData(d); }); 146 AsyncReceiveInto(signal_pipe, pipe_data, [&](auto d) { PipeData(d); });
diff --git a/src/core/hle/kernel/k_worker_task_manager.cpp b/src/core/hle/kernel/k_worker_task_manager.cpp
index 221f341ee..04042bf8f 100644
--- a/src/core/hle/kernel/k_worker_task_manager.cpp
+++ b/src/core/hle/kernel/k_worker_task_manager.cpp
@@ -23,7 +23,7 @@ void KWorkerTask::DoWorkerTask() {
23 } 23 }
24} 24}
25 25
26KWorkerTaskManager::KWorkerTaskManager() : m_waiting_thread(1, "yuzu:KWorkerTaskManager") {} 26KWorkerTaskManager::KWorkerTaskManager() : m_waiting_thread(1, "KWorkerTaskManager") {}
27 27
28void KWorkerTaskManager::AddTask(KernelCore& kernel, WorkerType type, KWorkerTask* task) { 28void KWorkerTaskManager::AddTask(KernelCore& kernel, WorkerType type, KWorkerTask* task) {
29 ASSERT(type <= WorkerType::Count); 29 ASSERT(type <= WorkerType::Count);
diff --git a/src/core/hle/kernel/kernel.cpp b/src/core/hle/kernel/kernel.cpp
index ce7fa8275..9251f29ad 100644
--- a/src/core/hle/kernel/kernel.cpp
+++ b/src/core/hle/kernel/kernel.cpp
@@ -48,7 +48,7 @@ namespace Kernel {
48struct KernelCore::Impl { 48struct KernelCore::Impl {
49 explicit Impl(Core::System& system_, KernelCore& kernel_) 49 explicit Impl(Core::System& system_, KernelCore& kernel_)
50 : time_manager{system_}, 50 : time_manager{system_},
51 service_threads_manager{1, "yuzu:ServiceThreadsManager"}, system{system_} {} 51 service_threads_manager{1, "ServiceThreadsManager"}, system{system_} {}
52 52
53 void SetMulticore(bool is_multi) { 53 void SetMulticore(bool is_multi) {
54 is_multicore = is_multi; 54 is_multicore = is_multi;
diff --git a/src/core/hle/kernel/service_thread.cpp b/src/core/hle/kernel/service_thread.cpp
index 2e87b4ea4..d23d76706 100644
--- a/src/core/hle/kernel/service_thread.cpp
+++ b/src/core/hle/kernel/service_thread.cpp
@@ -36,7 +36,7 @@ ServiceThread::Impl::Impl(KernelCore& kernel, std::size_t num_threads, const std
36 : service_name{name} { 36 : service_name{name} {
37 for (std::size_t i = 0; i < num_threads; ++i) { 37 for (std::size_t i = 0; i < num_threads; ++i) {
38 threads.emplace_back([this, &kernel](std::stop_token stop_token) { 38 threads.emplace_back([this, &kernel](std::stop_token stop_token) {
39 Common::SetCurrentThreadName(std::string{"yuzu:HleService:" + service_name}.c_str()); 39 Common::SetCurrentThreadName(std::string{service_name}.c_str());
40 40
41 // Wait for first request before trying to acquire a render context 41 // Wait for first request before trying to acquire a render context
42 { 42 {
diff --git a/src/core/hle/service/nvflinger/nvflinger.cpp b/src/core/hle/service/nvflinger/nvflinger.cpp
index 93057e800..4246e5e25 100644
--- a/src/core/hle/service/nvflinger/nvflinger.cpp
+++ b/src/core/hle/service/nvflinger/nvflinger.cpp
@@ -31,7 +31,7 @@ constexpr auto frame_ns = std::chrono::nanoseconds{1000000000 / 60};
31 31
32void NVFlinger::SplitVSync(std::stop_token stop_token) { 32void NVFlinger::SplitVSync(std::stop_token stop_token) {
33 system.RegisterHostThread(); 33 system.RegisterHostThread();
34 std::string name = "yuzu:VSyncThread"; 34 std::string name = "VSyncThread";
35 MicroProfileOnThreadCreate(name.c_str()); 35 MicroProfileOnThreadCreate(name.c_str());
36 36
37 // Cleanup 37 // Cleanup
diff --git a/src/input_common/drivers/gc_adapter.cpp b/src/input_common/drivers/gc_adapter.cpp
index 27a0ffb0d..f4dd24e7d 100644
--- a/src/input_common/drivers/gc_adapter.cpp
+++ b/src/input_common/drivers/gc_adapter.cpp
@@ -90,7 +90,7 @@ GCAdapter::~GCAdapter() {
90 90
91void GCAdapter::AdapterInputThread(std::stop_token stop_token) { 91void GCAdapter::AdapterInputThread(std::stop_token stop_token) {
92 LOG_DEBUG(Input, "Input thread started"); 92 LOG_DEBUG(Input, "Input thread started");
93 Common::SetCurrentThreadName("yuzu:input:GCAdapter"); 93 Common::SetCurrentThreadName("GCAdapter");
94 s32 payload_size{}; 94 s32 payload_size{};
95 AdapterPayload adapter_payload{}; 95 AdapterPayload adapter_payload{};
96 96
@@ -214,7 +214,7 @@ void GCAdapter::UpdateStateAxes(std::size_t port, const AdapterPayload& adapter_
214} 214}
215 215
216void GCAdapter::AdapterScanThread(std::stop_token stop_token) { 216void GCAdapter::AdapterScanThread(std::stop_token stop_token) {
217 Common::SetCurrentThreadName("yuzu:input:ScanGCAdapter"); 217 Common::SetCurrentThreadName("ScanGCAdapter");
218 usb_adapter_handle = nullptr; 218 usb_adapter_handle = nullptr;
219 pads = {}; 219 pads = {};
220 while (!stop_token.stop_requested() && !Setup()) { 220 while (!stop_token.stop_requested() && !Setup()) {
diff --git a/src/input_common/drivers/mouse.cpp b/src/input_common/drivers/mouse.cpp
index 4909fa8d7..98c3157a8 100644
--- a/src/input_common/drivers/mouse.cpp
+++ b/src/input_common/drivers/mouse.cpp
@@ -37,7 +37,7 @@ Mouse::Mouse(std::string input_engine_) : InputEngine(std::move(input_engine_))
37} 37}
38 38
39void Mouse::UpdateThread(std::stop_token stop_token) { 39void Mouse::UpdateThread(std::stop_token stop_token) {
40 Common::SetCurrentThreadName("yuzu:input:Mouse"); 40 Common::SetCurrentThreadName("Mouse");
41 constexpr int update_time = 10; 41 constexpr int update_time = 10;
42 while (!stop_token.stop_requested()) { 42 while (!stop_token.stop_requested()) {
43 if (Settings::values.mouse_panning && !Settings::values.mouse_enabled) { 43 if (Settings::values.mouse_panning && !Settings::values.mouse_enabled) {
diff --git a/src/input_common/drivers/sdl_driver.cpp b/src/input_common/drivers/sdl_driver.cpp
index 5cc1ccbd9..b72e4b397 100644
--- a/src/input_common/drivers/sdl_driver.cpp
+++ b/src/input_common/drivers/sdl_driver.cpp
@@ -436,7 +436,7 @@ SDLDriver::SDLDriver(std::string input_engine_) : InputEngine(std::move(input_en
436 initialized = true; 436 initialized = true;
437 if (start_thread) { 437 if (start_thread) {
438 poll_thread = std::thread([this] { 438 poll_thread = std::thread([this] {
439 Common::SetCurrentThreadName("yuzu:input:SDL"); 439 Common::SetCurrentThreadName("SDL_MainLoop");
440 using namespace std::chrono_literals; 440 using namespace std::chrono_literals;
441 while (initialized) { 441 while (initialized) {
442 SDL_PumpEvents(); 442 SDL_PumpEvents();
@@ -444,7 +444,7 @@ SDLDriver::SDLDriver(std::string input_engine_) : InputEngine(std::move(input_en
444 } 444 }
445 }); 445 });
446 vibration_thread = std::thread([this] { 446 vibration_thread = std::thread([this] {
447 Common::SetCurrentThreadName("yuzu:input:SDL_Vibration"); 447 Common::SetCurrentThreadName("SDL_Vibration");
448 using namespace std::chrono_literals; 448 using namespace std::chrono_literals;
449 while (initialized) { 449 while (initialized) {
450 SendVibrations(); 450 SendVibrations();
diff --git a/src/video_core/gpu_thread.cpp b/src/video_core/gpu_thread.cpp
index d43f7175a..f0e48cfbd 100644
--- a/src/video_core/gpu_thread.cpp
+++ b/src/video_core/gpu_thread.cpp
@@ -19,7 +19,7 @@ namespace VideoCommon::GPUThread {
19static void RunThread(std::stop_token stop_token, Core::System& system, 19static void RunThread(std::stop_token stop_token, Core::System& system,
20 VideoCore::RendererBase& renderer, Core::Frontend::GraphicsContext& context, 20 VideoCore::RendererBase& renderer, Core::Frontend::GraphicsContext& context,
21 Tegra::DmaPusher& dma_pusher, SynchState& state) { 21 Tegra::DmaPusher& dma_pusher, SynchState& state) {
22 std::string name = "yuzu:GPU"; 22 std::string name = "GPU";
23 MicroProfileOnThreadCreate(name.c_str()); 23 MicroProfileOnThreadCreate(name.c_str());
24 SCOPE_EXIT({ MicroProfileOnThreadExit(); }); 24 SCOPE_EXIT({ MicroProfileOnThreadExit(); });
25 25
diff --git a/src/video_core/renderer_opengl/gl_shader_cache.cpp b/src/video_core/renderer_opengl/gl_shader_cache.cpp
index ddb70934c..0b8d8ec92 100644
--- a/src/video_core/renderer_opengl/gl_shader_cache.cpp
+++ b/src/video_core/renderer_opengl/gl_shader_cache.cpp
@@ -546,7 +546,7 @@ std::unique_ptr<ComputePipeline> ShaderCache::CreateComputePipeline(
546 546
547std::unique_ptr<ShaderWorker> ShaderCache::CreateWorkers() const { 547std::unique_ptr<ShaderWorker> ShaderCache::CreateWorkers() const {
548 return std::make_unique<ShaderWorker>(std::max(std::thread::hardware_concurrency(), 2U) - 1, 548 return std::make_unique<ShaderWorker>(std::max(std::thread::hardware_concurrency(), 2U) - 1,
549 "yuzu:ShaderBuilder", 549 "GlShaderBuilder",
550 [this] { return Context{emu_window}; }); 550 [this] { return Context{emu_window}; });
551} 551}
552 552
diff --git a/src/video_core/renderer_vulkan/vk_pipeline_cache.cpp b/src/video_core/renderer_vulkan/vk_pipeline_cache.cpp
index 9708dc45e..accbfc8e1 100644
--- a/src/video_core/renderer_vulkan/vk_pipeline_cache.cpp
+++ b/src/video_core/renderer_vulkan/vk_pipeline_cache.cpp
@@ -271,8 +271,8 @@ PipelineCache::PipelineCache(RasterizerVulkan& rasterizer_, Tegra::Engines::Maxw
271 update_descriptor_queue{update_descriptor_queue_}, render_pass_cache{render_pass_cache_}, 271 update_descriptor_queue{update_descriptor_queue_}, render_pass_cache{render_pass_cache_},
272 buffer_cache{buffer_cache_}, texture_cache{texture_cache_}, shader_notify{shader_notify_}, 272 buffer_cache{buffer_cache_}, texture_cache{texture_cache_}, shader_notify{shader_notify_},
273 use_asynchronous_shaders{Settings::values.use_asynchronous_shaders.GetValue()}, 273 use_asynchronous_shaders{Settings::values.use_asynchronous_shaders.GetValue()},
274 workers(std::max(std::thread::hardware_concurrency(), 2U) - 1, "yuzu:PipelineBuilder"), 274 workers(std::max(std::thread::hardware_concurrency(), 2U) - 1, "VkPipelineBuilder"),
275 serialization_thread(1, "yuzu:PipelineSerialization") { 275 serialization_thread(1, "VkPipelineSerialization") {
276 const auto& float_control{device.FloatControlProperties()}; 276 const auto& float_control{device.FloatControlProperties()};
277 const VkDriverIdKHR driver_id{device.GetDriverID()}; 277 const VkDriverIdKHR driver_id{device.GetDriverID()};
278 profile = Shader::Profile{ 278 profile = Shader::Profile{
diff --git a/src/video_core/renderer_vulkan/vk_scheduler.cpp b/src/video_core/renderer_vulkan/vk_scheduler.cpp
index a331ff37e..d96720b80 100644
--- a/src/video_core/renderer_vulkan/vk_scheduler.cpp
+++ b/src/video_core/renderer_vulkan/vk_scheduler.cpp
@@ -136,7 +136,7 @@ bool Scheduler::UpdateRescaling(bool is_rescaling) {
136} 136}
137 137
138void Scheduler::WorkerThread(std::stop_token stop_token) { 138void Scheduler::WorkerThread(std::stop_token stop_token) {
139 Common::SetCurrentThreadName("yuzu:VulkanWorker"); 139 Common::SetCurrentThreadName("VulkanWorker");
140 do { 140 do {
141 std::unique_ptr<CommandChunk> work; 141 std::unique_ptr<CommandChunk> work;
142 { 142 {
diff --git a/src/video_core/textures/astc.cpp b/src/video_core/textures/astc.cpp
index e3742ddf5..15b9d4182 100644
--- a/src/video_core/textures/astc.cpp
+++ b/src/video_core/textures/astc.cpp
@@ -1656,7 +1656,7 @@ void Decompress(std::span<const uint8_t> data, uint32_t width, uint32_t height,
1656 const u32 cols = Common::DivideUp(width, block_width); 1656 const u32 cols = Common::DivideUp(width, block_width);
1657 1657
1658 Common::ThreadWorker workers{std::max(std::thread::hardware_concurrency(), 2U) / 2, 1658 Common::ThreadWorker workers{std::max(std::thread::hardware_concurrency(), 2U) / 2,
1659 "yuzu:ASTCDecompress"}; 1659 "ASTCDecompress"};
1660 1660
1661 for (u32 z = 0; z < depth; ++z) { 1661 for (u32 z = 0; z < depth; ++z) {
1662 const u32 depth_offset = z * height * width * 4; 1662 const u32 depth_offset = z * height * width * 4;
diff --git a/src/yuzu/bootmanager.cpp b/src/yuzu/bootmanager.cpp
index d3fbdb09d..24251247d 100644
--- a/src/yuzu/bootmanager.cpp
+++ b/src/yuzu/bootmanager.cpp
@@ -47,7 +47,7 @@ EmuThread::EmuThread(Core::System& system_) : system{system_} {}
47EmuThread::~EmuThread() = default; 47EmuThread::~EmuThread() = default;
48 48
49void EmuThread::run() { 49void EmuThread::run() {
50 std::string name = "yuzu:EmuControlThread"; 50 std::string name = "EmuControlThread";
51 MicroProfileOnThreadCreate(name.c_str()); 51 MicroProfileOnThreadCreate(name.c_str());
52 Common::SetCurrentThreadName(name.c_str()); 52 Common::SetCurrentThreadName(name.c_str());
53 53