X-Git-Url: https://git.sesse.net/?p=stockfish;a=blobdiff_plain;f=src%2Fthread.h;h=f5135804710b4003c06cbffaef24c73119d294af;hp=76a2d8436f91b9fa957856835c39a4f211b151df;hb=4d46d29efe4ee496bda2aa7ea83184d502944852;hpb=91427c824280d71eaf27f39a4bfdd2188cbdb4ec
diff --git a/src/thread.h b/src/thread.h
index 76a2d843..f5135804 100644
--- a/src/thread.h
+++ b/src/thread.h
@@ -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
@@ -17,7 +17,7 @@
along with this program. If not, see .
*/
-#if !defined(THREAD_H_INCLUDED)
+#ifndef THREAD_H_INCLUDED
#define THREAD_H_INCLUDED
#include
@@ -68,6 +68,7 @@ struct SplitPoint {
Value beta;
int nodeType;
Move threatMove;
+ bool cutNode;
// Const pointers to shared data
MovePicker* movePicker;
@@ -75,7 +76,6 @@ struct SplitPoint {
// Shared data
Mutex mutex;
- Position* slavesPositions[MAX_THREADS];
volatile uint64_t slavesMask;
volatile int64_t nodes;
volatile Value alpha;
@@ -94,7 +94,7 @@ struct SplitPoint {
struct Thread {
Thread();
- virtual ~Thread();
+ virtual ~Thread() {}
virtual void idle_loop();
void notify_one();
@@ -103,13 +103,14 @@ struct Thread {
void wait_for(volatile const bool& b);
template
- Value split(Position& pos, Search::Stack* ss, Value alpha, Value beta, Value bestValue, Move* bestMove,
- Depth depth, Move threatMove, int moveCount, MovePicker& mp, int nodeType);
+ void split(Position& pos, Search::Stack* ss, Value alpha, Value beta, Value* bestValue, Move* bestMove,
+ Depth depth, Move threatMove, int moveCount, MovePicker* movePicker, int nodeType, bool cutNode);
SplitPoint splitPoints[MAX_SPLITPOINTS_PER_THREAD];
Material::Table materialTable;
Endgames endgames;
Pawns::Table pawnsTable;
+ Position* activePosition;
size_t idx;
int maxPly;
Mutex mutex;
@@ -138,23 +139,18 @@ struct TimerThread : public Thread {
};
-/// ThreadPool class handles all the threads related stuff like init, starting,
+/// ThreadPool struct handles all the threads related stuff like init, starting,
/// parking and, the most important, launching a slave thread at a split point.
/// All the access to shared thread data is done through this class.
-class ThreadPool {
+struct ThreadPool : public std::vector {
-public:
void init(); // No c'tor and d'tor, threads rely on globals that should
void exit(); // be initialized and valid during the whole thread lifetime.
- Thread& operator[](size_t id) { return *threads[id]; }
- size_t size() const { return threads.size(); }
- MainThread* main_thread() { return static_cast(threads[0]); }
- TimerThread* timer_thread() { return timer; }
-
+ MainThread* main_thread() { return static_cast((*this)[0]); }
void read_uci_options();
- bool slave_available(Thread* master) const;
+ Thread* available_slave(Thread* master) const;
void wait_for_think_finished();
void start_thinking(const Position&, const Search::LimitsType&,
const std::vector&, Search::StateStackPtr&);
@@ -164,12 +160,9 @@ public:
size_t maxThreadsPerSplitPoint;
Mutex mutex;
ConditionVariable sleepCondition;
-
-private:
- std::vector threads;
TimerThread* timer;
};
extern ThreadPool Threads;
-#endif // !defined(THREAD_H_INCLUDED)
+#endif // #ifndef THREAD_H_INCLUDED