X-Git-Url: https://git.sesse.net/?p=stockfish;a=blobdiff_plain;f=src%2Fmisc.h;h=970f335d1b74f5f2bad89fe782a6479ab26b69d3;hp=24d41d1a0e7a5e2ada7d6c5da492e10ff68d86b9;hb=15e21911110f9d459c4fef2bb17903d97345d0b9;hpb=92e759a676b5f2886160fc8f43744f137a0a19b1

diff --git a/src/misc.h b/src/misc.h
index 24d41d1a..970f335d 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,17 +17,16 @@
   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
 
-#include <fstream>
+#include <ostream>
 #include <string>
 #include <vector>
 
 #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);
@@ -38,38 +37,26 @@ extern void dbg_mean_of(int v);
 extern void dbg_print();
 
 
-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(); }
-};
-
-
-struct Time {
-  void restart() { system_time(&t); }
-  int64_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<class Entry, int Size>
 struct HashTable {
-  HashTable() : e(Size, Entry()) { memset(&e[0], 0, sizeof(Entry) * Size); }
-  Entry* operator[](Key k) { return &e[(uint32_t)k & (Size - 1)]; }
+  HashTable() : table(Size, Entry()) {}
+  Entry* operator[](Key k) { return &table[(uint32_t)k & (Size - 1)]; }
 
 private:
-  std::vector<Entry> e;
+  std::vector<Entry> table;
 };
 
 
-enum SyncCout { io_lock, io_unlock };
+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
+#define sync_cout std::cout << IO_LOCK
+#define sync_endl std::endl << IO_UNLOCK
 
-#endif // !defined(MISC_H_INCLUDED)
+#endif // #ifndef MISC_H_INCLUDED