Retire Time::restart()

[stockfish] / src / misc.h

diff --git a/src/misc.h b/src/misc.h
index 498263c68f9e7a19c0396638d53914832c29ad06..1241503ffb6f892ecc3d2a0d13b392720cd891b9 100644 (file)
--- 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-2012 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,58 @@
   along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-
 #if !defined(MISC_H_INCLUDED)
 #define MISC_H_INCLUDED
 
-
-////
-//// Includes
-////
-
+#include <fstream>
 #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.
+extern const std::string engine_info(bool to_uci = false);
+extern int cpu_count();
+extern void timed_wait(WaitCondition&, Lock&, int);
+extern void prefetch(char* addr);
+extern void start_logger(bool b);
 
-const std::string EngineVersion = "1.1a";
+extern void dbg_hit_on(bool b);
+extern void dbg_hit_on_c(bool c, bool b);
+extern void dbg_mean_of(int v);
+extern void dbg_print();
 
 
-////
-//// Macros
-////
+struct Log : public std::ofstream {
+  Log(const std::string& f = "log.txt") : std::ofstream(f.c_str(), std::ios::out | std::ios::app) {}
+ ~Log() { if (is_open()) close(); }
+};
 
-#define Min(x, y) (((x) < (y))? (x) : (y))
-#define Max(x, y) (((x) < (y))? (y) : (x))
 
+struct Time {
+  int64_t msec() const { return time_to_msec(t); }
+  int elapsed() const { return int(current_time().msec() - msec()); }
 
-////
-//// Prototypes
-////
+  static Time current_time() { Time t; system_time(&t.t); return t; }
 
-extern const std::string engine_name();
-extern int get_system_time();
-extern int cpu_count();
-extern int Bioskey();
+private:
+  sys_time_t t;
+};
 
-////
-//// 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() : e(Size, Entry()) {}
+  Entry* operator[](Key k) { return &e[(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> e;
+};
 
-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)