X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Fmisc.cpp;h=4d91c0fbb11ef8e4e2ba20a434b086400761e4e3;hb=81cd417b4584b0e3830940c5cb122c898afde08a;hp=10c779ed846f4d0a37f146efc636d0e687cbaedf;hpb=8a89b12641ab26e7f49b77a82be2d160de2ab6a5;p=stockfish
diff --git a/src/misc.cpp b/src/misc.cpp
index 10c779ed..4d91c0fb 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)
@@ -161,12 +161,12 @@ int cpu_count() {
#else
# if defined(_SC_NPROCESSORS_ONLN)
- return std::min(sysconf(_SC_NPROCESSORS_ONLN), MAX_THREADS);
+ return std::min((int)sysconf(_SC_NPROCESSORS_ONLN), MAX_THREADS);
# elif defined(__hpux)
struct pst_dynamic psd;
if (pstat_getdynamic(&psd, sizeof(psd), (size_t)1, 0) == -1)
return 1;
- return std::min(psd.psd_proc_cnt, MAX_THREADS);
+ return std::min((int)psd.psd_proc_cnt, MAX_THREADS);
# else
return 1;
# endif
@@ -175,78 +175,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