svn commit: r285842 - head/usr.bin/truss

[Ed Maste]

Author: emaste
Date: Fri Jul 24 16:57:13 2015
New Revision: 285842
URL: https://svnweb.freebsd.org/changeset/base/285842

Log:
  truss: follow pdfork()ed descendents with -f
  
  PR:		201276
  Reported by:	David Drysdale
  Reviewed by:	oshogbo
  MFC after:	1 week
  Sponsored by:	The FreeBSD Foundation
  Differential Revision:	https://reviews.freebsd.org/D2976

Modified:
  head/usr.bin/truss/amd64-fbsd.c
  head/usr.bin/truss/amd64-fbsd32.c
  head/usr.bin/truss/arm-fbsd.c
  head/usr.bin/truss/i386-fbsd.c
  head/usr.bin/truss/mips-fbsd.c
  head/usr.bin/truss/powerpc-fbsd.c
  head/usr.bin/truss/powerpc64-fbsd.c
  head/usr.bin/truss/sparc64-fbsd.c

Modified: head/usr.bin/truss/amd64-fbsd.c
==============================================================================
--- head/usr.bin/truss/amd64-fbsd.c	Fri Jul 24 16:52:21 2015	(r285841)
+++ head/usr.bin/truss/amd64-fbsd.c	Fri Jul 24 16:57:13 2015	(r285842)
@@ -158,6 +158,7 @@ amd64_syscall_entry(struct trussinfo *tr
 
 	if (fsc->name && (trussinfo->flags & FOLLOWFORKS) &&
 	    (strcmp(fsc->name, "fork") == 0 ||
+	    strcmp(fsc->name, "pdfork") == 0 ||
 	    strcmp(fsc->name, "rfork") == 0 ||
 	    strcmp(fsc->name, "vfork") == 0))
 		trussinfo->curthread->in_fork = 1;

Modified: head/usr.bin/truss/amd64-fbsd32.c
==============================================================================
--- head/usr.bin/truss/amd64-fbsd32.c	Fri Jul 24 16:52:21 2015	(r285841)
+++ head/usr.bin/truss/amd64-fbsd32.c	Fri Jul 24 16:57:13 2015	(r285842)
@@ -165,6 +165,7 @@ amd64_fbsd32_syscall_entry(struct trussi
 
 	if (fsc->name && (trussinfo->flags & FOLLOWFORKS) &&
 	    (strcmp(fsc->name, "fork") == 0 ||
+	    strcmp(fsc->name, "pdfork") == 0 ||
 	    strcmp(fsc->name, "rfork") == 0 ||
 	    strcmp(fsc->name, "vfork") == 0))
 		trussinfo->curthread->in_fork = 1;

Modified: head/usr.bin/truss/arm-fbsd.c
==============================================================================
--- head/usr.bin/truss/arm-fbsd.c	Fri Jul 24 16:52:21 2015	(r285841)
+++ head/usr.bin/truss/arm-fbsd.c	Fri Jul 24 16:57:13 2015	(r285842)
@@ -172,6 +172,7 @@ arm_syscall_entry(struct trussinfo *trus
 
 	if (fsc->name && (trussinfo->flags & FOLLOWFORKS) &&
 	    (strcmp(fsc->name, "fork") == 0 ||
+	    strcmp(fsc->name, "pdfork") == 0 ||
 	    strcmp(fsc->name, "rfork") == 0 ||
 	    strcmp(fsc->name, "vfork") == 0))
 		trussinfo->curthread->in_fork = 1;

Modified: head/usr.bin/truss/i386-fbsd.c
==============================================================================
--- head/usr.bin/truss/i386-fbsd.c	Fri Jul 24 16:52:21 2015	(r285841)
+++ head/usr.bin/truss/i386-fbsd.c	Fri Jul 24 16:57:13 2015	(r285842)
@@ -162,6 +162,7 @@ i386_syscall_entry(struct trussinfo *tru
 
 	if (fsc->name && (trussinfo->flags & FOLLOWFORKS) &&
 	    (strcmp(fsc->name, "fork") == 0 ||
+	    strcmp(fsc->name, "pdfork") == 0 ||
 	    strcmp(fsc->name, "rfork") == 0 ||
 	    strcmp(fsc->name, "vfork") == 0))
 		trussinfo->curthread->in_fork = 1;

Modified: head/usr.bin/truss/mips-fbsd.c
==============================================================================
--- head/usr.bin/truss/mips-fbsd.c	Fri Jul 24 16:52:21 2015	(r285841)
+++ head/usr.bin/truss/mips-fbsd.c	Fri Jul 24 16:57:13 2015	(r285842)
@@ -155,6 +155,7 @@ mips_syscall_entry(struct trussinfo *tru
 
 	if (fsc->name && (trussinfo->flags & FOLLOWFORKS) &&
 	    (strcmp(fsc->name, "fork") == 0 ||
+	    strcmp(fsc->name, "pdfork") == 0 ||
 	    strcmp(fsc->name, "rfork") == 0 ||
 	    strcmp(fsc->name, "vfork") == 0))
 		trussinfo->curthread->in_fork = 1;

Modified: head/usr.bin/truss/powerpc-fbsd.c
==============================================================================
--- head/usr.bin/truss/powerpc-fbsd.c	Fri Jul 24 16:52:21 2015	(r285841)
+++ head/usr.bin/truss/powerpc-fbsd.c	Fri Jul 24 16:57:13 2015	(r285842)
@@ -169,6 +169,7 @@ powerpc_syscall_entry(struct trussinfo *
 
 	if (fsc->name && (trussinfo->flags & FOLLOWFORKS) &&
 	    (strcmp(fsc->name, "fork") == 0 ||
+	    strcmp(fsc->name, "pdfork") == 0 ||
 	    strcmp(fsc->name, "rfork") == 0 ||
 	    strcmp(fsc->name, "vfork") == 0))
 		trussinfo->curthread->in_fork = 1;

Modified: head/usr.bin/truss/powerpc64-fbsd.c
==============================================================================
--- head/usr.bin/truss/powerpc64-fbsd.c	Fri Jul 24 16:52:21 2015	(r285841)
+++ head/usr.bin/truss/powerpc64-fbsd.c	Fri Jul 24 16:57:13 2015	(r285842)
@@ -157,6 +157,7 @@ powerpc64_syscall_entry(struct trussinfo
 
 	if (fsc->name && (trussinfo->flags & FOLLOWFORKS) &&
 	    (strcmp(fsc->name, "fork") == 0 ||
+	    strcmp(fsc->name, "pdfork") == 0 ||
 	    strcmp(fsc->name, "rfork") == 0 ||
 	    strcmp(fsc->name, "vfork") == 0))
 		trussinfo->curthread->in_fork = 1;

Modified: head/usr.bin/truss/sparc64-fbsd.c
==============================================================================
--- head/usr.bin/truss/sparc64-fbsd.c	Fri Jul 24 16:52:21 2015	(r285841)
+++ head/usr.bin/truss/sparc64-fbsd.c	Fri Jul 24 16:57:13 2015	(r285842)
@@ -161,6 +161,7 @@ sparc64_syscall_entry(struct trussinfo *
 
 	if (fsc->name && (trussinfo->flags & FOLLOWFORKS) &&
 	    (strcmp(fsc->name, "fork") == 0 ||
+	    strcmp(fsc->name, "pdfork") == 0 ||
 	    strcmp(fsc->name, "rfork") == 0 ||
 	    strcmp(fsc->name, "vfork") == 0))
 		trussinfo->curthread->in_fork = 1;