[Midnightbsd-cvs] src [9154] trunk/sys/cddl/contrib/opensolaris/uts/common/sys: sync with freebsd 9.2 release.

laffer1 at midnightbsd.org laffer1 at midnightbsd.org
Thu Oct 13 22:04:19 EDT 2016


Revision: 9154
          http://svnweb.midnightbsd.org/src/?rev=9154
Author:   laffer1
Date:     2016-10-13 22:04:19 -0400 (Thu, 13 Oct 2016)
Log Message:
-----------
sync with freebsd 9.2 release.

Modified Paths:
--------------
    trunk/sys/cddl/contrib/opensolaris/uts/common/sys/dtrace.h
    trunk/sys/cddl/contrib/opensolaris/uts/common/sys/dtrace_impl.h
    trunk/sys/cddl/contrib/opensolaris/uts/common/sys/fm/fs/zfs.h

Modified: trunk/sys/cddl/contrib/opensolaris/uts/common/sys/dtrace.h
===================================================================
--- trunk/sys/cddl/contrib/opensolaris/uts/common/sys/dtrace.h	2016-10-14 02:00:57 UTC (rev 9153)
+++ trunk/sys/cddl/contrib/opensolaris/uts/common/sys/dtrace.h	2016-10-14 02:04:19 UTC (rev 9154)
@@ -303,13 +303,15 @@
 #define	DIF_SUBR_INET_NTOP		41
 #define	DIF_SUBR_INET_NTOA		42
 #define	DIF_SUBR_INET_NTOA6		43
-#define	DIF_SUBR_MEMREF			44
-#define	DIF_SUBR_TYPEREF		45
-#define	DIF_SUBR_SX_SHARED_HELD		46
-#define	DIF_SUBR_SX_EXCLUSIVE_HELD	47
-#define	DIF_SUBR_SX_ISEXCLUSIVE		48
+#define	DIF_SUBR_TOUPPER		44
+#define	DIF_SUBR_TOLOWER		45
+#define	DIF_SUBR_MEMREF			46
+#define	DIF_SUBR_TYPEREF		47
+#define	DIF_SUBR_SX_SHARED_HELD		48
+#define	DIF_SUBR_SX_EXCLUSIVE_HELD	49
+#define	DIF_SUBR_SX_ISEXCLUSIVE		50
 
-#define	DIF_SUBR_MAX			48	/* max subroutine value */
+#define	DIF_SUBR_MAX			50	/* max subroutine value */
 
 typedef uint32_t dif_instr_t;
 
@@ -418,8 +420,10 @@
 #define	DTRACEACT_PRINTF		3	/* printf() action */
 #define	DTRACEACT_PRINTA		4	/* printa() action */
 #define	DTRACEACT_LIBACT		5	/* library-controlled action */
-#define	DTRACEACT_PRINTM		6	/* printm() action */
-#define	DTRACEACT_PRINTT		7	/* printt() action */
+#define	DTRACEACT_TRACEMEM		6	/* tracemem() action */
+#define	DTRACEACT_TRACEMEM_DYNSIZE	7	/* dynamic tracemem() size */
+#define	DTRACEACT_PRINTM		8	/* printm() action (BSD) */
+#define	DTRACEACT_PRINTT		9	/* printt() action (BSD) */
 
 #define	DTRACEACT_PROC			0x0100
 #define	DTRACEACT_USTACK		(DTRACEACT_PROC + 1)

Modified: trunk/sys/cddl/contrib/opensolaris/uts/common/sys/dtrace_impl.h
===================================================================
--- trunk/sys/cddl/contrib/opensolaris/uts/common/sys/dtrace_impl.h	2016-10-14 02:00:57 UTC (rev 9153)
+++ trunk/sys/cddl/contrib/opensolaris/uts/common/sys/dtrace_impl.h	2016-10-14 02:04:19 UTC (rev 9154)
@@ -18,7 +18,7 @@
  *
  * CDDL HEADER END
  *
- * $FreeBSD$
+ * $FreeBSD: release/9.2.0/sys/cddl/contrib/opensolaris/uts/common/sys/dtrace_impl.h 250484 2013-05-10 21:12:55Z pfg $
  */
 
 /*
@@ -26,11 +26,13 @@
  * Use is subject to license terms.
  */
 
+/*
+ * Copyright (c) 2011, Joyent, Inc. All rights reserved.
+ */
+
 #ifndef _SYS_DTRACE_IMPL_H
 #define	_SYS_DTRACE_IMPL_H
 
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
-
 #ifdef	__cplusplus
 extern "C" {
 #endif
@@ -429,8 +431,11 @@
 	uint32_t dtb_errors;			/* number of errors */
 	uint32_t dtb_xamot_errors;		/* errors in inactive buffer */
 #ifndef _LP64
-	uint64_t dtb_pad1;
+	uint64_t dtb_pad1;			/* pad out to 64 bytes */
 #endif
+	uint64_t dtb_switched;			/* time of last switch */
+	uint64_t dtb_interval;			/* observed switch interval */
+	uint64_t dtb_pad2[6];			/* pad to avoid false sharing */
 } dtrace_buffer_t;
 
 /*
@@ -1162,7 +1167,7 @@
 	dtrace_pops_t dtpv_pops;		/* provider operations */
 	char *dtpv_name;			/* provider name */
 	void *dtpv_arg;				/* provider argument */
-	uint_t dtpv_defunct;			/* boolean: defunct provider */
+	hrtime_t dtpv_defunct;			/* when made defunct */
 	struct dtrace_provider *dtpv_next;	/* next provider */
 };
 

Modified: trunk/sys/cddl/contrib/opensolaris/uts/common/sys/fm/fs/zfs.h
===================================================================
--- trunk/sys/cddl/contrib/opensolaris/uts/common/sys/fm/fs/zfs.h	2016-10-14 02:00:57 UTC (rev 9153)
+++ trunk/sys/cddl/contrib/opensolaris/uts/common/sys/fm/fs/zfs.h	2016-10-14 02:04:19 UTC (rev 9154)
@@ -46,6 +46,7 @@
 #define	FM_EREPORT_ZFS_IO_FAILURE		"io_failure"
 #define	FM_EREPORT_ZFS_PROBE_FAILURE		"probe_failure"
 #define	FM_EREPORT_ZFS_LOG_REPLAY		"log_replay"
+#define	FM_EREPORT_ZFS_CONFIG_CACHE_WRITE	"config_cache_write"
 
 #define	FM_EREPORT_PAYLOAD_ZFS_POOL		"pool"
 #define	FM_EREPORT_PAYLOAD_ZFS_POOL_FAILMODE	"pool_failmode"



More information about the Midnightbsd-cvs mailing list