Attachment 155252 Details for Bug 240961 – Bugfix (this time incl. the forgotten ChangeLog entry).

[patch] Bugfix (this time incl. the forgotten ChangeLog entry).

strace-4.5.15-detach-zombie.patch (text/plain), 1.22 KB, created by Jan Kratochvil on 2007-05-23 14:54:32 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jan Kratochvil

Created: 2007-05-23 14:54:32 UTC

Size: 1.22 KB

patch

obsolete

>2007-05-23  Jan Kratochvil  <jan.kratochvil@redhat.com>
>
>	* strace.c (detach): New prototype.
>	[LINUX] (detach): Call droptcb() instead of the corrupted detach() call.
>	(handle_group_exit): Likewise.
>
>--- strace-4.5.15-orig/strace.c	2006-12-13 22:55:39.000000000 +0100
>+++ strace-4.5.15/strace.c	2007-05-23 16:09:24.000000000 +0200
>@@ -83,6 +83,7 @@ unsigned int nprocs, tcbtabsize;
> char *progname;
> extern char **environ;
> 
>+static int detach P((struct tcb *tcp, int sig));
> static int trace P((void));
> static void cleanup P((void));
> static void interrupt P((int sig));
>@@ -1460,8 +1461,12 @@ int sig;
> 	droptcb(tcp);
> 
> #ifdef LINUX
>-	if (zombie != NULL)
>-		error = detach(zombie) || error;
>+	if (zombie != NULL) {
>+		/* Never call DETACH again as both unattached and
>+		   attached-unstopped processes give ESRCH and we would SIGSTOP
>+		   the already unattached process.  */
>+		droptcb(zombie);
>+	}
> #endif
> 
> 	return error;
>@@ -2035,7 +2040,7 @@ handle_group_exit(struct tcb *tcp, int s
> 			fprintf(stderr,
> 				"PANIC: handle_group_exit: %d leader %d\n",
> 				tcp->pid, leader ? leader->pid : -1);
>-		detach(tcp);	/* Already died.  */
>+		droptcb(tcp);	/* Already died.  */
> 	}
> 	else {
> 		/* Mark that we are taking the process down.  */

Actions: View | Diff

Attachments on bug 240961: 155241 | 155245 | 155252 | 155366 | 155367 | 156669