mirrors/cosmopolitan
1
0
Fork 0
mirror of https://github.com/jart/cosmopolitan.git synced 2025-04-02 13:58:51 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Fix bugs in times() function

Browse source
This commit is contained in:
Justine Tunney 2024-12-23 20:57:10 -08:00
parent c8e10eef30
commit 4705705548
No known key found for this signature in database
GPG key ID: BE714B4575D6E328
2 changed files with 20 additions and 38 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
libc/proc/getrusage-nt.c
View file

@ -58,9 +58,8 @@ textwindows int sys_getrusage_nt(int who, struct rusage *usage) {
return einval(); return einval();
} }
if (!usage) { if (!usage)
return 0; return 0;
}
if (!(who == RUSAGE_THREAD ? GetThreadTimes : GetProcessTimes)( if (!(who == RUSAGE_THREAD ? GetThreadTimes : GetProcessTimes)(
me, &ftCreation, &ftExit, &ftKernel, &ftUser) || me, &ftCreation, &ftExit, &ftKernel, &ftUser) ||

55
libc/proc/times.c
View file

@ -16,55 +16,38 @@
│ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR │ │ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR │
│ PERFORMANCE OF THIS SOFTWARE. │ │ PERFORMANCE OF THIS SOFTWARE. │
╚─────────────────────────────────────────────────────────────────────────────*/ ╚─────────────────────────────────────────────────────────────────────────────*/
#include "libc/calls/calls.h"
#include "libc/calls/struct/rusage.h" #include "libc/calls/struct/rusage.h"
#include "libc/calls/struct/timespec.h"
#include "libc/calls/struct/timeval.h" #include "libc/calls/struct/timeval.h"
#include "libc/calls/struct/tms.h" #include "libc/calls/struct/tms.h"
#include "libc/calls/syscall_support-nt.internal.h"
#include "libc/dce.h"
#include "libc/fmt/wintime.internal.h"
#include "libc/nt/accounting.h"
#include "libc/nt/runtime.h"
#include "libc/runtime/clktck.h" #include "libc/runtime/clktck.h"
#include "libc/runtime/sysconf.h" #include "libc/sysv/consts/clock.h"
#include "libc/sysv/consts/rusage.h" #include "libc/sysv/consts/rusage.h"
#include "libc/time.h"
static dontinline long ConvertMicros(struct timeval tv) { static long MicrosToTicks(struct timeval tv) {
return tv.tv_sec * CLK_TCK + tv.tv_usec / (1000000 / CLK_TCK); return tv.tv_sec * CLK_TCK + tv.tv_usec / (1000000 / CLK_TCK);
} }
static dontinline long times2(struct tms *out_times, struct rusage *ru) { static long NanosToTicks(struct timespec ts) {
struct timeval tv; return ts.tv_sec * CLK_TCK + ts.tv_nsec / (1000000000 / CLK_TCK);
struct NtFileTime CreationTime, ExitTime, KernelTime, UserTime;
if (!IsWindows()) {
if (getrusage(RUSAGE_SELF, ru) == -1)
return -1;
out_times->tms_utime = ConvertMicros(ru->ru_utime);
out_times->tms_stime = ConvertMicros(ru->ru_stime);
if (getrusage(RUSAGE_CHILDREN, ru) == -1)
return -1;
out_times->tms_cutime = ConvertMicros(ru->ru_utime);
out_times->tms_cstime = ConvertMicros(ru->ru_stime);
} else {
if (!GetProcessTimes(GetCurrentProcess(), &CreationTime, &ExitTime,
&KernelTime, &UserTime)) {
return __winerr();
}
out_times->tms_utime = ReadFileTime(UserTime);
out_times->tms_stime = ReadFileTime(KernelTime);
out_times->tms_cutime = 0;
out_times->tms_cstime = 0;
}
if (gettimeofday(&tv, NULL) == -1)
return -1;
return ConvertMicros(tv);
} }
/** /**
* Returns accounting data for process on time-sharing system. * Returns accounting data for process on time-sharing system.
* @return number of `CLK_TCK` from `CLOCK_BOOTTIME` epoch
*/ */
long times(struct tms *out_times) { long times(struct tms *out_times) {
struct rusage ru; struct timespec bt;
return times2(out_times, &ru); struct rusage rus, ruc;
if (getrusage(RUSAGE_SELF, &rus))
return -1;
if (getrusage(RUSAGE_CHILDREN, &ruc))
return -1;
if (clock_gettime(CLOCK_BOOTTIME, &bt))
return -1;
out_times->tms_utime = MicrosToTicks(rus.ru_utime);
out_times->tms_stime = MicrosToTicks(rus.ru_stime);
out_times->tms_cutime = MicrosToTicks(ruc.ru_utime);
out_times->tms_cstime = MicrosToTicks(ruc.ru_stime);
return NanosToTicks(bt);
} }