[SCM] strace branch, master, updated. v4.10-25-g8497b62

[Dmitry V. Levin]

On Tue, Mar 24, 2015 at 05:13:13AM +0300, Dmitry V. Levin wrote:
> It also doesn't work on alpha and s390/s390x:
> 
> $ sleep 2 & sleep 1; ./strace -erestart_syscall -p $!
> [1] 12345
> Process 12345 attached
> restart_syscall(<... resuming interrupted unknown ...>) = 0
> +++ exited with 0 +++
> [1]+  Done                    sleep 2

I think this "resuming interrupted unknown" message is confusing.
If you could find a better fix than this, please apply it.

--- a/signal.c
+++ b/signal.c
@@ -747,7 +747,7 @@ sys_restart_syscall(struct tcb *tcp)
 {
 	if (entering(tcp)) {
 		tprintf("<... resuming interrupted %s ...>",
-			tcp->s_prev_ent
+			tcp->s_prev_ent && strcmp(tcp->s_prev_ent->sys_name, "unknown")
 			? tcp->s_prev_ent->sys_name
 			: "system call"
 		);

-- 
ldv
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 181 bytes
Desc: not available
URL: <http://lists.strace.io/pipermail/strace-devel/attachments/20150407/c4d229cd/attachment.bin>