X-Git-Url: https://git.sesse.net/?p=stockfish;a=blobdiff_plain;f=src%2Fmisc.h;h=37f1e706347b5e55d54d7dbc514207b49a2c330b;hp=b9277372aa4ac224dd2c4baf68aebfceef64d711;hb=e53774bc49dd0aaa1c129ee98c09e1a56ef974fb;hpb=158864270a055fe20dca4a87f4b7a8aa9cedfeb9

diff --git a/src/misc.h b/src/misc.h
index b9277372..37f1e706 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-2014 Marco Costalba, Joona Kiiski, Tord Romstad
+  Copyright (C) 2008-2015 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
@@ -20,6 +20,8 @@
 #ifndef MISC_H_INCLUDED
 #define MISC_H_INCLUDED
 
+#include <cassert>
+#include <chrono>
 #include <ostream>
 #include <string>
 #include <vector>
@@ -27,29 +29,27 @@
 #include "types.h"
 
 const std::string engine_info(bool to_uci = false);
-void timed_wait(WaitCondition&, Lock&, int);
-void prefetch(char* addr);
+void prefetch(void* addr);
 void start_logger(bool b);
 
 void dbg_hit_on(bool b);
-void dbg_hit_on_c(bool c, bool b);
+void dbg_hit_on(bool c, bool b);
 void dbg_mean_of(int v);
 void dbg_print();
 
+typedef std::chrono::milliseconds::rep TimePoint; // A value in milliseconds
 
-namespace Time {
-  typedef int64_t point;
-  inline point now() { return system_time_to_msec(); }
+inline TimePoint now() {
+  return std::chrono::duration_cast<std::chrono::milliseconds>
+        (std::chrono::steady_clock::now().time_since_epoch()).count();
 }
 
-
 template<class Entry, int Size>
 struct HashTable {
-  HashTable() : table(Size, Entry()) {}
   Entry* operator[](Key key) { return &table[(uint32_t)key & (Size - 1)]; }
 
 private:
-  std::vector<Entry> table;
+  std::vector<Entry> table = std::vector<Entry>(Size);
 };
 
 
@@ -64,32 +64,36 @@ std::ostream& operator<<(std::ostream&, SyncCout);
 /// This class is based on original code written and dedicated
 /// to the public domain by Sebastiano Vigna (2014).
 /// It has the following characteristics:
+///
 ///  -  Outputs 64-bit numbers
 ///  -  Passes Dieharder and SmallCrush test batteries
 ///  -  Does not require warm-up, no zeroland to escape
 ///  -  Internal state is a single 64-bit integer
 ///  -  Period is 2^64 - 1
 ///  -  Speed: 1.60 ns/call (Core i7 @3.40GHz)
+///
 /// For further analysis see
 ///   <http://vigna.di.unimi.it/ftp/papers/xorshift.pdf>
 
 class PRNG {
 
-  uint64_t x;
+  uint64_t s;
 
   uint64_t rand64() {
-    x^=x>>12; x^=x<<25; x^=x>>27;
-    return x * 2685821657736338717LL;
+
+    s ^= s >> 12, s ^= s << 25, s ^= s >> 27;
+    return s * 2685821657736338717LL;
   }
 
 public:
-  PRNG(uint64_t seed) : x(seed) { assert(seed); }
+  PRNG(uint64_t seed) : s(seed) { assert(seed); }
 
   template<typename T> T rand() { return T(rand64()); }
 
   /// Special generator used to fast init magic numbers.
   /// Output values only have 1/8th of their bits set on average.
-  template<typename T> T sparse_rand() { return T(rand64() & rand64() & rand64()); }
+  template<typename T> T sparse_rand()
+  { return T(rand64() & rand64() & rand64()); }
 };
 
 #endif // #ifndef MISC_H_INCLUDED