mirror of
https://github.com/sockspls/badfish
synced 2025-04-30 00:33:09 +00:00
Rename wake_up() to notify_one()
To align to C++ std::thread conventions. No functional change.
This commit is contained in:
parent
a523cea772
commit
81cd7d787e
4 changed files with 20 additions and 22 deletions
|
@ -1696,7 +1696,7 @@ void Thread::idle_loop() {
|
|||
&& !sp->slavesMask)
|
||||
{
|
||||
assert(!sp->master->is_searching);
|
||||
sp->master->wake_up();
|
||||
sp->master->notify_one();
|
||||
}
|
||||
|
||||
// After releasing the lock we cannot access anymore any SplitPoint
|
||||
|
|
|
@ -67,7 +67,7 @@ Thread::~Thread() {
|
|||
assert(do_sleep);
|
||||
|
||||
do_exit = true; // Search must be already finished
|
||||
wake_up();
|
||||
notify_one();
|
||||
thread_join(handle); // Wait for thread termination
|
||||
}
|
||||
|
||||
|
@ -120,10 +120,10 @@ void Thread::main_loop() {
|
|||
}
|
||||
|
||||
|
||||
// Thread::wake_up() wakes up the thread, normally at the beginning of the search
|
||||
// or, if "sleeping threads" is used at split time.
|
||||
// Thread::notify_one() wakes up the thread, normally at the beginning of the
|
||||
// search or, if "sleeping threads" is used at split time.
|
||||
|
||||
void Thread::wake_up() {
|
||||
void Thread::notify_one() {
|
||||
|
||||
mutex.lock();
|
||||
sleepCondition.notify_one();
|
||||
|
@ -242,7 +242,7 @@ void ThreadPool::wake_up() const {
|
|||
threads[i]->do_sleep = false;
|
||||
|
||||
if (!useSleepingThreads)
|
||||
threads[i]->wake_up();
|
||||
threads[i]->notify_one();
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -271,6 +271,16 @@ bool ThreadPool::available_slave_exists(Thread* master) const {
|
|||
}
|
||||
|
||||
|
||||
// set_timer() is used to set the timer to trigger after msec milliseconds.
|
||||
// If msec is 0 then timer is stopped.
|
||||
|
||||
void ThreadPool::set_timer(int msec) {
|
||||
|
||||
timer->maxPly = msec;
|
||||
timer->notify_one(); // Wake up and restart the timer
|
||||
}
|
||||
|
||||
|
||||
// split() does the actual work of distributing the work at a node between
|
||||
// several available threads. If it does not succeed in splitting the node
|
||||
// (because no idle threads are available, or because we have no unused split
|
||||
|
@ -336,7 +346,7 @@ Value ThreadPool::split(Position& pos, Stack* ss, Value alpha, Value beta,
|
|||
threads[i]->is_searching = true; // Slave leaves idle_loop()
|
||||
|
||||
if (useSleepingThreads)
|
||||
threads[i]->wake_up();
|
||||
threads[i]->notify_one();
|
||||
|
||||
if (++slavesCnt + 1 >= maxThreadsPerSplitPoint) // Master is always included
|
||||
break;
|
||||
|
@ -383,18 +393,6 @@ template Value ThreadPool::split<false>(Position&, Stack*, Value, Value, Value,
|
|||
template Value ThreadPool::split<true>(Position&, Stack*, Value, Value, Value, Move*, Depth, Move, int, MovePicker&, int);
|
||||
|
||||
|
||||
// set_timer() is used to set the timer to trigger after msec milliseconds.
|
||||
// If msec is 0 then timer is stopped.
|
||||
|
||||
void ThreadPool::set_timer(int msec) {
|
||||
|
||||
timer->mutex.lock();
|
||||
timer->maxPly = msec;
|
||||
timer->sleepCondition.notify_one(); // Wake up and restart the timer
|
||||
timer->mutex.unlock();
|
||||
}
|
||||
|
||||
|
||||
// wait_for_search_finished() waits for main thread to go to sleep, this means
|
||||
// search is finished. Then returns.
|
||||
|
||||
|
@ -429,5 +427,5 @@ void ThreadPool::start_searching(const Position& pos, const LimitsType& limits,
|
|||
RootMoves.push_back(RootMove(ml.move()));
|
||||
|
||||
main_thread()->do_sleep = false;
|
||||
main_thread()->wake_up();
|
||||
main_thread()->notify_one();
|
||||
}
|
||||
|
|
|
@ -99,7 +99,7 @@ public:
|
|||
Thread(Fn fn);
|
||||
~Thread();
|
||||
|
||||
void wake_up();
|
||||
void notify_one();
|
||||
bool cutoff_occurred() const;
|
||||
bool is_available_to(Thread* master) const;
|
||||
void idle_loop();
|
||||
|
|
|
@ -76,7 +76,7 @@ void UCI::loop(const string& args) {
|
|||
if (token != "ponderhit" || Search::Signals.stopOnPonderhit)
|
||||
{
|
||||
Search::Signals.stop = true;
|
||||
Threads.main_thread()->wake_up(); // Could be sleeping
|
||||
Threads.main_thread()->notify_one(); // Could be sleeping
|
||||
}
|
||||
else
|
||||
Search::Limits.ponder = false;
|
||||
|
|
Loading…
Add table
Reference in a new issue