diff options
| author | 2018-10-05 14:51:16 -0400 | |
|---|---|---|
| committer | 2018-10-05 14:53:01 -0400 | |
| commit | 1a5d6de0d46371b74828a2582506f1b3b2362589 (patch) | |
| tree | 4bbb722ae36f032c031018bf8650bcc3f2cd8faf /src/core/hle/kernel/thread.h | |
| parent | Merge pull request #1439 from lioncash/thread (diff) | |
| download | yuzu-1a5d6de0d46371b74828a2582506f1b3b2362589.tar.gz yuzu-1a5d6de0d46371b74828a2582506f1b3b2362589.tar.xz yuzu-1a5d6de0d46371b74828a2582506f1b3b2362589.zip | |
thread: Make the scheduler pointer a regular pointer
Conceptually, it doesn't make sense for a thread to be able to persist
the lifetime of a scheduler. A scheduler should be taking care of the
threads; the threads should not be taking care of the scheduler.
If the threads outlive the scheduler (or we simply don't actually
terminate/shutdown the threads), then it should be considered a bug
that we need to fix.
Attributing this to balika011, as they opened #1317 to attempt to fix
this in a similar way, but my refactoring of the kernel code caused
quite a few conflicts.
Diffstat (limited to 'src/core/hle/kernel/thread.h')
| -rw-r--r-- | src/core/hle/kernel/thread.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/core/hle/kernel/thread.h b/src/core/hle/kernel/thread.h index d2b191357..c6ffbd28c 100644 --- a/src/core/hle/kernel/thread.h +++ b/src/core/hle/kernel/thread.h | |||
| @@ -419,7 +419,7 @@ private: | |||
| 419 | /// available. In case of a timeout, the object will be nullptr. | 419 | /// available. In case of a timeout, the object will be nullptr. |
| 420 | WakeupCallback wakeup_callback; | 420 | WakeupCallback wakeup_callback; |
| 421 | 421 | ||
| 422 | std::shared_ptr<Scheduler> scheduler; | 422 | Scheduler* scheduler = nullptr; |
| 423 | 423 | ||
| 424 | u32 ideal_core{0xFFFFFFFF}; | 424 | u32 ideal_core{0xFFFFFFFF}; |
| 425 | u64 affinity_mask{0x1}; | 425 | u64 affinity_mask{0x1}; |