* [PATCH] linux-user: Trace wait4()'s and waitpid()'s wstatus
@ 2024-10-01 19:32 Ilya Leoshkevich
2024-10-05 17:57 ` Richard Henderson
0 siblings, 1 reply; 3+ messages in thread
From: Ilya Leoshkevich @ 2024-10-01 19:32 UTC (permalink / raw)
To: Laurent Vivier; +Cc: Richard Henderson, qemu-devel, Ilya Leoshkevich
Borrow the code for formatting the most frequent WIFEXITED() and
WIFSIGNALED() special cases from from the strace's printstatus().
Output examples:
474729 wait4(-1,0x7f00767ff0a0,0,(nil)) = 474733 (wstatus={WIFEXITED(s) && WEXITSTATUS(s) == 1})
475833 wait4(-1,0x7f7de61ff0a0,0,(nil)) = 475837 (wstatus={WIFSIGNALED(s) && WTERMSIG(s) == SIGKILL})
1168 waitpid(1171,0x7f44eea00340,0) = 1171 (wstatus={WIFSIGNALED(s) && WTERMSIG(s) == SIGKILL})
Signed-off-by: Ilya Leoshkevich <iii@linux.ibm.com>
---
linux-user/strace.c | 61 ++++++++++++++++++++++++++++++++++++++++++
linux-user/strace.list | 6 +++--
2 files changed, 65 insertions(+), 2 deletions(-)
diff --git a/linux-user/strace.c b/linux-user/strace.c
index b4d1098170e..d5d1f18304d 100644
--- a/linux-user/strace.c
+++ b/linux-user/strace.c
@@ -4168,6 +4168,67 @@ print_ioctl(CPUArchState *cpu_env, const struct syscallname *name,
}
#endif
+#if defined(TARGET_NR_wait4) || defined(TARGET_NR_waitpid)
+static void print_wstatus(int wstatus)
+{
+ if (WIFSIGNALED(wstatus)) {
+ qemu_log("{WIFSIGNALED(s) && WTERMSIG(s) == ");
+ print_signal(WTERMSIG(wstatus), 1);
+ if (WCOREDUMP(wstatus)) {
+ qemu_log(" && WCOREDUMP(s)");
+ }
+ qemu_log("}");
+ } else if (WIFEXITED(wstatus)) {
+ qemu_log("{WIFEXITED(s) && WEXITSTATUS(s) == %d}",
+ WEXITSTATUS(wstatus));
+ } else {
+ print_number(wstatus, 1);
+ }
+}
+
+static void print_ret_wstatus(abi_long ret, abi_long wstatus_addr)
+{
+ if (!print_syscall_err(ret)) {
+ qemu_log(TARGET_ABI_FMT_ld " (wstatus=", ret);
+ if (wstatus_addr == 0) {
+ qemu_log("NULL");
+ } else {
+ int wstatus;
+
+ get_user_s32(wstatus, wstatus_addr);
+ print_wstatus(wstatus);
+ }
+ qemu_log(")");
+ }
+
+ qemu_log("\n");
+}
+#endif
+
+#ifdef TARGET_NR_wait4
+static void
+print_syscall_ret_wait4(CPUArchState *cpu_env,
+ const struct syscallname *name,
+ abi_long ret, abi_long arg0, abi_long arg1,
+ abi_long arg2, abi_long arg3, abi_long arg4,
+ abi_long arg5)
+{
+ print_ret_wstatus(ret, arg1);
+}
+#endif
+
+#ifdef TARGET_NR_waitpid
+static void
+print_syscall_ret_waitpid(CPUArchState *cpu_env,
+ const struct syscallname *name,
+ abi_long ret, abi_long arg0, abi_long arg1,
+ abi_long arg2, abi_long arg3, abi_long arg4,
+ abi_long arg5)
+{
+ print_ret_wstatus(ret, arg1);
+}
+#endif
+
/*
* An array of all of the syscalls we know about
*/
diff --git a/linux-user/strace.list b/linux-user/strace.list
index dfd4237d14e..2bb6f2726a8 100644
--- a/linux-user/strace.list
+++ b/linux-user/strace.list
@@ -1659,13 +1659,15 @@
{ TARGET_NR_vserver, "vserver" , NULL, NULL, NULL },
#endif
#ifdef TARGET_NR_wait4
-{ TARGET_NR_wait4, "wait4" , "%s(%d,%p,%d,%p)", NULL, NULL },
+{ TARGET_NR_wait4, "wait4" , "%s(%d,%p,%d,%p)", NULL,
+ print_syscall_ret_wait4 },
#endif
#ifdef TARGET_NR_waitid
{ TARGET_NR_waitid, "waitid" , "%s(%#x,%d,%p,%#x)", NULL, NULL },
#endif
#ifdef TARGET_NR_waitpid
-{ TARGET_NR_waitpid, "waitpid" , "%s(%d,%p,%#x)", NULL, NULL },
+{ TARGET_NR_waitpid, "waitpid", "%s(%d,%p,%#x)", NULL,
+ print_syscall_ret_waitpid },
#endif
#ifdef TARGET_NR_write
{ TARGET_NR_write, "write" , "%s(%d,%#x,%d)", NULL, NULL },
--
2.46.2
^ permalink raw reply related [flat|nested] 3+ messages in thread* Re: [PATCH] linux-user: Trace wait4()'s and waitpid()'s wstatus
2024-10-01 19:32 [PATCH] linux-user: Trace wait4()'s and waitpid()'s wstatus Ilya Leoshkevich
@ 2024-10-05 17:57 ` Richard Henderson
2024-10-05 18:04 ` Richard Henderson
0 siblings, 1 reply; 3+ messages in thread
From: Richard Henderson @ 2024-10-05 17:57 UTC (permalink / raw)
To: Ilya Leoshkevich, Laurent Vivier; +Cc: qemu-devel
On 10/1/24 12:32, Ilya Leoshkevich wrote:
> Borrow the code for formatting the most frequent WIFEXITED() and
> WIFSIGNALED() special cases from from the strace's printstatus().
>
> Output examples:
>
> 474729 wait4(-1,0x7f00767ff0a0,0,(nil)) = 474733 (wstatus={WIFEXITED(s) && WEXITSTATUS(s) == 1})
> 475833 wait4(-1,0x7f7de61ff0a0,0,(nil)) = 475837 (wstatus={WIFSIGNALED(s) && WTERMSIG(s) == SIGKILL})
> 1168 waitpid(1171,0x7f44eea00340,0) = 1171 (wstatus={WIFSIGNALED(s) && WTERMSIG(s) == SIGKILL})
>
> Signed-off-by: Ilya Leoshkevich <iii@linux.ibm.com>
> ---
> linux-user/strace.c | 61 ++++++++++++++++++++++++++++++++++++++++++
> linux-user/strace.list | 6 +++--
> 2 files changed, 65 insertions(+), 2 deletions(-)
>
> diff --git a/linux-user/strace.c b/linux-user/strace.c
> index b4d1098170e..d5d1f18304d 100644
> --- a/linux-user/strace.c
> +++ b/linux-user/strace.c
> @@ -4168,6 +4168,67 @@ print_ioctl(CPUArchState *cpu_env, const struct syscallname *name,
> }
> #endif
>
> +#if defined(TARGET_NR_wait4) || defined(TARGET_NR_waitpid)
> +static void print_wstatus(int wstatus)
> +{
> + if (WIFSIGNALED(wstatus)) {
> + qemu_log("{WIFSIGNALED(s) && WTERMSIG(s) == ");
> + print_signal(WTERMSIG(wstatus), 1);
> + if (WCOREDUMP(wstatus)) {
> + qemu_log(" && WCOREDUMP(s)");
> + }
> + qemu_log("}");
> + } else if (WIFEXITED(wstatus)) {
> + qemu_log("{WIFEXITED(s) && WEXITSTATUS(s) == %d}",
> + WEXITSTATUS(wstatus));
> + } else {
> + print_number(wstatus, 1);
> + }
> +}
> +
> +static void print_ret_wstatus(abi_long ret, abi_long wstatus_addr)
> +{
> + if (!print_syscall_err(ret)) {
> + qemu_log(TARGET_ABI_FMT_ld " (wstatus=", ret);
> + if (wstatus_addr == 0) {
> + qemu_log("NULL");
I think you could merge the == 0 check into the outer IF, and avoid printing the returned
wstatus entirely.
Otherwise
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
r~
^ permalink raw reply [flat|nested] 3+ messages in thread* Re: [PATCH] linux-user: Trace wait4()'s and waitpid()'s wstatus
2024-10-05 17:57 ` Richard Henderson
@ 2024-10-05 18:04 ` Richard Henderson
0 siblings, 0 replies; 3+ messages in thread
From: Richard Henderson @ 2024-10-05 18:04 UTC (permalink / raw)
To: Ilya Leoshkevich, Laurent Vivier; +Cc: qemu-devel
On 10/5/24 10:57, Richard Henderson wrote:
> On 10/1/24 12:32, Ilya Leoshkevich wrote:
>> Borrow the code for formatting the most frequent WIFEXITED() and
>> WIFSIGNALED() special cases from from the strace's printstatus().
>>
>> Output examples:
>>
>> 474729 wait4(-1,0x7f00767ff0a0,0,(nil)) = 474733 (wstatus={WIFEXITED(s) &&
>> WEXITSTATUS(s) == 1})
>> 475833 wait4(-1,0x7f7de61ff0a0,0,(nil)) = 475837 (wstatus={WIFSIGNALED(s) &&
>> WTERMSIG(s) == SIGKILL})
>> 1168 waitpid(1171,0x7f44eea00340,0) = 1171 (wstatus={WIFSIGNALED(s) && WTERMSIG(s)
>> == SIGKILL})
>>
>> Signed-off-by: Ilya Leoshkevich <iii@linux.ibm.com>
>> ---
>> linux-user/strace.c | 61 ++++++++++++++++++++++++++++++++++++++++++
>> linux-user/strace.list | 6 +++--
>> 2 files changed, 65 insertions(+), 2 deletions(-)
>>
>> diff --git a/linux-user/strace.c b/linux-user/strace.c
>> index b4d1098170e..d5d1f18304d 100644
>> --- a/linux-user/strace.c
>> +++ b/linux-user/strace.c
>> @@ -4168,6 +4168,67 @@ print_ioctl(CPUArchState *cpu_env, const struct syscallname *name,
>> }
>> #endif
>> +#if defined(TARGET_NR_wait4) || defined(TARGET_NR_waitpid)
>> +static void print_wstatus(int wstatus)
>> +{
>> + if (WIFSIGNALED(wstatus)) {
>> + qemu_log("{WIFSIGNALED(s) && WTERMSIG(s) == ");
>> + print_signal(WTERMSIG(wstatus), 1);
>> + if (WCOREDUMP(wstatus)) {
>> + qemu_log(" && WCOREDUMP(s)");
>> + }
>> + qemu_log("}");
>> + } else if (WIFEXITED(wstatus)) {
>> + qemu_log("{WIFEXITED(s) && WEXITSTATUS(s) == %d}",
>> + WEXITSTATUS(wstatus));
>> + } else {
>> + print_number(wstatus, 1);
>> + }
>> +}
>> +
>> +static void print_ret_wstatus(abi_long ret, abi_long wstatus_addr)
>> +{
>> + if (!print_syscall_err(ret)) {
>> + qemu_log(TARGET_ABI_FMT_ld " (wstatus=", ret);
>> + if (wstatus_addr == 0) {
>> + qemu_log("NULL");
>
> I think you could merge the == 0 check into the outer IF, and avoid printing the returned
> wstatus entirely.
>
> Otherwise
> Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Adjusted and queued.
r~
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2024-10-05 18:04 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2024-10-01 19:32 [PATCH] linux-user: Trace wait4()'s and waitpid()'s wstatus Ilya Leoshkevich
2024-10-05 17:57 ` Richard Henderson
2024-10-05 18:04 ` Richard Henderson
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).