Attachment 159827 Details for Bug 247907 – patch does not work

[patch] patch does not work

foo.patch (text/plain), 1.58 KB, created by Roland McGrath on 2007-07-24 02:15:36 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Roland McGrath

Created: 2007-07-24 02:15:36 UTC

Size: 1.58 KB

patch

obsolete

>Index: strace.c
>===================================================================
>RCS file: /cvsroot/strace/strace/strace.c,v
>retrieving revision 1.81
>diff -u -r1.81 strace.c
>--- strace.c	11 Jul 2007 08:35:11 -0000	1.81
>+++ strace.c	24 Jul 2007 02:13:45 -0000
>@@ -2114,32 +2114,16 @@
> 	else {
> 		/* Mark that we are taking the process down.  */
> 		tcp->flags |= TCB_EXITING | TCB_GROUP_EXITING;
>-		if (tcp->flags & TCB_ATTACHED) {
>+		if (leader != NULL)
>+			leader->flags |= TCB_GROUP_EXITING;
>+		if (tcp->flags & TCB_ATTACHED)
> 			detach(tcp, sig);
>-		  	if (leader != NULL && leader != tcp) {
>-				if ((leader->flags & TCB_ATTACHED) &&
>-				    !(leader->flags & TCB_EXITING)) {
>-					/* We need to detach the leader so
>-					   that the process death will be
>-					   reported to its real parent.  */
>-					if (debug)
>-						fprintf(stderr,
>-							" [%d exit %d detaches %d]\n",
>-							tcp->pid, sig, leader->pid);
>-					detach(leader, sig);
>-				}
>-				else
>-					leader->flags |= TCB_GROUP_EXITING;
>-			}
>-		}
> 		else if (ptrace(PTRACE_CONT, tcp->pid, (char *) 1, sig) < 0) {
> 			perror("strace: ptrace(PTRACE_CONT, ...)");
> 			cleanup();
> 			return -1;
> 		}
> 		else {
>-			if (leader != NULL)
>-				leader->flags |= TCB_GROUP_EXITING;
> 			if (leader != NULL && leader != tcp)
> 				droptcb(tcp);
> 			/* The leader will report to us as parent now,
>@@ -2316,6 +2300,7 @@
> 				fprintf(stderr, "pid %u exited\n", pid);
> 			if ((tcp->flags & TCB_ATTACHED)
> #ifdef TCB_GROUP_EXITING
>+			    && !(tcp->flags & TCB_GROUP_EXITING)
> 			    && !(tcp->parent && (tcp->parent->flags &
> 						 TCB_GROUP_EXITING))
> #endif

Actions: View | Diff

Attachments on bug 247907: 159013 | 159827 | 160505