From 12feb5866fdaff20df42a77e19b75b24602f13bc Mon Sep 17 00:00:00 2001 From: Joona Kiiski Date: Tue, 23 Feb 2010 12:00:56 +0200 Subject: [PATCH] Remove unnecessary conditions from if-clauses and replace them with asserts Signed-off-by: Marco Costalba --- src/search.cpp | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/src/search.cpp b/src/search.cpp index ab9bcca3..775ad3ef 100644 --- a/src/search.cpp +++ b/src/search.cpp @@ -2583,17 +2583,18 @@ namespace { { // Slave threads can exit as soon as AllThreadsShouldExit raises, // master should exit as last one. - if (AllThreadsShouldExit && !waitSp) + if (AllThreadsShouldExit) { + assert(!waitSp); threads[threadID].state = THREAD_TERMINATED; return; } // If we are not thinking, wait for a condition to be signaled // instead of wasting CPU time polling for work. - while ( threadID != 0 - && (AllThreadsShouldSleep || threadID >= ActiveThreads)) + while (AllThreadsShouldSleep || threadID >= ActiveThreads) { + assert(threadID != 0); threads[threadID].state = THREAD_SLEEPING; #if !defined(_MSC_VER) @@ -2613,7 +2614,7 @@ namespace { // If this thread has been assigned work, launch a search if (threads[threadID].state == THREAD_WORKISWAITING) { - assert(!AllThreadsShouldExit); + assert(!AllThreadsShouldExit && !AllThreadsShouldSleep); threads[threadID].state = THREAD_SEARCHING; -- 2.39.2