diff options
| author | Fernando Sahmkow <fsahmkow27@gmail.com> | 2019-09-09 21:37:29 -0400 |
|---|---|---|
| committer | FernandoS27 <fsahmkow27@gmail.com> | 2019-10-09 12:30:31 -0400 |
| commit | 555866f8dcb98897688d5d7b0e6c6cca55ac069f (patch) | |
| tree | 287ffee685bd8fbd6a8a16aa02a198a6cab3ede3 /src/core/core_timing.h | |
| parent | e664c24355bb4a53b114719a9aba960c82658403 (diff) | |
Core Timing: Rework Core Timing to run all cores evenly.
Diffstat (limited to 'src/core/core_timing.h')
| -rw-r--r-- | src/core/core_timing.h | 24 |
1 files changed, 21 insertions, 3 deletions
diff --git a/src/core/core_timing.h b/src/core/core_timing.h index 161c7007da..ec0a6d2c09 100644 --- a/src/core/core_timing.h +++ b/src/core/core_timing.h @@ -7,6 +7,7 @@ #include <chrono> #include <functional> #include <mutex> +#include <optional> #include <string> #include <unordered_map> #include <vector> @@ -104,7 +105,19 @@ public: std::chrono::microseconds GetGlobalTimeUs() const; - int GetDowncount() const; + void ResetRun(); + + s64 GetDowncount() const; + + void SwitchContext(u64 new_context) { + current_context = new_context; + } + + bool CurrentContextCanRun() const { + return time_slice[current_context] > 0; + } + + std::optional<u64> NextAvailableCore(const s64 needed_ticks) const; private: struct Event; @@ -112,10 +125,15 @@ private: /// Clear all pending events. This should ONLY be done on exit. void ClearPendingEvents(); + static constexpr u64 num_cpu_cores = 4; + s64 global_timer = 0; s64 idled_cycles = 0; - int slice_length = 0; - int downcount = 0; + s64 slice_length = 0; + std::array<s64, num_cpu_cores> downcounts{}; + // Slice of time assigned to each core per run. + std::array<s64, num_cpu_cores> time_slice{}; + u64 current_context = 0; // Are we in a function that has been called from Advance() // If events are scheduled from a function that gets called from Advance(), |