Ticket #8070: gettickcount64.patch

include/boost/thread/win32/gettickcount64.hpp

@@ +1 @@
+#pragma once
+
+namespace boost
+{
+    namespace detail
+    {
+        namespace win32
+        {
+            typedef unsigned long long ticks_type;
+            typedef ticks_type (__stdcall *gettickcount64fn)();
+            typedef unsigned long (__stdcall *gettickcount32fn)();
+            ticks_type GetTickCount64();
+        }
+    }
+}

include/boost/thread/win32/thread_data.hpp

@@ -10 +10 @@
 #include <boost/thread/thread_time.hpp>
 #include <boost/thread/win32/thread_primitives.hpp>
 #include <boost/thread/win32/thread_heap_alloc.hpp>
+#include <boost/thread/win32/gettickcount64.hpp>
 
 #include <boost/intrusive_ptr.hpp>
 #ifdef BOOST_THREAD_USES_CHRONO

include/boost/thread/win32/thread_primitives.hpp

@@ -18 +18 @@
 //#include <boost/detail/win/synchronization.hpp>
 #include <algorithm>
 
-#ifndef BOOST_THREAD_WIN32_HAS_GET_TICK_COUNT_64
-#if _WIN32_WINNT >= 0x0600 && ! defined _WIN32_WINNT_WS08
-#define BOOST_THREAD_WIN32_HAS_GET_TICK_COUNT_64
-#endif
-#endif
-
 #if defined( BOOST_USE_WINDOWS_H )
 # include <windows.h>
 
@@ -33 +27 @@
     {
         namespace win32
         {
-#ifdef BOOST_THREAD_WIN32_HAS_GET_TICK_COUNT_64
-            typedef unsigned long long ticks_type;
-#else
-            typedef unsigned long ticks_type;
-#endif
             typedef ULONG_PTR ulong_ptr;
             typedef HANDLE handle;
             unsigned const infinite=INFINITE;
@@ -74 +63 @@
             using ::SleepEx;
             using ::Sleep;
             using ::QueueUserAPC;
-            using ::GetTickCount;
-#ifdef BOOST_THREAD_WIN32_HAS_GET_TICK_COUNT_64
-            using ::GetTickCount64;
-#else
-            inline ticks_type GetTickCount64() { return GetTickCount(); }
-#endif
         }
     }
 }
@@ -114 +97 @@
     {
         namespace win32
         {
-#ifdef BOOST_THREAD_WIN32_HAS_GET_TICK_COUNT_64
-            typedef unsigned long long ticks_type;
-#else
-            typedef unsigned long ticks_type;
-#endif
 # ifdef _WIN64
             typedef unsigned __int64 ulong_ptr;
 # else
@@ -157 +135 @@
                 typedef void (__stdcall *queue_user_apc_callback_function)(ulong_ptr);
                 __declspec(dllimport) unsigned long __stdcall QueueUserAPC(queue_user_apc_callback_function,void*,ulong_ptr);
 
-                __declspec(dllimport) unsigned long __stdcall GetTickCount();
-# ifdef BOOST_THREAD_WIN32_HAS_GET_TICK_COUNT_64
-                __declspec(dllimport) ticks_type __stdcall GetTickCount64();
-# endif
 # ifndef UNDER_CE
                 __declspec(dllimport) unsigned long __stdcall GetCurrentProcessId();
                 __declspec(dllimport) unsigned long __stdcall GetCurrentThreadId();
@@ -177 +151 @@
                 using ::ResetEvent;
 # endif
             }
-# ifndef BOOST_THREAD_WIN32_HAS_GET_TICK_COUNT_64
-            inline ticks_type GetTickCount64() { return GetTickCount(); }
-# endif
         }
     }
 }

src/win32/gettickcount64.cpp

@@ +1 @@
+#include <boost/thread/win32/gettickcount64.hpp>
+
+#include <boost/thread/once.hpp>
+
+#ifdef BOOST_USE_WINDOWS_H
+#include <Windows.h>
+#else
+extern "C"
+{
+    __declspec(dllimport) boost::detail::win32::gettickcount32fn __stdcall GetProcAddress(void *, const char *);
+    __declspec(dllimport) void * __stdcall GetModuleHandleW(const wchar_t *);
+}
+#endif
+
+namespace boost
+{
+    namespace detail
+    {
+        namespace win32
+        {
+            namespace
+            {
+                gettickcount64fn gettickcount64 = NULL;
+                gettickcount32fn gettickcount32 = NULL;
+                ::boost::once_flag initfnonce = BOOST_ONCE_INIT;
+
+                void init_gettickcount64()
+                {
+                    gettickcount64 = reinterpret_cast<gettickcount64fn>(::GetProcAddress(::GetModuleHandleW(L"Kernel32.dll"), "GetTickCount64"));
+                    if(!gettickcount64)
+                        gettickcount32 = reinterpret_cast<gettickcount32fn>(::GetProcAddress(::GetModuleHandleW(L"Kernel32.dll"), "GetTickCount"));
+                }
+            }
+
+            ticks_type GetTickCount64()
+            {
+                ::boost::call_once(&init_gettickcount64, initfnonce);
+                return gettickcount64 ? gettickcount64() : static_cast<ticks_type>(gettickcount32());
+            }
+        }
+    }
+}