X-Git-Url: https://git.sesse.net/?p=stockfish;a=blobdiff_plain;f=src%2Fplatform.h;h=47c0b117a5a9f35337fbf5a0cee1248599feb7c5;hp=af7795b9501da1fad19e6dd3a57614fd220394c2;hb=856a5f3aaaf8b9d53599963decacd4476b55c034;hpb=a16ba5bbd1034417f864476e4ba33d35970557db diff --git a/src/platform.h b/src/platform.h index af7795b9..47c0b117 100644 --- a/src/platform.h +++ b/src/platform.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-2013 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 @@ -22,7 +22,7 @@ #ifdef _MSC_VER -// Disable some silly and noisy warning from MSVC compiler +// Disable some silly and noisy warnings from MSVC compiler #pragma warning(disable: 4127) // Conditional expression is constant #pragma warning(disable: 4146) // Unary minus operator applied to unsigned type #pragma warning(disable: 4800) // Forcing value to bool 'true' or 'false' @@ -45,10 +45,12 @@ typedef unsigned __int64 uint64_t; #ifndef _WIN32 // Linux - Unix # include -typedef timeval sys_time_t; -inline void system_time(sys_time_t* t) { gettimeofday(t, NULL); } -inline int64_t time_to_msec(const sys_time_t& t) { return t.tv_sec * 1000LL + t.tv_usec / 1000; } +inline int64_t system_time_to_msec() { + timeval t; + gettimeofday(&t, NULL); + return t.tv_sec * 1000LL + t.tv_usec / 1000; +} # include typedef pthread_mutex_t Lock; @@ -71,10 +73,12 @@ typedef void*(*pt_start_fn)(void*); #else // Windows and MinGW # include -typedef _timeb sys_time_t; -inline void system_time(sys_time_t* t) { _ftime(t); } -inline int64_t time_to_msec(const sys_time_t& t) { return t.time * 1000LL + t.millitm; } +inline int64_t system_time_to_msec() { + _timeb t; + _ftime(&t); + return t.time * 1000LL + t.millitm; +} #ifndef NOMINMAX # define NOMINMAX // disable macros min() and max() @@ -85,14 +89,14 @@ inline int64_t time_to_msec(const sys_time_t& t) { return t.time * 1000LL + t.mi #undef WIN32_LEAN_AND_MEAN #undef NOMINMAX -// We use critical sections on Windows to support Windows XP and older versions, -// unfortunatly cond_wait() is racy between lock_release() and WaitForSingleObject() +// We use critical sections on Windows to support Windows XP and older versions. +// Unfortunately, cond_wait() is racy between lock_release() and WaitForSingleObject() // but apart from this they have the same speed performance of SRW locks. typedef CRITICAL_SECTION Lock; typedef HANDLE WaitCondition; typedef HANDLE NativeHandle; -// On Windows 95 and 98 parameter lpThreadId my not be null +// On Windows 95 and 98 parameter lpThreadId may not be null inline DWORD* dwWin9xKludge() { static DWORD dw; return &dw; } # define lock_init(x) InitializeCriticalSection(&(x))