along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#if !defined(_MSC_VER)
+#if defined(_MSC_VER)
+
+#define _CRT_SECURE_NO_DEPRECATE
+#define NOMINMAX // disable macros min() and max()
+#include <windows.h>
+#include <sys/timeb.h>
+
+#else
# include <sys/time.h>
# include <sys/types.h>
# include <sys/pstat.h>
# endif
-#else
-
-#define _CRT_SECURE_NO_DEPRECATE
-#define NOMINMAX // disable macros min() and max()
-#include <windows.h>
-#include <sys/timeb.h>
-
#endif
#if !defined(NO_PREFETCH)
const string engine_name() {
const string months("Jan Feb Mar Apr May Jun Jul Aug Sep Oct Nov Dec");
- const string cpu64(CpuIs64Bit ? " 64bit" : "");
+ const string cpu64(Is64Bit ? " 64bit" : "");
+ const string popcnt(HasPopCnt ? " SSE4.2" : "");
if (!EngineVersion.empty())
- return AppName + " " + EngineVersion + cpu64;
+ return AppName + " " + EngineVersion + cpu64 + popcnt;
stringstream s, date(__DATE__); // From compiler, format is "Sep 21 2008"
string month, day, year;
date >> month >> day >> year;
- s << setfill('0') << AppName + " " + AppTag + " "
- << year.substr(2, 2) << setw(2)
- << (1 + months.find(month) / 4) << setw(2)
- << day << cpu64;
+ s << AppName + " " + AppTag + " "
+ << setfill('0') << year.substr(2)
+ << setw(2) << (1 + months.find(month) / 4)
+ << setw(2) << day << cpu64 << popcnt;
return s.str();
}
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;
/// timed_wait() waits for msec milliseconds. It is mainly an helper to wrap
/// conversion from milliseconds to struct timespec, as used by pthreads.
-#if defined(_MSC_VER)
-
void timed_wait(WaitCondition* sleepCond, Lock* sleepLock, int msec) {
- cond_timedwait(sleepCond, sleepLock, msec);
-}
+#if defined(_MSC_VER)
+ int tm = msec;
#else
-
-void timed_wait(WaitCondition* sleepCond, Lock* sleepLock, int msec) {
-
struct timeval t;
- struct timespec abstime;
+ struct timespec abstime, *tm = &abstime;
gettimeofday(&t, NULL);
abstime.tv_sec += 1;
abstime.tv_nsec -= 1000000000LL;
}
+#endif
- cond_timedwait(sleepCond, sleepLock, &abstime);
+ 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