X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;ds=inline;f=src%2Fmisc.cpp;h=679e38affcd3df915f97f5d2af1fd3ed71962957;hb=ad43ce143664953087b44dd3b4324f77c212bd46;hp=0920f7f08838b132f7413ee41c2a4229e0c80966;hpb=ac7339877b3e083b5dd93f34ec79779d43f784ae;p=stockfish
diff --git a/src/misc.cpp b/src/misc.cpp
index 0920f7f0..679e38af 100644
--- a/src/misc.cpp
+++ b/src/misc.cpp
@@ -17,7 +17,14 @@
along with this program. If not, see .
*/
-#if !defined(_MSC_VER)
+#if defined(_MSC_VER)
+
+#define _CRT_SECURE_NO_DEPRECATE
+#define NOMINMAX // disable macros min() and max()
+#include
+#include
+
+#else
# include
# include
@@ -26,13 +33,6 @@
# include
# endif
-#else
-
-#define _CRT_SECURE_NO_DEPRECATE
-#define NOMINMAX // disable macros min() and max()
-#include
-#include
-
#endif
#if !defined(NO_PREFETCH)
@@ -52,46 +52,44 @@
using namespace std;
-/// Version number. If EngineVersion is left empty, then AppTag plus
-/// current date (in the format YYMMDD) is used as a version number.
-static const string AppName = "Stockfish";
-static const string EngineVersion = "";
-static const string AppTag = "";
+/// Version number. If Version is left empty, then Tag plus current
+/// date (in the format YYMMDD) is used as a version number.
+
+static const string Version = "";
+static const string Tag = "";
-/// engine_name() returns the full name of the current Stockfish version.
+/// engine_info() returns the full name of the current Stockfish version.
/// This will be either "Stockfish YYMMDD" (where YYMMDD is the date when
/// the program was compiled) or "Stockfish ", depending
-/// on whether the constant EngineVersion is empty.
+/// on whether Version is empty.
-const string engine_name() {
+const string engine_info(bool to_uci) {
const string months("Jan Feb Mar Apr May Jun Jul Aug Sep Oct Nov Dec");
- const string cpu64(CpuIs64Bit ? " 64bit" : "");
-
- if (!EngineVersion.empty())
- return AppName + " " + EngineVersion + cpu64;
+ const string cpu64(Is64Bit ? " 64bit" : "");
+ const string popcnt(HasPopCnt ? " SSE4.2" : "");
- stringstream s, date(__DATE__); // From compiler, format is "Sep 21 2008"
string month, day, year;
+ stringstream s, date(__DATE__); // From compiler, format is "Sep 21 2008"
- date >> month >> day >> year;
-
- s << setfill('0') << AppName + " " + AppTag + " "
- << year.substr(2, 2) << setw(2)
- << (1 + months.find(month) / 4) << setw(2)
- << day << cpu64;
-
- return s.str();
-}
-
+ if (Version.empty())
+ {
+ date >> month >> day >> year;
-/// Our brave developers! Required by UCI
+ s << "Stockfish " << Tag
+ << setfill('0') << " " << year.substr(2)
+ << setw(2) << (1 + months.find(month) / 4)
+ << setw(2) << day << cpu64 << popcnt;
+ }
+ else
+ s << "Stockfish " << Version << cpu64 << popcnt;
-const string engine_authors() {
+ s << (to_uci ? "\nid author ": " by ")
+ << "Tord Romstad, Marco Costalba and Joona Kiiski";
- return "Tord Romstad, Marco Costalba and Joona Kiiski";
+ return s.str();
}
@@ -134,9 +132,9 @@ void dbg_before() { dbg_hit_on(false); }
void dbg_after() { dbg_hit_on(true); dbg_hit_cnt0--; }
-/// get_system_time() returns the current system time, measured in milliseconds
+/// system_time() returns the current system time, measured in milliseconds
-int get_system_time() {
+int system_time() {
#if defined(_MSC_VER)
struct _timeb t;
@@ -175,78 +173,32 @@ int cpu_count() {
}
-/// Check for console input. Original code from Beowulf, Olithink and Greko
-
-#ifndef _WIN32
+/// timed_wait() waits for msec milliseconds. It is mainly an helper to wrap
+/// conversion from milliseconds to struct timespec, as used by pthreads.
-int input_available() {
-
- fd_set readfds;
- struct timeval timeout;
-
- FD_ZERO(&readfds);
- FD_SET(fileno(stdin), &readfds);
- timeout.tv_sec = 0; // Set to timeout immediately
- timeout.tv_usec = 0;
- select(16, &readfds, 0, 0, &timeout);
-
- return (FD_ISSET(fileno(stdin), &readfds));
-}
+void timed_wait(WaitCondition* sleepCond, Lock* sleepLock, int msec) {
+#if defined(_MSC_VER)
+ int tm = msec;
#else
+ struct timeval t;
+ struct timespec abstime, *tm = &abstime;
-int input_available() {
+ gettimeofday(&t, NULL);
- static HANDLE inh = NULL;
- static bool usePipe = false;
- INPUT_RECORD rec[256];
- DWORD nchars, recCnt;
+ abstime.tv_sec = t.tv_sec + (msec / 1000);
+ abstime.tv_nsec = (t.tv_usec + (msec % 1000) * 1000) * 1000;
- if (!inh)
+ if (abstime.tv_nsec > 1000000000LL)
{
- inh = GetStdHandle(STD_INPUT_HANDLE);
- if (GetConsoleMode(inh, &nchars))
- {
- SetConsoleMode(inh, nchars & ~(ENABLE_MOUSE_INPUT | ENABLE_WINDOW_INPUT));
- FlushConsoleInputBuffer(inh);
- } else
- usePipe = true;
+ abstime.tv_sec += 1;
+ abstime.tv_nsec -= 1000000000LL;
}
+#endif
- // When using Standard C input functions, also check if there
- // is anything in the buffer. After a call to such functions,
- // the input waiting in the pipe will be copied to the buffer,
- // and the call to PeekNamedPipe can indicate no input available.
- // Setting stdin to unbuffered was not enough. [from Greko]
- if (stdin->_cnt > 0)
- return 1;
-
- // When running under a GUI the input commands are sent to us
- // directly over the internal pipe. If PeekNamedPipe() returns 0
- // then something went wrong. Probably the parent program exited.
- // Returning 1 will make the next call to the input function
- // return EOF, where this should be catched then.
- if (usePipe)
- return PeekNamedPipe(inh, NULL, 0, NULL, &nchars, NULL) ? nchars : 1;
-
- // Count the number of unread input records, including keyboard,
- // mouse, and window-resizing input records.
- GetNumberOfConsoleInputEvents(inh, &nchars);
-
- // Read data from console without removing it from the buffer
- if (nchars <= 0 || !PeekConsoleInput(inh, rec, std::min(int(nchars), 256), &recCnt))
- return 0;
-
- // Search for at least one keyboard event
- for (DWORD i = 0; i < recCnt; i++)
- if (rec[i].EventType == KEY_EVENT)
- return 1;
-
- return 0;
+ cond_timedwait(sleepCond, sleepLock, tm);
}
-#endif
-
/// prefetch() preloads the given address in L1/L2 cache. This is a non
/// blocking function and do not stalls the CPU waiting for data to be