kate/BadFish
1
0
Fork 0
mirror of https://github.com/sockspls/badfish synced 2025-04-30 16:53:09 +00:00
Code Issues Releases Wiki Activity

Rework lock protecting

Browse source 
When changing 'search' and 'splitPointsSize' we have to
use thread locks, not split point ones, because can_join()
is called under the formers.

Verified succesfully with 24 hours toruture tests with 20
cores machine by Louis Zulli: it does not hangs.

Verifyed for no regressions with STC, 7 threads:
LLR: 2.94 (-2.94,2.94) [-3.00,1.00]
Total: 52804 W: 8159 L: 8087 D: 36558

No functional change.
This commit is contained in:
Marco Costalba 2015-09-27 14:49:33 +02:00
parent 77b4f4c2e7
commit 3c0fe1d9b2
2 changed files with 12 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
src/search.cpp
View file

@ -1622,11 +1622,15 @@ void Thread::idle_loop() {
else else
assert(false); assert(false);
spinlock.acquire();
assert(searching); assert(searching);
spinlock.acquire();
searching = false; searching = false;
activePosition = nullptr; activePosition = nullptr;
spinlock.release();
sp->slavesMask.reset(idx); sp->slavesMask.reset(idx);
sp->allSlavesSearching = false; sp->allSlavesSearching = false;
sp->nodes += pos.nodes_searched(); sp->nodes += pos.nodes_searched();
@ -1634,7 +1638,6 @@ void Thread::idle_loop() {
// After releasing the lock we can't access any SplitPoint related data // After releasing the lock we can't access any SplitPoint related data
// in a safe way because it could have been released under our feet by // in a safe way because it could have been released under our feet by
// the sp master. // the sp master.
spinlock.release();
sp->spinlock.release(); sp->spinlock.release();
// Try to late join to another split point if none of its slaves has // Try to late join to another split point if none of its slaves has

17
src/thread.cpp
View file

@ -145,7 +145,6 @@ void Thread::split(Position& pos, Stack* ss, Value alpha, Value beta, Value* bes
SplitPoint& sp = splitPoints[splitPointsSize]; SplitPoint& sp = splitPoints[splitPointsSize];
sp.spinlock.acquire(); // No contention here until we don't increment splitPointsSize sp.spinlock.acquire(); // No contention here until we don't increment splitPointsSize
spinlock.acquire();
sp.master = this; sp.master = this;
sp.parentSplitPoint = activeSplitPoint; sp.parentSplitPoint = activeSplitPoint;
@ -168,7 +167,6 @@ void Thread::split(Position& pos, Stack* ss, Value alpha, Value beta, Value* bes
++splitPointsSize; ++splitPointsSize;
activeSplitPoint = &sp; activeSplitPoint = &sp;
activePosition = nullptr; activePosition = nullptr;
spinlock.release();
// Try to allocate available threads // Try to allocate available threads
Thread* slave; Thread* slave;
@ -196,29 +194,28 @@ void Thread::split(Position& pos, Stack* ss, Value alpha, Value beta, Value* bes
Thread::idle_loop(); // Force a call to base class idle_loop() Thread::idle_loop(); // Force a call to base class idle_loop()
sp.spinlock.acquire();
spinlock.acquire();
// In the helpful master concept, a master can help only a sub-tree of its // In the helpful master concept, a master can help only a sub-tree of its
// split point and because everything is finished here, it's not possible // split point and because everything is finished here, it's not possible
// for the master to be booked. // for the master to be booked.
assert(!searching); assert(!searching);
assert(!activePosition); assert(!activePosition);
searching = true;
// We have returned from the idle loop, which means that all threads are // We have returned from the idle loop, which means that all threads are
// finished. Note that decreasing splitPointsSize must be done under lock // finished. Note that decreasing splitPointsSize must be done under lock
// protection to avoid a race with Thread::can_join(). // protection to avoid a race with Thread::can_join().
spinlock.acquire();
searching = true;
--splitPointsSize; --splitPointsSize;
activeSplitPoint = sp.parentSplitPoint; activeSplitPoint = sp.parentSplitPoint;
activePosition = &pos; activePosition = &pos;
spinlock.release();
// Split point data cannot be changed now, so no need to lock protect
pos.set_nodes_searched(pos.nodes_searched() + sp.nodes); pos.set_nodes_searched(pos.nodes_searched() + sp.nodes);
*bestMove = sp.bestMove; *bestMove = sp.bestMove;
*bestValue = sp.bestValue; *bestValue = sp.bestValue;
spinlock.release();
sp.spinlock.release();
} }