mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-09-27 18:59:43 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 13

Windows time_clock(): rewrite to get rid of horrid casting tricks.

Browse source 
Don't blame Mark!  The horrid casting tricks were my idea to begin with.
The rewrite works fine under VC6, and I *expect* will work fine under VC7.
This commit is contained in:
Tim Peters 2002-02-13 05:14:18 +00:00
parent 246debbbc2
commit 9ad4b688ec
1 changed files with 10 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

22
Modules/timemodule.c
View file

@ -147,28 +147,26 @@ time_clock(PyObject *self, PyObject *args)
static PyObject * static PyObject *
time_clock(PyObject *self, PyObject *args) time_clock(PyObject *self, PyObject *args)
{ {
static LONG_LONG ctrStart; static LARGE_INTEGER ctrStart;
static double divisor = 0.0; static double divisor = 0.0;
LONG_LONG now; LARGE_INTEGER now;
double diff; double diff;
assert(sizeof(LONG_LONG) == sizeof(LARGE_INTEGER));
if (!PyArg_ParseTuple(args, ":clock")) if (!PyArg_ParseTuple(args, ":clock"))
return NULL; return NULL;
if (divisor == 0.0) { if (divisor == 0.0) {
LONG_LONG freq; LARGE_INTEGER freq;
QueryPerformanceCounter((LARGE_INTEGER*)&ctrStart); QueryPerformanceCounter(&ctrStart);
if (!QueryPerformanceFrequency((LARGE_INTEGER*)&freq) || if (!QueryPerformanceFrequency(&freq) || freq.QuadPart == 0) {
freq == 0) {
/* Unlikely to happen - this works on all intel /* Unlikely to happen - this works on all intel
machines at least! Revert to clock() */ machines at least! Revert to clock() */
return PyFloat_FromDouble(clock()); return PyFloat_FromDouble(clock());
} }
divisor = (double)freq; divisor = (double)freq.QuadPart;
} }
QueryPerformanceCounter((LARGE_INTEGER*)&now); QueryPerformanceCounter(&now);
diff = (double)(now - ctrStart); diff = (double)(now.QuadPart - ctrStart.QuadPart);
return PyFloat_FromDouble(diff / divisor); return PyFloat_FromDouble(diff / divisor);
} }
@ -220,7 +218,7 @@ static PyStructSequence_Desc struct_time_type_desc = {
struct_time_type_fields, struct_time_type_fields,
9, 9,
}; };
static PyTypeObject StructTimeType; static PyTypeObject StructTimeType;
static PyObject * static PyObject *
@ -229,7 +227,7 @@ tmtotuple(struct tm *p)
PyObject *v = PyStructSequence_New(&StructTimeType); PyObject *v = PyStructSequence_New(&StructTimeType);
if (v == NULL) if (v == NULL)
return NULL; return NULL;
#define SET(i,val) PyStructSequence_SET_ITEM(v, i, PyInt_FromLong((long) val)) #define SET(i,val) PyStructSequence_SET_ITEM(v, i, PyInt_FromLong((long) val))
SET(0, p->tm_year + 1900); SET(0, p->tm_year + 1900);