Use size_t consistently across thread code

No functional change.

diff --git a/src/search.cpp b/src/search.cpp
index a04766533b953f27798b7665c4a1d99c76bc4f82..12ed75997dfaa500beccd424ef2d86529444bc1b 100644 (file)
--- a/src/search.cpp
+++ b/src/search.cpp
@@ -1594,7 +1594,7 @@ void Thread::idle_loop() {
 
           for (size_t i = 0; i < Threads.size(); ++i)
           {
-              const int size = Threads[i]->splitPointsSize; // Local copy
+              const size_t size = Threads[i]->splitPointsSize; // Local copy
               sp = size ? &Threads[i]->splitPoints[size - 1] : NULL;
 
               if (   sp
@@ -1705,7 +1705,7 @@ void check_time() {
       // Loop across all split points and sum accumulated SplitPoint nodes plus
       // all the currently active positions nodes.
       for (size_t i = 0; i < Threads.size(); ++i)
-          for (int j = 0; j < Threads[i]->splitPointsSize; ++j)
+          for (size_t j = 0; j < Threads[i]->splitPointsSize; ++j)
           {
               SplitPoint& sp = Threads[i]->splitPoints[j];
 

diff --git a/src/thread.cpp b/src/thread.cpp
index 8be7b7214bf44661265bf0899a23860415a464cd..18870021ba3665bd026364a24594ca4bf57c26d8 100644 (file)
--- a/src/thread.cpp
+++ b/src/thread.cpp
@@ -89,7 +89,8 @@ void ThreadBase::wait_for(volatile const bool& condition) {
 Thread::Thread() /* : splitPoints() */ { // Initialization of non POD broken in MSVC
 
   searching = false;
-  maxPly = splitPointsSize = 0;
+  maxPly = 0;
+  splitPointsSize = 0;
   activeSplitPoint = NULL;
   activePosition = NULL;
   idx = Threads.size(); // Starts from 0
@@ -123,7 +124,7 @@ bool Thread::available_to(const Thread* master) const {
 
   // Make a local copy to be sure it doesn't become zero under our feet while
   // testing next condition and so leading to an out of bounds access.
-  const int size = splitPointsSize;
+  const size_t size = splitPointsSize;
 
   // No split points means that the thread is available as a slave for any
   // other thread otherwise apply the "helpful master" concept if possible.

diff --git a/src/thread.h b/src/thread.h
index 42c44aa946f06b6fad5c0bb7b1b8f61076738aeb..04e9a370cb9a5604ef7afa4a586263a3d594e28c 100644 (file)
--- a/src/thread.h
+++ b/src/thread.h
@@ -31,8 +31,8 @@
 
 struct Thread;
 
-const int MAX_THREADS = 128;
-const int MAX_SPLITPOINTS_PER_THREAD = 8;
+const size_t MAX_THREADS = 128;
+const size_t MAX_SPLITPOINTS_PER_THREAD = 8;
 const size_t MAX_SLAVES_PER_SPLITPOINT = 4;
 
 /// Mutex and ConditionVariable struct are wrappers of the low level locking
@@ -136,7 +136,7 @@ struct Thread : public ThreadBase {
   size_t idx;
   int maxPly;
   SplitPoint* volatile activeSplitPoint;
-  volatile int splitPointsSize;
+  volatile size_t splitPointsSize;
   volatile bool searching;
 };