Explicitly use threads.size()

Instead of just size(). Although code is longer,
should be more immediate to understand when reading.

No functional change.

Signed-off-by: Marco Costalba <mcostalba@gmail.com>

diff --git a/src/thread.cpp b/src/thread.cpp
index 42ffe63a48a2a9dbe4a4b89b7850c3a184ebde5c..ce2f41f2ffeae29008890a7917fdc3302807d827 100644 (file)
--- a/src/thread.cpp
+++ b/src/thread.cpp
@@ -114,6 +114,8 @@ void Thread::main_loop() {
       is_searching = true;
 
       Search::think();
       is_searching = true;
 
       Search::think();

+
+      assert(is_searching);

   }
 }
 
   }
 }
 


@@ -198,7 +200,7 @@ void ThreadPool::init() {
 
 ThreadPool::~ThreadPool() {
 
 
 ThreadPool::~ThreadPool() {
 

-  for (size_t i = 0; i < size(); i++)
+  for (size_t i = 0; i < threads.size(); i++)

       delete threads[i];
 
   delete timer;
       delete threads[i];
 
   delete timer;


@@ -219,10 +221,10 @@ void ThreadPool::read_uci_options() {
 
   assert(requested > 0);
 
 
   assert(requested > 0);
 

-  while (size() < requested)
+  while (threads.size() < requested)

       threads.push_back(new Thread(&Thread::idle_loop));
 
       threads.push_back(new Thread(&Thread::idle_loop));
 

-  while (size() > requested)
+  while (threads.size() > requested)

   {
       delete threads.back();
       threads.pop_back();
   {
       delete threads.back();
       threads.pop_back();


@@ -236,7 +238,7 @@ void ThreadPool::read_uci_options() {
 
 void ThreadPool::wake_up() const {
 
 
 void ThreadPool::wake_up() const {
 

-  for (size_t i = 0; i < size(); i++)
+  for (size_t i = 0; i < threads.size(); i++)

   {
       threads[i]->maxPly = 0;
       threads[i]->do_sleep = false;
   {
       threads[i]->maxPly = 0;
       threads[i]->do_sleep = false;


@@ -252,8 +254,9 @@ void ThreadPool::wake_up() const {
 
 void ThreadPool::sleep() const {
 
 
 void ThreadPool::sleep() const {
 

-  for (size_t i = 1; i < size(); i++) // Main thread will go to sleep by itself
-      threads[i]->do_sleep = true; // to avoid a race with start_searching()
+  // Main thread will go to sleep by itself to avoid a race with start_searching()
+  for (size_t i = 1; i < threads.size(); i++)
+      threads[i]->do_sleep = true;

 }
 
 
 }
 
 


@@ -262,7 +265,7 @@ void ThreadPool::sleep() const {
 
 bool ThreadPool::available_slave_exists(Thread* master) const {
 
 
 bool ThreadPool::available_slave_exists(Thread* master) const {
 

-  for (size_t i = 0; i < size(); i++)
+  for (size_t i = 0; i < threads.size(); i++)

       if (threads[i]->is_available_to(master))
           return true;
 
       if (threads[i]->is_available_to(master))
           return true;
 


@@ -327,7 +330,7 @@ Value ThreadPool::split(Position& pos, Stack* ss, Value alpha, Value beta,
   sp.mutex.lock();
   mutex.lock();
 
   sp.mutex.lock();
   mutex.lock();
 

-  for (size_t i = 0; i < size() && !Fake; ++i)
+  for (size_t i = 0; i < threads.size() && !Fake; ++i)

       if (threads[i]->is_available_to(master))
       {
           sp.slavesMask |= 1ULL << i;
       if (threads[i]->is_available_to(master))
       {
           sp.slavesMask |= 1ULL << i;