diff options
| author | Dmitry V. Levin <ldv@strace.io> | 2022-12-25 08:00:00 +0000 |
|---|---|---|
| committer | Dmitry V. Levin <ldv@strace.io> | 2022-12-25 08:00:00 +0000 |
| commit | bad9019da0d4682700b6428eb7e5eec8f05daba0 (patch) | |
| tree | 3908114ab8391292153a7dc7c91b0151b95a22bc | |
| parent | 2afe6f829d0a8827ea340f5a52afb504b9321a6d (diff) | |
| download | strace-bad9019da0d4682700b6428eb7e5eec8f05daba0.tar.gz | |
syscall: introduce print_erestart helper
* src/syscall.c (print_erestart): New function.
(syscall_exiting_trace): Use it.
| -rw-r--r-- | src/syscall.c | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/src/syscall.c b/src/syscall.c index 2c025091a..46ff6758d 100644 --- a/src/syscall.c +++ b/src/syscall.c @@ -770,6 +770,12 @@ print_injected_note(struct tcb *tcp) tprints_string(" (DELAYED)"); } +static void +print_erestart(const char *err_short, const char *err_long) +{ + tprintf_string("= ? %s (%s)", err_short, err_long); +} + int syscall_exiting_trace(struct tcb *tcp, struct timespec *ts, int res) { @@ -860,13 +866,13 @@ syscall_exiting_trace(struct tcb *tcp, struct timespec *ts, int res) * The system call will be restarted with the same arguments * if SA_RESTART is set; otherwise, it will fail with EINTR. */ - tprints_string("= ? ERESTARTSYS (To be restarted if SA_RESTART is set)"); + print_erestart("ERESTARTSYS", "To be restarted if SA_RESTART is set"); break; case ERESTARTNOINTR: /* Rare. For example, fork() returns this if interrupted. * SA_RESTART is ignored (assumed set): the restart is unconditional. */ - tprints_string("= ? ERESTARTNOINTR (To be restarted)"); + print_erestart("ERESTARTNOINTR", "To be restarted"); break; case ERESTARTNOHAND: /* pause(), rt_sigsuspend() etc use this code. @@ -876,7 +882,7 @@ syscall_exiting_trace(struct tcb *tcp, struct timespec *ts, int res) * after SIG_IGN or SIG_DFL signal it will restart * (thus the name "restart only if has no handler"). */ - tprints_string("= ? ERESTARTNOHAND (To be restarted if no handler)"); + print_erestart("ERESTARTNOHAND", "To be restarted if no handler"); break; case ERESTART_RESTARTBLOCK: /* Syscalls like nanosleep(), poll() which can't be @@ -890,7 +896,7 @@ syscall_exiting_trace(struct tcb *tcp, struct timespec *ts, int res) * which in turn saves another such restart block, * old data is lost and restart becomes impossible) */ - tprints_string("= ? ERESTART_RESTARTBLOCK (Interrupted by signal)"); + print_erestart("ERESTART_RESTARTBLOCK", "Interrupted by signal"); break; default: print_err_ret(tcp->u_rval, tcp->u_error); |