X-Git-Url: https://git.sesse.net/?p=stockfish;a=blobdiff_plain;f=src%2Fthread.cpp;h=df746a4a825d2befdc77fa5397e0b5be952b3a65;hp=0d8070f202b0774d5077b4ec26962d54f438f7c4;hb=d165d5af914c3c925fb7ba53fbd63dfb2de92f5d;hpb=3ce43c20dee3d0c7afc4ff3b4c67e0530ab2138f diff --git a/src/thread.cpp b/src/thread.cpp index 0d8070f2..df746a4a 100644 --- a/src/thread.cpp +++ b/src/thread.cpp @@ -312,6 +312,7 @@ void Thread::split(Position& pos, Stack* ss, Value alpha, Value beta, Value* bes sp.mutex.unlock(); Threads.mutex.unlock(); + // Calling idle_loop with sp.mutex locked 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 @@ -322,6 +323,10 @@ void Thread::split(Position& pos, Stack* ss, Value alpha, Value beta, Value* bes // 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(). + // idle_loop returns with sp.mutex locked but we must unlock it inorder to + // lock Threads.mutex without conflicting with check_time() (threads holding + // multiple locks must always acquired them in the same order to avoid deadlocks) + sp.mutex.unlock(); Threads.mutex.lock(); sp.mutex.lock(); }