Back up to number of jobs being the same as logical cores, affinity l…

…ocked to physical cores still
vk2gpu · Feb 20, 2018 · 403652b · 403652b
1 parent e3c5632
commit 403652b
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/apps/app_common/test_shared.h b/apps/app_common/test_shared.h
@@ -39,7 +39,7 @@ namespace
 
 	i32 GetNumJobWorkers(const Core::CommandLine& cmdLine)
 	{
-		i32 numWorkers = Core::GetNumPhysicalCores();
+		i32 numWorkers = Core::GetNumLogicalCores();
 		Core::String val;
 		if(cmdLine.GetArg(0, "jobworkers", val))
 			numWorkers = atoi(val.c_str());

diff --git a/src/job/private/manager.cpp b/src/job/private/manager.cpp
@@ -170,7 +170,10 @@ namespace Job
 			// Create thread.
 			auto debugName = Core::String().Printf("Job Worker Thread %i", idx);
 			thread_ = Core::Thread(ThreadEntryPoint, this, Core::Thread::DEFAULT_STACK_SIZE, debugName.c_str());
-			if(u64 mask = Core::GetPhysicalCoreAffinityMask(idx))
+
+			// Set thread affinity to physical cores.
+			const i32 numPhysCores = Core::GetNumPhysicalCores();
+			if(u64 mask = Core::GetPhysicalCoreAffinityMask(idx) % numPhysCores)
 				thread_.SetAffinity(mask);
 		}