Kaydet (Commit) bbc3410f authored tarafından Guido van Rossum's avatar Guido van Rossum

added 5th return item, clock time, to posix.times()

üst a3127e8e
...@@ -1079,11 +1079,12 @@ posix_times(self, args) ...@@ -1079,11 +1079,12 @@ posix_times(self, args)
c = times(&t); c = times(&t);
if (c == (clock_t) -1) if (c == (clock_t) -1)
return posix_error(); return posix_error();
return mkvalue("dddd", return mkvalue("ddddd",
(double)t.tms_utime / HZ, (double)t.tms_utime / HZ,
(double)t.tms_stime / HZ, (double)t.tms_stime / HZ,
(double)t.tms_cutime / HZ, (double)t.tms_cutime / HZ,
(double)t.tms_cstime / HZ); (double)t.tms_cstime / HZ,
(double)c / HZ);
} }
#endif /* HAVE_TIMES */ #endif /* HAVE_TIMES */
#if defined(NT) && !defined(HAVE_TIMES) #if defined(NT) && !defined(HAVE_TIMES)
...@@ -1099,10 +1100,11 @@ posix_times(self, args) ...@@ -1099,10 +1100,11 @@ posix_times(self, args)
return NULL; return NULL;
hProc = GetCurrentProcess(); hProc = GetCurrentProcess();
GetProcessTimes(hProc,&create, &exit, &kernel, &user); GetProcessTimes(hProc,&create, &exit, &kernel, &user);
return mkvalue("dddd", return mkvalue("ddddd",
(double)(kernel.dwHighDateTime*2E32+kernel.dwLowDateTime) / 2E6, (double)(kernel.dwHighDateTime*2E32+kernel.dwLowDateTime) / 2E6,
(double)(user.dwHighDateTime*2E32+user.dwLowDateTime) / 2E6, (double)(user.dwHighDateTime*2E32+user.dwLowDateTime) / 2E6,
(double)0, (double)0,
(double)0,
(double)0); (double)0);
} }
#endif /* NT */ #endif /* NT */
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment