summaryrefslogtreecommitdiffstats
path: root/src/core
diff options
context:
space:
mode:
authorFernando Sahmkow <fsahmkow27@gmail.com>2020-02-25 16:12:46 +0100
committerFernando Sahmkow <fsahmkow27@gmail.com>2020-06-27 17:35:09 +0200
commitdc580582034fb5937aa53176fdaa4bd0fc4acce8 (patch)
tree6d351a6c3a76fee0a9bc1ab546d07c0583a9d9cd /src/core
parentCPU_Manager: remove debugging code. (diff)
downloadyuzu-dc580582034fb5937aa53176fdaa4bd0fc4acce8.tar
yuzu-dc580582034fb5937aa53176fdaa4bd0fc4acce8.tar.gz
yuzu-dc580582034fb5937aa53176fdaa4bd0fc4acce8.tar.bz2
yuzu-dc580582034fb5937aa53176fdaa4bd0fc4acce8.tar.lz
yuzu-dc580582034fb5937aa53176fdaa4bd0fc4acce8.tar.xz
yuzu-dc580582034fb5937aa53176fdaa4bd0fc4acce8.tar.zst
yuzu-dc580582034fb5937aa53176fdaa4bd0fc4acce8.zip
Diffstat (limited to '')
-rw-r--r--src/core/core_timing.cpp5
-rw-r--r--src/core/cpu_manager.cpp5
2 files changed, 7 insertions, 3 deletions
diff --git a/src/core/core_timing.cpp b/src/core/core_timing.cpp
index a3ce69790..cc32a853b 100644
--- a/src/core/core_timing.cpp
+++ b/src/core/core_timing.cpp
@@ -2,14 +2,14 @@
// Licensed under GPLv2 or any later version
// Refer to the license.txt file included.
-#include "core/core_timing.h"
-
#include <algorithm>
#include <mutex>
#include <string>
#include <tuple>
#include "common/assert.h"
+#include "common/microprofile.h"
+#include "core/core_timing.h"
#include "core/core_timing_util.h"
namespace Core::Timing {
@@ -44,6 +44,7 @@ CoreTiming::~CoreTiming() = default;
void CoreTiming::ThreadEntry(CoreTiming& instance) {
std::string name = "yuzu:HostTiming";
+ MicroProfileOnThreadCreate(name.c_str());
Common::SetCurrentThreadName(name.c_str());
instance.on_thread_init();
instance.ThreadLoop();
diff --git a/src/core/cpu_manager.cpp b/src/core/cpu_manager.cpp
index ff2fe8ead..9b9337131 100644
--- a/src/core/cpu_manager.cpp
+++ b/src/core/cpu_manager.cpp
@@ -3,6 +3,7 @@
// Refer to the license.txt file included.
#include "common/fiber.h"
+#include "common/microprofile.h"
#include "common/thread.h"
#include "core/arm/exclusive_monitor.h"
#include "core/core.h"
@@ -36,6 +37,7 @@ void CpuManager::Shutdown() {
Pause(false);
for (std::size_t core = 0; core < Core::Hardware::NUM_CPU_CORES; core++) {
core_data[core].host_thread->join();
+ core_data[core].host_thread.reset();
}
}
@@ -80,7 +82,7 @@ void CpuManager::RunGuestThread() {
auto& physical_core = kernel.CurrentPhysicalCore();
if (!physical_core.IsInterrupted()) {
physical_core.Idle();
- //physical_core.Run();
+ // physical_core.Run();
}
auto& scheduler = physical_core.Scheduler();
scheduler.TryDoContextSwitch();
@@ -159,6 +161,7 @@ void CpuManager::RunThread(std::size_t core) {
/// Initialization
system.RegisterCoreThread(core);
std::string name = "yuzu:CoreHostThread_" + std::to_string(core);
+ MicroProfileOnThreadCreate(name.c_str());
Common::SetCurrentThreadName(name.c_str());
auto& data = core_data[core];
data.enter_barrier = std::make_unique<Common::Event>();