[Midnightbsd-cvs] src [9160] trunk/cddl/lib/libdtrace: sync with freebsd 9.2
laffer1 at midnightbsd.org
laffer1 at midnightbsd.org
Thu Oct 13 22:16:04 EDT 2016
Revision: 9160
http://svnweb.midnightbsd.org/src/?rev=9160
Author: laffer1
Date: 2016-10-13 22:16:04 -0400 (Thu, 13 Oct 2016)
Log Message:
-----------
sync with freebsd 9.2
Modified Paths:
--------------
trunk/cddl/lib/libdtrace/Makefile
trunk/cddl/lib/libdtrace/errno.d
trunk/cddl/lib/libdtrace/io.d
trunk/cddl/lib/libdtrace/libproc_compat.h
trunk/cddl/lib/libdtrace/net.d
trunk/cddl/lib/libdtrace/nfs.d
trunk/cddl/lib/libdtrace/psinfo.d
trunk/cddl/lib/libdtrace/regs_x86.d
trunk/cddl/lib/libdtrace/sched.d
trunk/cddl/lib/libdtrace/signal.d
Added Paths:
-----------
trunk/cddl/lib/libdtrace/nfssrv.d
Modified: trunk/cddl/lib/libdtrace/Makefile
===================================================================
--- trunk/cddl/lib/libdtrace/Makefile 2016-10-14 02:14:58 UTC (rev 9159)
+++ trunk/cddl/lib/libdtrace/Makefile 2016-10-14 02:16:04 UTC (rev 9160)
@@ -1,4 +1,5 @@
# $MidnightBSD$
+# $FreeBSD: release/9.2.0/cddl/lib/libdtrace/Makefile 249856 2013-04-24 20:10:52Z pfg $
.PATH: ${.CURDIR}/../../../cddl/contrib/opensolaris/lib/libdtrace/common
.PATH: ${.CURDIR}/../../../cddl/contrib/opensolaris/lib/libgen/common
@@ -32,6 +33,7 @@
dt_pcb.c \
dt_pid.c \
dt_pragma.c \
+ dt_print.c \
dt_printf.c \
dt_proc.c \
dt_program.c \
Modified: trunk/cddl/lib/libdtrace/errno.d
===================================================================
--- trunk/cddl/lib/libdtrace/errno.d 2016-10-14 02:14:58 UTC (rev 9159)
+++ trunk/cddl/lib/libdtrace/errno.d 2016-10-14 02:16:04 UTC (rev 9160)
@@ -21,7 +21,7 @@
*
* Portions Copyright 2006-2008 John Birrell jb at freebsd.org
*
- * $FreeBSD: src/cddl/lib/libdtrace/errno.d,v 1.1.2.1.2.1 2008/11/25 02:59:29 kensmith Exp $
+ * $FreeBSD: release/9.2.0/cddl/lib/libdtrace/errno.d 179189 2008-05-22 04:26:42Z jb $
*/
/*
* Copyright 2004 Sun Microsystems, Inc. All rights reserved.
Modified: trunk/cddl/lib/libdtrace/io.d
===================================================================
--- trunk/cddl/lib/libdtrace/io.d 2016-10-14 02:14:58 UTC (rev 9159)
+++ trunk/cddl/lib/libdtrace/io.d 2016-10-14 02:16:04 UTC (rev 9160)
@@ -18,7 +18,7 @@
*
* CDDL HEADER END
*
- * $FreeBSD$
+ * $FreeBSD: release/9.2.0/cddl/lib/libdtrace/io.d 243989 2012-12-07 19:06:40Z gnn $
*/
/*
* Copyright 2006 Sun Microsystems, Inc. All rights reserved.
Modified: trunk/cddl/lib/libdtrace/libproc_compat.h
===================================================================
--- trunk/cddl/lib/libdtrace/libproc_compat.h 2016-10-14 02:14:58 UTC (rev 9159)
+++ trunk/cddl/lib/libdtrace/libproc_compat.h 2016-10-14 02:16:04 UTC (rev 9160)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
/*
* Copyright (c) 2010 The FreeBSD Foundation
* All rights reserved.
@@ -26,7 +27,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $FreeBSD$
+ * $FreeBSD: release/9.2.0/cddl/lib/libdtrace/libproc_compat.h 211554 2010-08-21 11:50:53Z rpaulo $
*/
/*
Modified: trunk/cddl/lib/libdtrace/net.d
===================================================================
--- trunk/cddl/lib/libdtrace/net.d 2016-10-14 02:14:58 UTC (rev 9159)
+++ trunk/cddl/lib/libdtrace/net.d 2016-10-14 02:16:04 UTC (rev 9160)
@@ -20,7 +20,7 @@
*
* Portions Copyright 2006-2008 John Birrell jb at freebsd.org
*
- * $FreeBSD: src/cddl/lib/libdtrace/net.d,v 1.1.2.1.2.1 2008/11/25 02:59:29 kensmith Exp $
+ * $FreeBSD: release/9.2.0/cddl/lib/libdtrace/net.d 179189 2008-05-22 04:26:42Z jb $
*/
/*
Modified: trunk/cddl/lib/libdtrace/nfs.d
===================================================================
--- trunk/cddl/lib/libdtrace/nfs.d 2016-10-14 02:14:58 UTC (rev 9159)
+++ trunk/cddl/lib/libdtrace/nfs.d 2016-10-14 02:16:04 UTC (rev 9160)
@@ -20,7 +20,7 @@
*
* Portions Copyright 2006-2008 John Birrell jb at freebsd.org
*
- * $FreeBSD: src/cddl/lib/libdtrace/nfs.d,v 1.1.2.1.2.1 2008/11/25 02:59:29 kensmith Exp $
+ * $FreeBSD: release/9.2.0/cddl/lib/libdtrace/nfs.d 250486 2013-05-10 21:39:41Z pfg $
*/
/*
@@ -28,11 +28,9 @@
* Use is subject to license terms.
*/
-#pragma ident "%Z%%M% %I% %E% SMI"
-
#pragma D depends_on library ip.d
#pragma D depends_on library net.d
-#pragma D depends_on module genunix
+#pragma D depends_on module nfs
typedef struct nfsv4opinfo {
uint64_t noi_xid; /* unique transation ID */
@@ -47,50 +45,62 @@
#pragma D binding "1.5" translator
translator conninfo_t < struct svc_req *P > {
ci_protocol = P->rq_xprt->xp_master->xp_netid == "tcp" ? "ipv4" :
+ P->rq_xprt->xp_master->xp_netid == "udp" ? "ipv4" :
P->rq_xprt->xp_master->xp_netid == "tcp6" ? "ipv6" :
+ P->rq_xprt->xp_master->xp_netid == "udp6" ? "ipv6" :
"<unknown>";
- ci_local = inet_ntoa6(&((conn_t *)P->rq_xprt->xp_xpc.
- xpc_wq->q_next->q_ptr)->connua_v6addr.connua_laddr);
+ ci_local = (P->rq_xprt->xp_master->xp_netid == "tcp" ||
+ P->rq_xprt->xp_master->xp_netid == "udp") ?
+ inet_ntoa(&((struct sockaddr_in *)
+ P->rq_xprt->xp_xpc.xpc_lcladdr.buf)->sin_addr.S_un.S_addr) :
+ (P->rq_xprt->xp_master->xp_netid == "tcp6" ||
+ P->rq_xprt->xp_master->xp_netid == "udp6") ?
+ inet_ntoa6(&((struct sockaddr_in6 *)
+ P->rq_xprt->xp_xpc.xpc_lcladdr.buf)->sin6_addr) :
+ "unknown";
- ci_remote = inet_ntoa6(&((conn_t *)P->rq_xprt->xp_xpc.
- xpc_wq->q_next->q_ptr)->connua_v6addr.connua_faddr);
+ ci_remote = (P->rq_xprt->xp_master->xp_netid == "tcp" ||
+ P->rq_xprt->xp_master->xp_netid == "udp") ?
+ inet_ntoa(&((struct sockaddr_in *)
+ P->rq_xprt->xp_xpc.xpc_rtaddr.buf)->sin_addr.S_un.S_addr) :
+ (P->rq_xprt->xp_master->xp_netid == "tcp6" ||
+ P->rq_xprt->xp_master->xp_netid == "udp6") ?
+ inet_ntoa6(&((struct sockaddr_in6 *)
+ P->rq_xprt->xp_xpc.xpc_rtaddr.buf)->sin6_addr) :
+ "unknown";
};
#pragma D binding "1.5" translator
-translator conninfo_t < struct compound_state *P > {
- ci_protocol = P->req->rq_xprt->xp_master->xp_netid == "tcp" ? "ipv4" :
- P->req->rq_xprt->xp_master->xp_netid == "tcp6" ? "ipv6" :
- "<unknown>";
+translator conninfo_t < rfs4_client_t *P > {
+ ci_protocol = (P->rc_addr.ss_family == AF_INET) ? "ipv4" : "ipv6";
- ci_local = inet_ntoa6(&((conn_t *)P->req->rq_xprt->xp_xpc.
- xpc_wq->q_next->q_ptr)->connua_v6addr.connua_laddr);
+ ci_local = "<unknown>";
- ci_remote = inet_ntoa6(&((conn_t *)P->req->rq_xprt->xp_xpc.
- xpc_wq->q_next->q_ptr)->connua_v6addr.connua_faddr);
+ ci_remote = (P->rc_addr.ss_family == AF_INET) ?
+ inet_ntoa((ipaddr_t *)
+ &((struct sockaddr_in *)&P->rc_addr)->sin_addr) :
+ inet_ntoa6(&((struct sockaddr_in6 *)&P->rc_addr)->sin6_addr);
};
#pragma D binding "1.5" translator
-translator nfsv4opinfo_t < struct compound_state *P > {
- noi_xid = P->req->rq_xprt->xp_xid;
- noi_cred = P->basecr;
- noi_curpath = (P->vp == NULL) ? "<unknown>" : P->vp->v_path;
+translator nfsv4cbinfo_t < rfs4_deleg_state_t *P > {
+ nci_curpath = (P->rds_finfo->rf_vp == NULL) ? "<unknown>" :
+ P->rds_finfo->rf_vp->v_path;
};
-#pragma D binding "1.5" translator
-translator conninfo_t < rfs4_client_t *P > {
- ci_protocol = (P->cl_addr.ss_family == AF_INET) ? "ipv4" : "ipv6";
+typedef struct nfsv3opinfo {
+ uint64_t noi_xid; /* unique transation ID */
+ cred_t *noi_cred; /* credentials for operation */
+ string noi_curpath; /* current file handle path (if any) */
+} nfsv3opinfo_t;
- ci_local = "<unknown>";
+typedef struct nfsv3oparg nfsv3oparg_t;
- ci_remote = (P->cl_addr.ss_family == AF_INET) ?
- inet_ntoa((ipaddr_t *)
- &((struct sockaddr_in *)&P->cl_addr)->sin_addr) :
- inet_ntoa6(&((struct sockaddr_in6 *)&P->cl_addr)->sin6_addr);
-};
-
#pragma D binding "1.5" translator
-translator nfsv4cbinfo_t < rfs4_deleg_state_t *P > {
- nci_curpath = (P->finfo->vp == NULL) ? "<unknown>" :
- P->finfo->vp->v_path;
+translator nfsv3opinfo_t < nfsv3oparg_t *P > {
+ noi_xid = ((struct svc_req *)arg0)->rq_xprt->xp_xid;
+ noi_cred = (cred_t *)arg1;
+ noi_curpath = (arg2 == 0 || ((vnode_t *)arg2)->v_path == NULL) ?
+ "<unknown>" : ((vnode_t *)arg2)->v_path;
};
Added: trunk/cddl/lib/libdtrace/nfssrv.d
===================================================================
--- trunk/cddl/lib/libdtrace/nfssrv.d (rev 0)
+++ trunk/cddl/lib/libdtrace/nfssrv.d 2016-10-14 02:16:04 UTC (rev 9160)
@@ -0,0 +1,54 @@
+/*
+ * CDDL HEADER START
+ *
+ * The contents of this file are subject to the terms of the
+ * Common Development and Distribution License (the "License").
+ * You may not use this file except in compliance with the License.
+ *
+ * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+ * or http://www.opensolaris.org/os/licensing.
+ * See the License for the specific language governing permissions
+ * and limitations under the License.
+ *
+ * When distributing Covered Code, include this CDDL HEADER in each
+ * file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+ * If applicable, add the following below this CDDL HEADER, with the
+ * fields enclosed by brackets "[]" replaced with your own identifying
+ * information: Portions Copyright [yyyy] [name of copyright owner]
+ *
+ * CDDL HEADER END
+ *
+ * Portions Copyright 2006-2008 John Birrell jb at freebsd.org
+ *
+ * $FreeBSD: release/9.2.0/cddl/lib/libdtrace/nfssrv.d 250486 2013-05-10 21:39:41Z pfg $
+ */
+
+/*
+ * Copyright 2009 Sun Microsystems, Inc. All rights reserved.
+ * Use is subject to license terms.
+ */
+
+#pragma D depends_on library ip.d
+#pragma D depends_on library net.d
+#pragma D depends_on module nfs.d
+#pragma D depends_on module nfssrv
+
+#pragma D binding "1.5" translator
+translator conninfo_t < struct compound_state *P > {
+ ci_protocol = P->req->rq_xprt->xp_master->xp_netid == "tcp" ? "ipv4" :
+ P->req->rq_xprt->xp_master->xp_netid == "tcp6" ? "ipv6" :
+ "<unknown>";
+
+ ci_local = inet_ntoa6(&((conn_t *)P->req->rq_xprt->xp_xpc.
+ xpc_wq->q_next->q_ptr)->connua_v6addr.connua_laddr);
+
+ ci_remote = inet_ntoa6(&((conn_t *)P->req->rq_xprt->xp_xpc.
+ xpc_wq->q_next->q_ptr)->connua_v6addr.connua_faddr);
+};
+
+#pragma D binding "1.5" translator
+translator nfsv4opinfo_t < struct compound_state *P > {
+ noi_xid = P->req->rq_xprt->xp_xid;
+ noi_cred = P->basecr;
+ noi_curpath = (P->vp == NULL) ? "<unknown>" : P->vp->v_path;
+};
Property changes on: trunk/cddl/lib/libdtrace/nfssrv.d
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:keywords
## -0,0 +1 ##
+MidnightBSD=%H
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Modified: trunk/cddl/lib/libdtrace/psinfo.d
===================================================================
--- trunk/cddl/lib/libdtrace/psinfo.d 2016-10-14 02:14:58 UTC (rev 9159)
+++ trunk/cddl/lib/libdtrace/psinfo.d 2016-10-14 02:16:04 UTC (rev 9160)
@@ -21,7 +21,7 @@
*
* Portions Copyright 2006 John Birrell jb at freebsd.org
*
- * $FreeBSD: src/cddl/lib/libdtrace/psinfo.d,v 1.1.2.1.2.1 2008/11/25 02:59:29 kensmith Exp $
+ * $FreeBSD: release/9.2.0/cddl/lib/libdtrace/psinfo.d 179189 2008-05-22 04:26:42Z jb $
*/
/*
* Copyright 2004 Sun Microsystems, Inc. All rights reserved.
Modified: trunk/cddl/lib/libdtrace/regs_x86.d
===================================================================
--- trunk/cddl/lib/libdtrace/regs_x86.d 2016-10-14 02:14:58 UTC (rev 9159)
+++ trunk/cddl/lib/libdtrace/regs_x86.d 2016-10-14 02:16:04 UTC (rev 9160)
@@ -21,7 +21,7 @@
*
* Portions Copyright 2009 Stacey Son sson at FreeBSD.org
*
- * $FreeBSD$
+ * $FreeBSD: release/9.2.0/cddl/lib/libdtrace/regs_x86.d 211554 2010-08-21 11:50:53Z rpaulo $
*/
/*
* Copyright 2004 Sun Microsystems, Inc. All rights reserved.
Modified: trunk/cddl/lib/libdtrace/sched.d
===================================================================
--- trunk/cddl/lib/libdtrace/sched.d 2016-10-14 02:14:58 UTC (rev 9159)
+++ trunk/cddl/lib/libdtrace/sched.d 2016-10-14 02:16:04 UTC (rev 9160)
@@ -20,7 +20,7 @@
*
* Portions Copyright 2006-2008 John Birrell jb at freebsd.org
*
- * $FreeBSD: src/cddl/lib/libdtrace/sched.d,v 1.1.2.1.2.1 2008/11/25 02:59:29 kensmith Exp $
+ * $FreeBSD: release/9.2.0/cddl/lib/libdtrace/sched.d 179189 2008-05-22 04:26:42Z jb $
*/
/*
* Copyright 2006 Sun Microsystems, Inc. All rights reserved.
Modified: trunk/cddl/lib/libdtrace/signal.d
===================================================================
--- trunk/cddl/lib/libdtrace/signal.d 2016-10-14 02:14:58 UTC (rev 9159)
+++ trunk/cddl/lib/libdtrace/signal.d 2016-10-14 02:16:04 UTC (rev 9160)
@@ -21,7 +21,7 @@
*
* Portions Copyright 2008 John Birrell jb at freebsd.org
*
- * $FreeBSD: src/cddl/lib/libdtrace/signal.d,v 1.1.2.1.2.1 2008/11/25 02:59:29 kensmith Exp $
+ * $FreeBSD: release/9.2.0/cddl/lib/libdtrace/signal.d 179189 2008-05-22 04:26:42Z jb $
*/
inline int SIGHUP = 1;
More information about the Midnightbsd-cvs
mailing list