H3cJP/yuzu
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

thread: Rename mask to affinity_masks.

Browse Source
This commit is contained in:
bunnei 2018-05-10 19:12:46 -04:00
parent edc52250b8
commit 46ec9a9bc9
4 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/core/hle/kernel/svc.cpp
View File

@ -735,7 +735,7 @@ static ResultCode GetThreadCoreMask(Handle thread_handle, u32* core, u64* mask)
} }
*core = thread->ideal_core; *core = thread->ideal_core;
*mask = thread->mask; *mask = thread->affinity_mask;
return RESULT_SUCCESS; return RESULT_SUCCESS;
} }

4
src/core/hle/kernel/thread.cpp
View File

@ -201,7 +201,7 @@ void Thread::ResumeFromWait() {
status = THREADSTATUS_READY; status = THREADSTATUS_READY;
boost::optional<s32> new_processor_id = GetNextProcessorId(mask); boost::optional<s32> new_processor_id = GetNextProcessorId(affinity_mask);
if (!new_processor_id) { if (!new_processor_id) {
new_processor_id = 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->last_running_ticks = CoreTiming::GetTicks();
thread->processor_id = processor_id; thread->processor_id = processor_id;
thread->ideal_core = processor_id; thread->ideal_core = processor_id;
thread->mask = 1ULL << processor_id; thread->affinity_mask = 1ULL << processor_id;
thread->wait_objects.clear(); thread->wait_objects.clear();
thread->mutex_wait_address = 0; thread->mutex_wait_address = 0;
thread->condvar_wait_address = 0; thread->condvar_wait_address = 0;

2
src/core/hle/kernel/thread.h
View File

@ -248,7 +248,7 @@ public:
std::shared_ptr<Scheduler> scheduler; std::shared_ptr<Scheduler> scheduler;
u32 ideal_core{0xFFFFFFFF}; u32 ideal_core{0xFFFFFFFF};
u64 mask{0x1}; u64 affinity_mask{0x1};
private: private:
Thread(); Thread();

3
src/yuzu/debugger/wait_tree.cpp
View File

@ -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("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("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("thread id = %1").arg(thread.GetThreadId())));
list.push_back(std::make_unique<WaitTreeText>(tr("priority = %1(current) / %2(normal)") list.push_back(std::make_unique<WaitTreeText>(tr("priority = %1(current) / %2(normal)")
.arg(thread.current_priority) .arg(thread.current_priority)