linux-user: Implement starttime field in self stat emulation
PATCH v3 1/1 linux-user: Implement starttime field in self stat emulation
Instead of always returning 0, return actual starttime.
v3: Fix formatting issues
v2: Use clock_gettime() instead of scanning /proc/self/stat
--- linux-user/main.c | 14 ++++++++++++++ linux-user/qemu.h | 3 +++ linux-user/syscall.c | 3 +++ 3 files changed, 20 insertions(+)
linux-user/main.c +14 -0
@@ -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)
linux-user/qemu.h +3 -0
@@ -158,6 +158,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; } __attribute__((aligned(16))) TaskState;abi_long do_brk (abi_ulong new_brk);
linux-user/syscall.c +3 -0
@@ -8107,6 +8107,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);
Signature · 1 line
2.32.0 (Apple Git-131)
Le 28/01/2022 à 01:12, Cameron Esfahani a écrit :
Quoted 62 lines
Instead of always returning 0, return actual starttime.
v3: Fix formatting issues
v2: Useclock_gettime()instead of scanning/proc/self/statSigned-off-by Cameron Esfahani <[email protected]>--- linux-user/main.c | 14 ++++++++++++++ linux-user/qemu.h | 3 +++ linux-user/syscall.c | 3 +++ 3 files changed, 20 insertions(+)linux-user/main.c +14
-0@@ -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)linux-user/qemu.h +3
-0@@ -158,6 +158,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; } __attribute__((aligned(16))) TaskState;abi_long do_brk (abi_ulong new_brk);linux-user/syscall.c +0
-0
linux-user/syscall.c static int open_self_stat(void *cpu_env, int fd) · line 8115
Quoted 9 lines
linux-user/syscall.c +3
-0@@ -8107,6 +8107,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);
Laurent Vivier
AppliedLe 28/01/2022 à 01:12, Cameron Esfahani a écrit :
Quoted 4 lines
Instead of always returning 0, return actual starttime.
v3: Fix formatting issues
v2: Useclock_gettime()instead of scanning/proc/self/stat
For your next contribution: move version information after the "---" to not clutter the commit message.
Applied to my linux-user-for-7.0 branch.
Thanks,
Laurent
Quoted 69 lines
Signed-off-by Cameron Esfahani <[email protected]>---
linux-user/main.c | 14 ++++++++++++++ linux-user/qemu.h | 3 +++ linux-user/syscall.c | 3 +++ 3 files changed, 20 insertions(+)linux-user/main.c +14
-0@@ -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)linux-user/qemu.h +3
-0@@ -158,6 +158,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; } __attribute__((aligned(16))) TaskState;abi_long do_brk (abi_ulong new_brk);linux-user/syscall.c +3
-0@@ -8107,6 +8107,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);