AffineThreadPool.CpuCores is now called AffineThreadPool.Processors because this is the term used throughout the .NET framework for the same concept

git-svn-id: file:///srv/devel/repo-conversion/nusu@178 d2e56fa2-650e-0410-a79f-9358c0239efd
This commit is contained in:
Markus Ewald 2009-09-18 20:38:55 +00:00
parent 874fe0a9e4
commit 273eb9885c
2 changed files with 9 additions and 9 deletions

View File

@ -255,7 +255,7 @@ namespace Nuclex.Support {
/// </summary> /// </summary>
[Test] [Test]
public void TestWaitingWorkItemsProperty() { public void TestWaitingWorkItemsProperty() {
int eventCount = AffineThreadPool.CpuCores; int eventCount = AffineThreadPool.Processors;
WaitTask[] tasks = new WaitTask[eventCount]; WaitTask[] tasks = new WaitTask[eventCount];
int createdTasks = 0; int createdTasks = 0;

View File

@ -44,9 +44,9 @@ namespace Nuclex.Support {
/// <summary>Number of CPU cores available on the system</summary> /// <summary>Number of CPU cores available on the system</summary>
#if XBOX360 #if XBOX360
public static readonly int CpuCores = 4; public static readonly int Processors = 4;
#else #else
public static readonly int CpuCores = Environment.ProcessorCount; public static readonly int Processors = Environment.ProcessorCount;
#endif #endif
/// <summary>Delegate used by the thread pool to report unhandled exceptions</summary> /// <summary>Delegate used by the thread pool to report unhandled exceptions</summary>
@ -83,8 +83,8 @@ namespace Nuclex.Support {
// We keep track of the threads we've created just for good measure; not actually // We keep track of the threads we've created just for good measure; not actually
// needed for any core functionality. // needed for any core functionality.
workAvailable = new Semaphore(); workAvailable = new Semaphore();
userWorkItems = new Queue<UserWorkItem>(CpuCores * 4); userWorkItems = new Queue<UserWorkItem>(Processors * 4);
workerThreads = new List<Thread>(CpuCores); workerThreads = new List<Thread>(Processors);
inUseThreads = 0; inUseThreads = 0;
#if XBOX360 #if XBOX360
@ -92,14 +92,14 @@ namespace Nuclex.Support {
hardwareThreads = new Queue<int>(new int[] { 5, 4, 3, 1 }); hardwareThreads = new Queue<int>(new int[] { 5, 4, 3, 1 });
#else #else
// We can use all cores in the PC, starting from index 1 // We can use all cores in the PC, starting from index 1
hardwareThreads = new Queue<int>(CpuCores); hardwareThreads = new Queue<int>(Processors);
for(int core = CpuCores; core >= 1; --core) { for(int core = Processors; core >= 1; --core) {
hardwareThreads.Enqueue(core); hardwareThreads.Enqueue(core);
} }
#endif #endif
// Create all of the worker threads // Create all of the worker threads
for(int index = 0; index < CpuCores; index++) { for(int index = 0; index < Processors; index++) {
// Create a new thread and add it to the list of threads. // Create a new thread and add it to the list of threads.
Thread newThread = new Thread(new ThreadStart(ProcessQueuedItems)); Thread newThread = new Thread(new ThreadStart(ProcessQueuedItems));
@ -149,7 +149,7 @@ namespace Nuclex.Support {
} }
/// <summary>Gets the number of threads at the disposal of the thread pool</summary> /// <summary>Gets the number of threads at the disposal of the thread pool</summary>
public static int MaxThreads { get { return CpuCores; } } public static int MaxThreads { get { return Processors; } }
/// <summary>Gets the number of currently active threads in the thread pool</summary> /// <summary>Gets the number of currently active threads in the thread pool</summary>
public static int ActiveThreads { get { return inUseThreads; } } public static int ActiveThreads { get { return inUseThreads; } }