diff options
| author | 2019-03-17 22:27:33 -0400 | |
|---|---|---|
| committer | 2019-03-17 22:27:33 -0400 | |
| commit | 30f228a8c93293551839cce3e539e9b7dae7fab2 (patch) | |
| tree | 7cd8d0a67f15d4f80037343f8eb3e4c80237af51 /src/core/hle/kernel/thread.h | |
| parent | Merge pull request #2257 from MerryMage/boost-1.66 (diff) | |
| parent | kernel/thread: Expand documentation of nominal_priority and current_priority (diff) | |
| download | yuzu-30f228a8c93293551839cce3e539e9b7dae7fab2.tar.gz yuzu-30f228a8c93293551839cce3e539e9b7dae7fab2.tar.xz yuzu-30f228a8c93293551839cce3e539e9b7dae7fab2.zip | |
Merge pull request #2238 from lioncash/thread
kernel/thread: Amend conditional test and assignment within UpdatePriority()
Diffstat (limited to 'src/core/hle/kernel/thread.h')
| -rw-r--r-- | src/core/hle/kernel/thread.h | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/src/core/hle/kernel/thread.h b/src/core/hle/kernel/thread.h index ccdefeecc..faad5f391 100644 --- a/src/core/hle/kernel/thread.h +++ b/src/core/hle/kernel/thread.h | |||
| @@ -401,8 +401,14 @@ private: | |||
| 401 | VAddr entry_point = 0; | 401 | VAddr entry_point = 0; |
| 402 | VAddr stack_top = 0; | 402 | VAddr stack_top = 0; |
| 403 | 403 | ||
| 404 | u32 nominal_priority = 0; ///< Nominal thread priority, as set by the emulated application | 404 | /// Nominal thread priority, as set by the emulated application. |
| 405 | u32 current_priority = 0; ///< Current thread priority, can be temporarily changed | 405 | /// The nominal priority is the thread priority without priority |
| 406 | /// inheritance taken into account. | ||
| 407 | u32 nominal_priority = 0; | ||
| 408 | |||
| 409 | /// Current thread priority. This may change over the course of the | ||
| 410 | /// thread's lifetime in order to facilitate priority inheritance. | ||
| 411 | u32 current_priority = 0; | ||
| 406 | 412 | ||
| 407 | u64 total_cpu_time_ticks = 0; ///< Total CPU running ticks. | 413 | u64 total_cpu_time_ticks = 0; ///< Total CPU running ticks. |
| 408 | u64 last_running_ticks = 0; ///< CPU tick when thread was last running | 414 | u64 last_running_ticks = 0; ///< CPU tick when thread was last running |