X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;ds=inline;f=src%2Fmisc.h;h=d7addd845351f2a5f03fc9552ea6255c17bcb314;hb=40c863d41af5058a02f1de3423a000d801dcb08a;hp=d6bc26720879748fe01512fb7bc55563023118ab;hpb=32c504076f5a1d5c84f88c2d30a11c25ea2e5a6e;p=stockfish
diff --git a/src/misc.h b/src/misc.h
index d6bc2672..d7addd84 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-2012 Marco Costalba, Joona Kiiski, Tord Romstad
+ 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,7 +17,7 @@
along with this program. If not, see .
*/
-#if !defined(MISC_H_INCLUDED)
+#ifndef MISC_H_INCLUDED
#define MISC_H_INCLUDED
#include
@@ -27,7 +27,6 @@
#include "types.h"
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);
@@ -37,11 +36,6 @@ extern void dbg_hit_on_c(bool c, bool b);
extern void dbg_mean_of(int v);
extern void dbg_print();
-class Position;
-extern Move move_from_uci(const Position& pos, const std::string& str);
-extern const std::string move_to_uci(Move m, bool chess960);
-extern const std::string move_to_san(Position& pos, Move m);
-
struct Log : public std::ofstream {
Log(const std::string& f = "log.txt") : std::ofstream(f.c_str(), std::ios::out | std::ios::app) {}
@@ -49,25 +43,26 @@ struct Log : public std::ofstream {
};
-struct Time {
- void restart() { system_time(&t); }
- uint64_t msec() const { return time_to_msec(t); }
- int elapsed() const { return int(current_time().msec() - time_to_msec(t)); }
-
- static Time current_time() { Time t; t.restart(); return t; }
-
-private:
- sys_time_t t;
-};
+namespace Time {
+ typedef int64_t point;
+ inline point now() { return system_time_to_msec(); }
+}
template
struct HashTable {
- HashTable() : e(Size, Entry()) { memset(&e[0], 0, sizeof(Entry) * Size); }
+ HashTable() : e(Size, Entry()) {}
Entry* operator[](Key k) { return &e[(uint32_t)k & (Size - 1)]; }
private:
std::vector e;
};
-#endif // !defined(MISC_H_INCLUDED)
+
+enum SyncCout { io_lock, io_unlock };
+std::ostream& operator<<(std::ostream&, SyncCout);
+
+#define sync_cout std::cout << io_lock
+#define sync_endl std::endl << io_unlock
+
+#endif // #ifndef MISC_H_INCLUDED