summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTim Peters <tim.peters@gmail.com>2006-05-25 21:50:17 (GMT)
committerTim Peters <tim.peters@gmail.com>2006-05-25 21:50:17 (GMT)
commit7a822dabadcc79acacc2e9cb02ada7cd4879371b (patch)
treee114cdca32ce0ba59a613c6236fe2aa9db15a108
parent36850456caa30eba02d440c7c36ccdd510625767 (diff)
downloadcpython-7a822dabadcc79acacc2e9cb02ada7cd4879371b.zip
cpython-7a822dabadcc79acacc2e9cb02ada7cd4879371b.tar.gz
cpython-7a822dabadcc79acacc2e9cb02ada7cd4879371b.tar.bz2
Some Win64 pre-release in 2000 didn't support
QueryPerformanceCounter(), but we believe Win64 does support it now. So use in time.clock(). It would be peachy if someone with a Win64 box tried this ;-)
-rw-r--r--Misc/NEWS4
-rw-r--r--Modules/timemodule.c7
2 files changed, 7 insertions, 4 deletions
diff --git a/Misc/NEWS b/Misc/NEWS
index 625dd74..be5e4ea 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -64,6 +64,10 @@ Extension Modules
- Use Win32 API to implement os.{access,chdir,chmod,mkdir,remove,rename,rmdir,utime}.
As a result, these functions now raise WindowsError instead of OSError.
+- ``time.clock()`` on Win64 should use the high-performance Windows
+ ``QueryPerformanceCounter()`` now (as was already the case on 32-bit
+ Windows platforms).
+
- Calling Tk_Init twice is refused if the first call failed as that
may deadlock.
diff --git a/Modules/timemodule.c b/Modules/timemodule.c
index 742d6bf..eb9f4d0 100644
--- a/Modules/timemodule.c
+++ b/Modules/timemodule.c
@@ -63,11 +63,10 @@ static long main_thread;
#endif /* MS_WINDOWS */
#endif /* !__WATCOMC__ || __QNX__ */
-#if defined(MS_WINDOWS) && !defined(MS_WIN64) && !defined(__BORLANDC__)
+#if defined(MS_WINDOWS) && !defined(__BORLANDC__)
/* Win32 has better clock replacement
- XXX Win64 does not yet, but might when the platform matures. */
#undef HAVE_CLOCK /* We have our own version down below */
-#endif /* MS_WINDOWS && !MS_WIN64 */
+#endif /* MS_WINDOWS && !defined(__BORLANDC__) */
#if defined(PYOS_OS2)
#define INCL_DOS
@@ -821,7 +820,7 @@ inittime(void)
SetConsoleCtrlHandler( PyCtrlHandler, TRUE);
#endif /* MS_WINDOWS */
if (!initialized) {
- PyStructSequence_InitType(&StructTimeType,
+ PyStructSequence_InitType(&StructTimeType,
&struct_time_type_desc);
}
Py_INCREF(&StructTimeType);