X-Git-Url: https://git.sesse.net/?p=stockfish;a=blobdiff_plain;f=src%2Fthread.cpp;h=f5b8b5e275aff3313b74ae061fd8b4455d98dab8;hp=a6886b1ce8c9508025aa4becf4bba159ee390bda;hb=db322e6a63459bc3dfdf7fd537d42234b854fb76;hpb=30c2e3828a5ea143e6190680dcd8e9d93fd17840 diff --git a/src/thread.cpp b/src/thread.cpp index a6886b1c..f5b8b5e2 100644 --- a/src/thread.cpp +++ b/src/thread.cpp @@ -1,7 +1,7 @@ /* Stockfish, a UCI chess playing engine derived from Glaurung 2.1 Copyright (C) 2004-2008 Tord Romstad (Glaurung author) - Copyright (C) 2008-2012 Marco Costalba, Joona Kiiski, Tord Romstad + Copyright (C) 2008-2013 Marco Costalba, Joona Kiiski, Tord Romstad Stockfish is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -303,28 +303,28 @@ void Thread::split(Position& pos, Stack* ss, Value alpha, Value beta, Value* bes slave->notify_one(); // Could be sleeping } - sp.mutex.unlock(); - Threads.mutex.unlock(); - // Everything is set up. The master thread enters the idle loop, from which // it will instantly launch a search, because its 'searching' flag is set. // The thread will return from the idle loop when all slaves have finished // their work at this split point. if (slavesCnt > 1 || Fake) { + sp.mutex.unlock(); + Threads.mutex.unlock(); + Thread::idle_loop(); // Force a call to base class idle_loop() // In helpful master concept a master can help only a sub-tree of its split // point, and because here is all finished is not possible master is booked. assert(!searching); assert(!activePosition); - } - // We have returned from the idle loop, which means that all threads are - // finished. Note that setting 'searching' and decreasing splitPointsSize is - // done under lock protection to avoid a race with Thread::is_available_to(). - Threads.mutex.lock(); - sp.mutex.lock(); + // We have returned from the idle loop, which means that all threads are + // finished. Note that setting 'searching' and decreasing splitPointsSize is + // done under lock protection to avoid a race with Thread::is_available_to(). + Threads.mutex.lock(); + sp.mutex.lock(); + } searching = true; splitPointsSize--;