[gnugo-devel] trevor_1_12.2

[Trevor Morris]

http://www.public32.com/games/go/trevor_1_12.2
 - gtp_cputime now uses gg_cputime
 - removes platform specific code from play_gtp.c

This works on Mingw32 and VC builds.
However, it reports wall time rather than CPU time on Cygwin.

-Trevor

For reference, though my mailer will probably break it:

Index: interface/play_gtp.c
===================================================================
RCS file: /cvsroot/gnugo/gnugo/interface/play_gtp.c,v
retrieving revision 1.37
diff -u -r1.37 play_gtp.c
--- interface/play_gtp.c        2001/10/18 15:40:56     1.37
+++ interface/play_gtp.c        2001/10/22 14:18:45
@@ -28,9 +28,6 @@
 #include <assert.h>
 #include <ctype.h>
 #include <string.h>
-#ifndef WIN32
-#include <sys/times.h>
-#endif
 
 #include "interface.h"
 #include "liberty.h"
@@ -154,7 +151,7 @@
   {"combination_attack",      gtp_combination_attack},
   {"connect",                gtp_connect},
   {"countlib",                       gtp_countlib},
-  {"cputime",                            gtp_cputime},
+  {"cputime",                gtp_cputime},
   {"debug_influence",         gtp_debug_influence},
   {"debug_move_influence",    gtp_debug_move_influence},
   {"decrease_depths",                gtp_decrease_depths},
@@ -1779,34 +1776,15 @@
  *********/
 
 
-/* Function:  Returns elapsed CPU time.
+/* Function:  Returns elapsed CPU time in seconds.
  * Arguments: none
  * Fails:     never
- * Returns:   Total elapsed (user + system) CPU time in milliseconds
+ * Returns:   Total elapsed (user + system) CPU time in seconds.
  */
 static int
 gtp_cputime(char *s, int id)
-{
-#ifdef WIN32
-    FILETIME creationTime, exitTime, kernelTime, userTime;
-    ULARGE_INTEGER uKernelTime,uUserTime,uElapsedTime;
-    unsigned long ulElapsedTime;
-    UNUSED(s);
-    GetProcessTimes(GetCurrentProcess(), &creationTime, &exitTime,
&kernelTime, &userTime);
-    uKernelTime.LowPart = kernelTime.dwLowDateTime;
-    uKernelTime.HighPart = kernelTime.dwHighDateTime;
-    uUserTime.LowPart = userTime.dwLowDateTime;
-    uUserTime.HighPart = userTime.dwHighDateTime;
-    uElapsedTime.QuadPart = uKernelTime.QuadPart + uUserTime.QuadPart;
-    ulElapsedTime = (unsigned long)(uElapsedTime.QuadPart / 10000); /*
convert to milliseconds: */
-    /*_ASSERTE(0 && "Debug Times");*/
-    return gtp_success(id, "%ld", ulElapsedTime);
-#else
-    struct tms t;
-    UNUSED(s);
-    times(&t);
-       return gtp_success(id, "%ld", t.tms_utime + t.tms_stime + t.tms_cutime +
t.tms_cstime);
-#endif
+{
+    return gtp_success(id, "%.3f", gg_cputime());
 }