diff options
| author | bunnei <bunneidev@gmail.com> | 2018-05-11 01:12:46 +0200 |
|---|---|---|
| committer | bunnei <bunneidev@gmail.com> | 2018-05-11 01:34:53 +0200 |
| commit | 46ec9a9bc924aa1151db349541976521b72c41da (patch) | |
| tree | fb8d12a6e8bc9666a258188760908c00133acd2c | |
| parent | core: Run all CPU cores separately, even in single-thread mode. (diff) | |
| download | yuzu-46ec9a9bc924aa1151db349541976521b72c41da.tar yuzu-46ec9a9bc924aa1151db349541976521b72c41da.tar.gz yuzu-46ec9a9bc924aa1151db349541976521b72c41da.tar.bz2 yuzu-46ec9a9bc924aa1151db349541976521b72c41da.tar.lz yuzu-46ec9a9bc924aa1151db349541976521b72c41da.tar.xz yuzu-46ec9a9bc924aa1151db349541976521b72c41da.tar.zst yuzu-46ec9a9bc924aa1151db349541976521b72c41da.zip | |
| -rw-r--r-- | src/core/hle/kernel/svc.cpp | 2 | ||||
| -rw-r--r-- | src/core/hle/kernel/thread.cpp | 4 | ||||
| -rw-r--r-- | src/core/hle/kernel/thread.h | 2 | ||||
| -rw-r--r-- | src/yuzu/debugger/wait_tree.cpp | 3 |
4 files changed, 6 insertions, 5 deletions
diff --git a/src/core/hle/kernel/svc.cpp b/src/core/hle/kernel/svc.cpp index 89c3e240a..1ae530c90 100644 --- a/src/core/hle/kernel/svc.cpp +++ b/src/core/hle/kernel/svc.cpp @@ -735,7 +735,7 @@ static ResultCode GetThreadCoreMask(Handle thread_handle, u32* core, u64* mask) } *core = thread->ideal_core; - *mask = thread->mask; + *mask = thread->affinity_mask; return RESULT_SUCCESS; } diff --git a/src/core/hle/kernel/thread.cpp b/src/core/hle/kernel/thread.cpp index 04d18dc2f..46fcdefb8 100644 --- a/src/core/hle/kernel/thread.cpp +++ b/src/core/hle/kernel/thread.cpp @@ -201,7 +201,7 @@ void Thread::ResumeFromWait() { status = THREADSTATUS_READY; - boost::optional<s32> new_processor_id = GetNextProcessorId(mask); + boost::optional<s32> new_processor_id = GetNextProcessorId(affinity_mask); if (!new_processor_id) { new_processor_id = processor_id; } @@ -308,7 +308,7 @@ ResultVal<SharedPtr<Thread>> Thread::Create(std::string name, VAddr entry_point, thread->last_running_ticks = CoreTiming::GetTicks(); thread->processor_id = processor_id; thread->ideal_core = processor_id; - thread->mask = 1ULL << processor_id; + thread->affinity_mask = 1ULL << processor_id; thread->wait_objects.clear(); thread->mutex_wait_address = 0; thread->condvar_wait_address = 0; diff --git a/src/core/hle/kernel/thread.h b/src/core/hle/kernel/thread.h index 3dda548ad..1d2da6d50 100644 --- a/src/core/hle/kernel/thread.h +++ b/src/core/hle/kernel/thread.h @@ -248,7 +248,7 @@ public: std::shared_ptr<Scheduler> scheduler; u32 ideal_core{0xFFFFFFFF}; - u64 mask{0x1}; + u64 affinity_mask{0x1}; private: Thread(); diff --git a/src/yuzu/debugger/wait_tree.cpp b/src/yuzu/debugger/wait_tree.cpp index 01f9d9008..8b074db5a 100644 --- a/src/yuzu/debugger/wait_tree.cpp +++ b/src/yuzu/debugger/wait_tree.cpp @@ -249,7 +249,8 @@ std::vector<std::unique_ptr<WaitTreeItem>> WaitTreeThread::GetChildren() const { list.push_back(std::make_unique<WaitTreeText>(tr("processor = %1").arg(processor))); list.push_back(std::make_unique<WaitTreeText>(tr("ideal core = %1").arg(thread.ideal_core))); - list.push_back(std::make_unique<WaitTreeText>(tr("affinity mask = %1").arg(thread.mask))); + list.push_back( + std::make_unique<WaitTreeText>(tr("affinity mask = %1").arg(thread.affinity_mask))); list.push_back(std::make_unique<WaitTreeText>(tr("thread id = %1").arg(thread.GetThreadId()))); list.push_back(std::make_unique<WaitTreeText>(tr("priority = %1(current) / %2(normal)") .arg(thread.current_priority) |