Simplify printing of engine info

[stockfish] / src / misc.cpp

diff --git a/src/misc.cpp b/src/misc.cpp
index 5e851f12f6ded08dfdebb1c967e12bd822b30367..679e38affcd3df915f97f5d2af1fd3ed71962957 100644 (file)
--- a/src/misc.cpp
+++ b/src/misc.cpp
@@ -17,7 +17,14 @@
   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>
@@ -26,13 +33,6 @@
 #     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)
@@ -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 <version number>", 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;
@@ -178,18 +176,13 @@ int cpu_count() {
 /// 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);
 
@@ -201,12 +194,11 @@ void timed_wait(WaitCondition* sleepCond, Lock* sleepLock, int msec) {
       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