[Midnightbsd-cvs] src [11512] trunk/usr.bin/ktrace: sync with freebsd.

laffer1 at midnightbsd.org laffer1 at midnightbsd.org
Sat Jul 7 15:16:32 EDT 2018


Revision: 11512
          http://svnweb.midnightbsd.org/src/?rev=11512
Author:   laffer1
Date:     2018-07-07 15:16:31 -0400 (Sat, 07 Jul 2018)
Log Message:
-----------
sync with freebsd.

Modified Paths:
--------------
    trunk/usr.bin/ktrace/Makefile
    trunk/usr.bin/ktrace/ktrace.1
    trunk/usr.bin/ktrace/ktrace.c
    trunk/usr.bin/ktrace/ktrace.h
    trunk/usr.bin/ktrace/subr.c

Property Changed:
----------------
    trunk/usr.bin/ktrace/ktrace.1

Modified: trunk/usr.bin/ktrace/Makefile
===================================================================
--- trunk/usr.bin/ktrace/Makefile	2018-07-07 19:16:18 UTC (rev 11511)
+++ trunk/usr.bin/ktrace/Makefile	2018-07-07 19:16:31 UTC (rev 11512)
@@ -1,5 +1,6 @@
+# $MidnightBSD$
 #	@(#)Makefile	1.1 (Berkeley) 6/6/93
-# $MidnightBSD$
+# $FreeBSD: stable/10/usr.bin/ktrace/Makefile 226504 2011-10-18 08:26:12Z des $
 
 PROG=	ktrace
 SRCS=	ktrace.c subr.c

Modified: trunk/usr.bin/ktrace/ktrace.1
===================================================================
--- trunk/usr.bin/ktrace/ktrace.1	2018-07-07 19:16:18 UTC (rev 11511)
+++ trunk/usr.bin/ktrace/ktrace.1	2018-07-07 19:16:31 UTC (rev 11512)
@@ -1,3 +1,4 @@
+.\" $MidnightBSD$
 .\" Copyright (c) 1990, 1993
 .\"	The Regents of the University of California.  All rights reserved.
 .\"
@@ -26,9 +27,9 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)ktrace.1	8.1 (Berkeley) 6/6/93
-.\" $MidnightBSD$
+.\" $FreeBSD: stable/10/usr.bin/ktrace/ktrace.1 297930 2016-04-13 16:47:14Z brooks $
 .\"
-.Dd May 31, 2012
+.Dd March 31, 2016
 .Dt KTRACE 1
 .Os
 .Sh NAME
@@ -81,7 +82,7 @@
 Disable tracing on all user-owned processes, and, if executed by root, all
 processes in the system.
 .It Fl c
-Clear the trace points associated with the specified file or processes.
+Clear the specified trace points associated with the given file or processes.
 .It Fl d
 Descendants; perform the operation for all current children of the
 designated processes.
@@ -102,9 +103,11 @@
 .Fl p
 flag is permitted).
 .It Fl t Ar trstr
-The string argument represents the kernel trace points, one per letter.
-The following table equates the letters with the tracepoints:
+Specify the list of trace points to enable or disable, one per letter.
+If an explicit list is not specified, the default set of trace points is used.
 .Pp
+The following trace points are supported:
+.Pp
 .Bl -tag -width flag -compact
 .It Cm c
 trace system calls
@@ -115,6 +118,8 @@
 .Tn I/O
 .It Cm n
 trace namei translations
+.It Cm p
+trace capability check failures
 .It Cm s
 trace signal processing
 .It Cm t
@@ -129,7 +134,7 @@
 requests
 .It Cm +
 trace the default set of trace points -
-.Cm c , i , n , s , t , u , y
+.Cm c , i , n , p , s , t , u , y
 .El
 .It Ar command
 Execute
@@ -171,7 +176,8 @@
 # disable tracing of all user-owned processes
 .Dl $ ktrace -C
 .Sh SEE ALSO
