Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
C
cpython
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Kirill Smelkov
cpython
Commits
6e18fe71
Commit
6e18fe71
authored
Jul 24, 2012
by
Antoine Pitrou
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Issue #15413: os.times() had disappeared under Windows.
parent
a1e2ce4a
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
27 additions
and
25 deletions
+27
-25
Misc/NEWS
Misc/NEWS
+2
-0
Modules/posixmodule.c
Modules/posixmodule.c
+25
-25
No files found.
Misc/NEWS
View file @
6e18fe71
...
...
@@ -52,6 +52,8 @@ Core and Builtins
Library
-------
-
Issue
#
15413
:
os
.
times
()
had
disappeared
under
Windows
.
-
Issue
#
15402
:
An
issue
in
the
struct
module
that
caused
sys
.
getsizeof
to
return
incorrect
results
for
struct
.
Struct
instances
has
been
fixed
.
Initial
patch
by
Serhiy
Storchaka
.
...
...
Modules/posixmodule.c
View file @
6e18fe71
...
...
@@ -7453,8 +7453,11 @@ static PyStructSequence_Desc times_result_desc = {
static
PyTypeObject
TimesResultType
;
#ifdef MS_WINDOWS
#define HAVE_TIMES
/* mandatory, for the method table */
#endif
#if
defined(HAVE_TIMES) || defined(MS_WINDOWS)
#if
def HAVE_TIMES
static
PyObject
*
build_times_result
(
double
user
,
double
system
,
...
...
@@ -7492,10 +7495,6 @@ Return an object containing floating point numbers indicating process\n\
times. The object behaves like a named tuple with these fields:
\n
\
(utime, stime, cutime, cstime, elapsed_time)"
);
#endif
#ifdef HAVE_TIMES
#if defined(PYCC_VACPP) && defined(PYOS_OS2)
static
long
system_uptime
(
void
)
...
...
@@ -7520,26 +7519,6 @@ posix_times(PyObject *self, PyObject *noargs)
(
double
)
0
/* t.tms_cstime / HZ */
,
(
double
)
system_uptime
()
/
1000
);
}
#else
/* not OS2 */
#define NEED_TICKS_PER_SECOND
static
long
ticks_per_second
=
-
1
;
static
PyObject
*
posix_times
(
PyObject
*
self
,
PyObject
*
noargs
)
{
struct
tms
t
;
clock_t
c
;
errno
=
0
;
c
=
times
(
&
t
);
if
(
c
==
(
clock_t
)
-
1
)
return
posix_error
();
return
build_times_result
(
(
double
)
t
.
tms_utime
/
ticks_per_second
,
(
double
)
t
.
tms_stime
/
ticks_per_second
,
(
double
)
t
.
tms_cutime
/
ticks_per_second
,
(
double
)
t
.
tms_cstime
/
ticks_per_second
,
(
double
)
c
/
ticks_per_second
);
}
#endif
/* not OS2 */
#elif defined(MS_WINDOWS)
static
PyObject
*
posix_times
(
PyObject
*
self
,
PyObject
*
noargs
)
...
...
@@ -7562,8 +7541,29 @@ posix_times(PyObject *self, PyObject *noargs)
(
double
)
0
,
(
double
)
0
);
}
#else
/* Neither Windows nor OS/2 */
#define NEED_TICKS_PER_SECOND
static
long
ticks_per_second
=
-
1
;
static
PyObject
*
posix_times
(
PyObject
*
self
,
PyObject
*
noargs
)
{
struct
tms
t
;
clock_t
c
;
errno
=
0
;
c
=
times
(
&
t
);
if
(
c
==
(
clock_t
)
-
1
)
return
posix_error
();
return
build_times_result
(
(
double
)
t
.
tms_utime
/
ticks_per_second
,
(
double
)
t
.
tms_stime
/
ticks_per_second
,
(
double
)
t
.
tms_cutime
/
ticks_per_second
,
(
double
)
t
.
tms_cstime
/
ticks_per_second
,
(
double
)
c
/
ticks_per_second
);
}
#endif
#endif
/* HAVE_TIMES */
#ifdef HAVE_GETSID
PyDoc_STRVAR
(
posix_getsid__doc__
,
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment