Merge lp:~vkolesnikov/pbxt/pbxt-xtstat-windows into lp:pbxt

[Vladimir Kolesnikov]

[Vladimir Kolesnikov (vkolesnikov)]

we will need to update our web-site documentation to mention xtstat's CMakeLists.txt file

=== modified file 'ChangeLog'
--- ChangeLog	2009-07-22 08:35:24 +0000
+++ ChangeLog	2009-07-28 14:28:57 +0000
@@ -3,6 +3,8 @@
 
 ------- 1.0.09 RC2 - Not released yet
 
+RN260: Updated xtstat to compile on Windows/MS Visual C++
+
 RN259: Fixed bug 377788: Cannot find index for FK, fixed buffer overflow
 
 RN258: updated xt_p_join implementation for Windows to check if a thread has already exited or has not yet started

=== added file 'bin/CMakeLists.txt'
--- bin/CMakeLists.txt	1970-01-01 00:00:00 +0000
+++ bin/CMakeLists.txt	2009-07-29 12:56:00 +0000
@@ -0,0 +1,34 @@
+# Copyright (c) 2008 PrimeBase Technologies GmbH
+# 
+# PrimeBase XT
+# 
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+#
+# 2006-03-22	Paul McCullagh
+#
+# H&G2JCtL
+#
+# This file is used to make the Windows version
+
+SET(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -DSAFEMALLOC -DSAFE_MUTEX -DDEBUG")
+SET(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -DSAFEMALLOC -DSAFE_MUTEX -DDEBUG")
+
+INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/include
+					${CMAKE_SOURCE_DIR}/storage/pbxt/src)
+
+SET(PBXTSTAT_SOURCES xtstat_xt.cc)
+
+ADD_EXECUTABLE(xtstat_xt ${PBXTSTAT_SOURCES})
+TARGET_LINK_LIBRARIES(xtstat_xt mysqlclient_notls wsock32 pbxt)

=== modified file 'bin/xtstat_xt.cc'
--- bin/xtstat_xt.cc	2008-12-22 14:29:21 +0000
+++ bin/xtstat_xt.cc	2009-07-28 14:28:57 +0000
@@ -95,6 +95,10 @@
 	{ OPT_NONE,		0, NULL, 0, NULL, 0, false }
 };
 
+#ifdef XT_WIN
+#define atoll _atoi64
+#endif
+
 void add_statistic(int stat)
 {
 	/* Check if column has already been added: */
@@ -741,19 +745,17 @@
 			else if (meta->sm_flags & XT_STAT_PERCENTAGE) {
 				double perc = 100;
 				switch (stat) {
-					case XT_STAT_REC_CACHE_USAGE:	perc = record_cache_size; break;
-					case XT_STAT_IND_CACHE_USAGE:	perc = index_cache_size; break;
-					case XT_STAT_XLOG_CACHE_USAGE:	perc = log_cache_size; break;
+					case XT_STAT_REC_CACHE_USAGE:	perc = (double)record_cache_size; break;
+					case XT_STAT_IND_CACHE_USAGE:	perc = (double)index_cache_size; break;
+					case XT_STAT_XLOG_CACHE_USAGE:	perc = (double)log_cache_size; break;
 				}
 				format_percent_value(str_value, value, perc);
 				len = 4;
 			}
 			else if (meta->sm_flags & XT_STAT_DATE) {
-				time_t		ticks = (time_t) value;
-				struct tm	ltime;
-
-				localtime_r(&ticks, &ltime);
-				strftime(str_value, 99, "%y%m%d %H:%M:%S", &ltime);
+				time_t ticks = (time_t) value;
+				const struct tm *ltime = localtime(&ticks);
+				strftime(str_value, 99, "%y%m%d %H:%M:%S", ltime);
 				len = 15;
 			}
 			else if (meta->sm_flags & XT_STAT_BYTE_COUNT)