[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 6/8] linux-user: Implement starttime field in self stat emulation
From: |
Laurent Vivier |
Subject: |
[PULL 6/8] linux-user: Implement starttime field in self stat emulation |
Date: |
Mon, 7 Feb 2022 09:27:57 +0100 |
From: Cameron Esfahani <dirty@apple.com>
Instead of always returning 0, return actual starttime.
Signed-off-by: Cameron Esfahani <dirty@apple.com>
Reviewed-by: Laurent Vivier <laurent@vivier.eu>
Message-Id: <20220128001251.45165-1-dirty@apple.com>
Signed-off-by: Laurent Vivier <laurent@vivier.eu>
---
linux-user/main.c | 14 ++++++++++++++
linux-user/qemu.h | 3 +++
linux-user/syscall.c | 3 +++
3 files changed, 20 insertions(+)
diff --git a/linux-user/main.c b/linux-user/main.c
index 16def5215d91..fbc9bcfd5f5f 100644
--- a/linux-user/main.c
+++ b/linux-user/main.c
@@ -190,12 +190,26 @@ void stop_all_tasks(void)
/* Assumes contents are already zeroed. */
void init_task_state(TaskState *ts)
{
+ long ticks_per_sec;
+ struct timespec bt;
+
ts->used = 1;
ts->sigaltstack_used = (struct target_sigaltstack) {
.ss_sp = 0,
.ss_size = 0,
.ss_flags = TARGET_SS_DISABLE,
};
+
+ /* Capture task start time relative to system boot */
+
+ ticks_per_sec = sysconf(_SC_CLK_TCK);
+
+ if ((ticks_per_sec > 0) && !clock_gettime(CLOCK_BOOTTIME, &bt)) {
+ /* start_boottime is expressed in clock ticks */
+ ts->start_boottime = bt.tv_sec * (uint64_t) ticks_per_sec;
+ ts->start_boottime += bt.tv_nsec * (uint64_t) ticks_per_sec /
+ NANOSECONDS_PER_SECOND;
+ }
}
CPUArchState *cpu_copy(CPUArchState *env)
diff --git a/linux-user/qemu.h b/linux-user/qemu.h
index 9d2b3119d1fe..98dfbf20962b 100644
--- a/linux-user/qemu.h
+++ b/linux-user/qemu.h
@@ -154,6 +154,9 @@ typedef struct TaskState {
/* This thread's sigaltstack, if it has one */
struct target_sigaltstack sigaltstack_used;
+
+ /* Start time of task after system boot in clock ticks */
+ uint64_t start_boottime;
} TaskState;
abi_long do_brk(abi_ulong new_brk);
diff --git a/linux-user/syscall.c b/linux-user/syscall.c
index 84cfa223df4e..b3948d13a9dd 100644
--- a/linux-user/syscall.c
+++ b/linux-user/syscall.c
@@ -8077,6 +8077,9 @@ static int open_self_stat(void *cpu_env, int fd)
} else if (i == 3) {
/* ppid */
g_string_printf(buf, FMT_pid " ", getppid());
+ } else if (i == 21) {
+ /* starttime */
+ g_string_printf(buf, "%" PRIu64 " ", ts->start_boottime);
} else if (i == 27) {
/* stack bottom */
g_string_printf(buf, TARGET_ABI_FMT_ld " ", ts->info->start_stack);
--
2.34.1
- [PULL 0/8] Linux user for 7.0 patches, Laurent Vivier, 2022/02/07
- [PULL 5/8] linux-user: sigprocmask check read perms first, Laurent Vivier, 2022/02/07
- [PULL 2/8] linux-user/alpha: Fix target rlimits for alpha and rearrange for clarity, Laurent Vivier, 2022/02/07
- [PULL 4/8] linux-user: rt_sigprocmask, check read perms first, Laurent Vivier, 2022/02/07
- [PULL 6/8] linux-user: Implement starttime field in self stat emulation,
Laurent Vivier <=
- [PULL 7/8] linux-user: Move generic TARGET_RLIMIT* definitions to generic/target_resource.h, Laurent Vivier, 2022/02/07
- [PULL 1/8] linux-user: Remove unnecessary 'aligned' attribute from TaskState, Laurent Vivier, 2022/02/07
- [PULL 3/8] linux-user: Fix inotify on aarch64, Laurent Vivier, 2022/02/07
- [PULL 8/8] linux-user/syscall: Translate TARGET_RLIMIT_RTTIME, Laurent Vivier, 2022/02/07
- Re: [PULL 0/8] Linux user for 7.0 patches, Peter Maydell, 2022/02/07