X-Git-Url: https://git.sesse.net/?p=stockfish;a=blobdiff_plain;f=src%2Fmisc.h;h=34ef03259f9de5e6f1d75664aa0c16bef88f7e36;hp=6b99c9ec4122b699e45e8c3731ab4525830e2dfd;hb=c014444f09ace05e908909d9c5c60127e998b538;hpb=b7c36d078b2a11252f0b66e703e134673997fd29

diff --git a/src/misc.h b/src/misc.h
index 6b99c9ec..34ef0325 100644
--- a/src/misc.h
+++ b/src/misc.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 Marco Costalba
+  Copyright (C) 2008-2014 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,64 +17,46 @@
   along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-
-#if !defined(MISC_H_INCLUDED)
+#ifndef MISC_H_INCLUDED
 #define MISC_H_INCLUDED
 
-
-////
-//// Includes
-////
-
+#include <ostream>
 #include <string>
+#include <vector>
 
+#include "types.h"
 
-////
-//// Constants
-////
-
-
-/// Version number.  If this is left empty, the current date (in the format
-/// YYMMDD) is used as a version number.
-
-const std::string EngineVersion = "1.1";
-
-
-////
-//// Macros
-////
-
-#define Min(x, y) (((x) < (y))? (x) : (y))
-#define Max(x, y) (((x) < (y))? (y) : (x))
+const std::string engine_info(bool to_uci = false);
+void timed_wait(WaitCondition&, Lock&, int);
+void prefetch(char* addr);
+void start_logger(bool b);
 
+void dbg_hit_on(bool b);
+void dbg_hit_on_c(bool c, bool b);
+void dbg_mean_of(int v);
+void dbg_print();
 
-////
-//// Prototypes
-////
 
-extern const std::string engine_name();
-extern int get_system_time();
-extern int cpu_count();
-extern int Bioskey();
+namespace Time {
+  typedef int64_t point;
+  inline point now() { return system_time_to_msec(); }
+}
 
-////
-//// Debug
-////
-extern bool dbg_show_mean;
-extern bool dbg_show_hit_rate;
 
-extern long dbg_cnt0;
-extern long dbg_cnt1;
+template<class Entry, int Size>
+struct HashTable {
+  HashTable() : table(Size, Entry()) {}
+  Entry* operator[](Key k) { return &table[(uint32_t)k & (Size - 1)]; }
 
-inline void dbg_hit_on(bool b) { dbg_show_hit_rate = true; dbg_cnt0++; if (b) dbg_cnt1++; }
-inline void dbg_hit_on_c(bool c, bool b) { if (c) dbg_hit_on(b); }
+private:
+  std::vector<Entry> table;
+};
 
-inline void dbg_before() { dbg_show_hit_rate = true; dbg_cnt0++; }
-inline void dbg_after() { dbg_show_hit_rate = true; dbg_cnt1++; }
 
-inline void dbg_mean_of(int v) { dbg_cnt0++; dbg_cnt1 += v; }
+enum SyncCout { IO_LOCK, IO_UNLOCK };
+std::ostream& operator<<(std::ostream&, SyncCout);
 
-extern void dbg_print_hit_rate();
-extern void dbg_print_mean();
+#define sync_cout std::cout << IO_LOCK
+#define sync_endl std::endl << IO_UNLOCK
 
-#endif // !defined(MISC_H_INCLUDED)
+#endif // #ifndef MISC_H_INCLUDED