svn commit: r286789 - stable/10/usr.bin/truss

[Ed Maste]

Author: emaste
Date: Fri Aug 14 21:44:42 2015
New Revision: 286789
URL: https://svnweb.freebsd.org/changeset/base/286789

Log:
  MFC r285842: truss: follow pdfork()ed descendents with -f

Modified:
  stable/10/usr.bin/truss/amd64-fbsd.c
  stable/10/usr.bin/truss/amd64-fbsd32.c
  stable/10/usr.bin/truss/arm-fbsd.c
  stable/10/usr.bin/truss/i386-fbsd.c
  stable/10/usr.bin/truss/mips-fbsd.c
  stable/10/usr.bin/truss/powerpc-fbsd.c
  stable/10/usr.bin/truss/powerpc64-fbsd.c
  stable/10/usr.bin/truss/sparc64-fbsd.c
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/usr.bin/truss/amd64-fbsd.c
==============================================================================
--- stable/10/usr.bin/truss/amd64-fbsd.c	Fri Aug 14 21:44:15 2015	(r286788)
+++ stable/10/usr.bin/truss/amd64-fbsd.c	Fri Aug 14 21:44:42 2015	(r286789)
@@ -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: stable/10/usr.bin/truss/amd64-fbsd32.c
==============================================================================
--- stable/10/usr.bin/truss/amd64-fbsd32.c	Fri Aug 14 21:44:15 2015	(r286788)
+++ stable/10/usr.bin/truss/amd64-fbsd32.c	Fri Aug 14 21:44:42 2015	(r286789)
@@ -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: stable/10/usr.bin/truss/arm-fbsd.c
==============================================================================
--- stable/10/usr.bin/truss/arm-fbsd.c	Fri Aug 14 21:44:15 2015	(r286788)
+++ stable/10/usr.bin/truss/arm-fbsd.c	Fri Aug 14 21:44:42 2015	(r286789)
@@ -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: stable/10/usr.bin/truss/i386-fbsd.c
==============================================================================
--- stable/10/usr.bin/truss/i386-fbsd.c	Fri Aug 14 21:44:15 2015	(r286788)
+++ stable/10/usr.bin/truss/i386-fbsd.c	Fri Aug 14 21:44:42 2015	(r286789)
@@ -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: stable/10/usr.bin/truss/mips-fbsd.c
==============================================================================
--- stable/10/usr.bin/truss/mips-fbsd.c	Fri Aug 14 21:44:15 2015	(r286788)
+++ stable/10/usr.bin/truss/mips-fbsd.c	Fri Aug 14 21:44:42 2015	(r286789)
@@ -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: stable/10/usr.bin/truss/powerpc-fbsd.c
==============================================================================
--- stable/10/usr.bin/truss/powerpc-fbsd.c	Fri Aug 14 21:44:15 2015	(r286788)
+++ stable/10/usr.bin/truss/powerpc-fbsd.c	Fri Aug 14 21:44:42 2015	(r286789)
@@ -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: stable/10/usr.bin/truss/powerpc64-fbsd.c
==============================================================================
--- stable/10/usr.bin/truss/powerpc64-fbsd.c	Fri Aug 14 21:44:15 2015	(r286788)
+++ stable/10/usr.bin/truss/powerpc64-fbsd.c	Fri Aug 14 21:44:42 2015	(r286789)
@@ -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: stable/10/usr.bin/truss/sparc64-fbsd.c
==============================================================================
--- stable/10/usr.bin/truss/sparc64-fbsd.c	Fri Aug 14 21:44:15 2015	(r286788)
+++ stable/10/usr.bin/truss/sparc64-fbsd.c	Fri Aug 14 21:44:42 2015	(r286789)
@@ -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;