diff options
| author | 2020-07-16 14:16:57 -0400 | |
|---|---|---|
| committer | 2020-07-16 14:16:57 -0400 | |
| commit | d84d9a64b36013e2745f019f0b6f422f8ed1fd32 (patch) | |
| tree | 4e43bcb0312811d74b78ed23014d96e4149b3f1c /src/core/cpu_manager.h | |
| parent | Merge pull request #4261 from ameerj/gc-calibration (diff) | |
| parent | kernel: Add missing include (diff) | |
| download | yuzu-d84d9a64b36013e2745f019f0b6f422f8ed1fd32.tar.gz yuzu-d84d9a64b36013e2745f019f0b6f422f8ed1fd32.tar.xz yuzu-d84d9a64b36013e2745f019f0b6f422f8ed1fd32.zip | |
Merge pull request #4356 from lioncash/inc
cpu_manager: Minor tidying up/header inclusions
Diffstat (limited to 'src/core/cpu_manager.h')
| -rw-r--r-- | src/core/cpu_manager.h | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/src/core/cpu_manager.h b/src/core/cpu_manager.h index 35929ed94..17420c941 100644 --- a/src/core/cpu_manager.h +++ b/src/core/cpu_manager.h | |||
| @@ -9,6 +9,9 @@ | |||
| 9 | #include <functional> | 9 | #include <functional> |
| 10 | #include <memory> | 10 | #include <memory> |
| 11 | #include <thread> | 11 | #include <thread> |
| 12 | |||
| 13 | #include "common/fiber.h" | ||
| 14 | #include "common/thread.h" | ||
| 12 | #include "core/hardware_properties.h" | 15 | #include "core/hardware_properties.h" |
| 13 | 16 | ||
| 14 | namespace Common { | 17 | namespace Common { |
| @@ -46,9 +49,9 @@ public: | |||
| 46 | 49 | ||
| 47 | void Pause(bool paused); | 50 | void Pause(bool paused); |
| 48 | 51 | ||
| 49 | std::function<void(void*)> GetGuestThreadStartFunc(); | 52 | static std::function<void(void*)> GetGuestThreadStartFunc(); |
| 50 | std::function<void(void*)> GetIdleThreadStartFunc(); | 53 | static std::function<void(void*)> GetIdleThreadStartFunc(); |
| 51 | std::function<void(void*)> GetSuspendThreadStartFunc(); | 54 | static std::function<void(void*)> GetSuspendThreadStartFunc(); |
| 52 | void* GetStartFuncParamater(); | 55 | void* GetStartFuncParamater(); |
| 53 | 56 | ||
| 54 | void PreemptSingleCore(bool from_running_enviroment = true); | 57 | void PreemptSingleCore(bool from_running_enviroment = true); |
| @@ -97,7 +100,6 @@ private: | |||
| 97 | bool is_async_gpu{}; | 100 | bool is_async_gpu{}; |
| 98 | bool is_multicore{}; | 101 | bool is_multicore{}; |
| 99 | std::atomic<std::size_t> current_core{}; | 102 | std::atomic<std::size_t> current_core{}; |
| 100 | std::size_t preemption_count{}; | ||
| 101 | std::size_t idle_count{}; | 103 | std::size_t idle_count{}; |
| 102 | static constexpr std::size_t max_cycle_runs = 5; | 104 | static constexpr std::size_t max_cycle_runs = 5; |
| 103 | 105 | ||