summaryrefslogtreecommitdiff
path: root/src/core/hle/kernel
diff options
context:
space:
mode:
authorGravatar bunnei2018-05-10 19:12:46 -0400
committerGravatar bunnei2018-05-10 19:34:53 -0400
commit46ec9a9bc924aa1151db349541976521b72c41da (patch)
treefb8d12a6e8bc9666a258188760908c00133acd2c /src/core/hle/kernel
parentcore: Run all CPU cores separately, even in single-thread mode. (diff)
downloadyuzu-46ec9a9bc924aa1151db349541976521b72c41da.tar.gz
yuzu-46ec9a9bc924aa1151db349541976521b72c41da.tar.xz
yuzu-46ec9a9bc924aa1151db349541976521b72c41da.zip
thread: Rename mask to affinity_masks.
Diffstat (limited to 'src/core/hle/kernel')
-rw-r--r--src/core/hle/kernel/svc.cpp2
-rw-r--r--src/core/hle/kernel/thread.cpp4
-rw-r--r--src/core/hle/kernel/thread.h2
3 files changed, 4 insertions, 4 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)
735 } 735 }
736 736
737 *core = thread->ideal_core; 737 *core = thread->ideal_core;
738 *mask = thread->mask; 738 *mask = thread->affinity_mask;
739 739
740 return RESULT_SUCCESS; 740 return RESULT_SUCCESS;
741} 741}
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() {
201 201
202 status = THREADSTATUS_READY; 202 status = THREADSTATUS_READY;
203 203
204 boost::optional<s32> new_processor_id = GetNextProcessorId(mask); 204 boost::optional<s32> new_processor_id = GetNextProcessorId(affinity_mask);
205 if (!new_processor_id) { 205 if (!new_processor_id) {
206 new_processor_id = processor_id; 206 new_processor_id = processor_id;
207 } 207 }
@@ -308,7 +308,7 @@ ResultVal<SharedPtr<Thread>> Thread::Create(std::string name, VAddr entry_point,
308 thread->last_running_ticks = CoreTiming::GetTicks(); 308 thread->last_running_ticks = CoreTiming::GetTicks();
309 thread->processor_id = processor_id; 309 thread->processor_id = processor_id;
310 thread->ideal_core = processor_id; 310 thread->ideal_core = processor_id;
311 thread->mask = 1ULL << processor_id; 311 thread->affinity_mask = 1ULL << processor_id;
312 thread->wait_objects.clear(); 312 thread->wait_objects.clear();
313 thread->mutex_wait_address = 0; 313 thread->mutex_wait_address = 0;
314 thread->condvar_wait_address = 0; 314 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:
248 std::shared_ptr<Scheduler> scheduler; 248 std::shared_ptr<Scheduler> scheduler;
249 249
250 u32 ideal_core{0xFFFFFFFF}; 250 u32 ideal_core{0xFFFFFFFF};
251 u64 mask{0x1}; 251 u64 affinity_mask{0x1};
252 252
253private: 253private:
254 Thread(); 254 Thread();