-.Xr kdump 1
+.Xr kdump 1 ,
+.Xr ktrace 2
 .Sh HISTORY
 The
 .Nm


Property changes on: trunk/usr.bin/ktrace/ktrace.1
___________________________________________________________________
Added: svn:keywords
## -0,0 +1 ##
+MidnightBSD=%H
\ No newline at end of property
Modified: trunk/usr.bin/ktrace/ktrace.c
===================================================================
--- trunk/usr.bin/ktrace/ktrace.c	2018-07-07 19:16:18 UTC (rev 11511)
+++ trunk/usr.bin/ktrace/ktrace.c	2018-07-07 19:16:31 UTC (rev 11512)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
 /*-
  * Copyright (c) 1988, 1993
  *	The Regents of the University of California.  All rights reserved.
@@ -40,7 +41,7 @@
 #endif
 
 #include <sys/cdefs.h>
-__MBSDID("$MidnightBSD$");
+__FBSDID("$FreeBSD: stable/10/usr.bin/ktrace/ktrace.c 226504 2011-10-18 08:26:12Z des $");
 
 #include <sys/param.h>
 #include <sys/file.h>

Modified: trunk/usr.bin/ktrace/ktrace.h
===================================================================
--- trunk/usr.bin/ktrace/ktrace.h	2018-07-07 19:16:18 UTC (rev 11511)
+++ trunk/usr.bin/ktrace/ktrace.h	2018-07-07 19:16:31 UTC (rev 11512)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
 /*-
  * Copyright (c) 1988, 1993
  *	The Regents of the University of California.  All rights reserved.
@@ -27,12 +28,12 @@
  * SUCH DAMAGE.
  *
  *	@(#)ktrace.h	8.1 (Berkeley) 6/6/93
- * $MidnightBSD$
+ * $FreeBSD: stable/10/usr.bin/ktrace/ktrace.h 236357 2012-05-31 14:46:02Z jhb $
  */
 
 #define DEF_POINTS (KTRFAC_SYSCALL | KTRFAC_SYSRET | KTRFAC_NAMEI | \
 		    KTRFAC_GENIO | KTRFAC_PSIG | KTRFAC_USER | \
-		    KTRFAC_STRUCT | KTRFAC_SYSCTL)
+		    KTRFAC_STRUCT | KTRFAC_SYSCTL | KTRFAC_CAPFAIL)
 
 #define PROC_ABI_POINTS (KTRFAC_PROCCTOR | KTRFAC_PROCDTOR)
 

Modified: trunk/usr.bin/ktrace/subr.c
===================================================================
--- trunk/usr.bin/ktrace/subr.c	2018-07-07 19:16:18 UTC (rev 11511)
+++ trunk/usr.bin/ktrace/subr.c	2018-07-07 19:16:31 UTC (rev 11512)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
 /*-
  * Copyright (c) 1988, 1993
  *	The Regents of the University of California.  All rights reserved.
@@ -34,7 +35,7 @@
 #endif
 
 #include <sys/cdefs.h>
-__MBSDID("$MidnightBSD$");
+__FBSDID("$FreeBSD: stable/10/usr.bin/ktrace/subr.c 233925 2012-04-05 17:13:14Z jhb $");
 
 #include <sys/param.h>
 #include <sys/file.h>
@@ -61,6 +62,9 @@
 		case 'c':
 			facs |= KTRFAC_SYSCALL | KTRFAC_SYSRET;
 			break;
+		case 'i':
+			facs |= KTRFAC_GENIO;
+			break;
 		case 'f':
 			facs |= KTRFAC_FAULT | KTRFAC_FAULTEND;
 			break;
@@ -67,8 +71,8 @@
 		case 'n':
 			facs |= KTRFAC_NAMEI;
 			break;
-		case 'i':
-			facs |= KTRFAC_GENIO;
+		case 'p':
+			facs |= KTRFAC_CAPFAIL;
 			break;
 		case 's':
 			facs |= KTRFAC_PSIG;



More information about the Midnightbsd-cvs mailing list