From owner-svn-src-all@FreeBSD.ORG Mon Apr 15 20:16:32 2013 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by hub.freebsd.org (Postfix) with ESMTP id 79CC4D90; Mon, 15 Apr 2013 20:16:32 +0000 (UTC) (envelope-from pfg@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) by mx1.freebsd.org (Postfix) with ESMTP id 6C93517EB; Mon, 15 Apr 2013 20:16:32 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.6/8.14.6) with ESMTP id r3FKGWeO055192; Mon, 15 Apr 2013 20:16:32 GMT (envelope-from pfg@svn.freebsd.org) Received: (from pfg@localhost) by svn.freebsd.org (8.14.6/8.14.5/Submit) id r3FKGW5f055190; Mon, 15 Apr 2013 20:16:32 GMT (envelope-from pfg@svn.freebsd.org) Message-Id: <201304152016.r3FKGW5f055190@svn.freebsd.org> From: "Pedro F. Giffuni" Date: Mon, 15 Apr 2013 20:16:32 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r249526 - head/cddl/lib/libdtrace X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 15 Apr 2013 20:16:32 -0000 Author: pfg Date: Mon Apr 15 20:16:31 2013 New Revision: 249526 URL: http://svnweb.freebsd.org/changeset/base/249526 Log: DTrace: NFS translators should be split into client/server pieces Merge change from illumos: 1731 DTrace NFS translators should be split into client/server pieces Illumos Revision: 13523:6763769941d2 This code seems to be currently unused on FreeBSD. Reference: https://www.illumos.org/issues/1731 Obtained from: Illumos MFC after: 1 week Added: head/cddl/lib/libdtrace/nfssrv.d - copied, changed from r249521, head/cddl/lib/libdtrace/nfs.d Modified: head/cddl/lib/libdtrace/nfs.d Modified: head/cddl/lib/libdtrace/nfs.d ============================================================================== --- head/cddl/lib/libdtrace/nfs.d Mon Apr 15 20:06:56 2013 (r249525) +++ head/cddl/lib/libdtrace/nfs.d Mon Apr 15 20:16:31 2013 (r249526) @@ -32,7 +32,7 @@ #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 */ @@ -76,21 +76,3 @@ translator nfsv4opinfo_t < struct compou noi_cred = P->basecr; noi_curpath = (P->vp == NULL) ? "" : P->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"; - - ci_local = ""; - - 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) ? "" : - P->finfo->vp->v_path; -}; Copied and modified: head/cddl/lib/libdtrace/nfssrv.d (from r249521, head/cddl/lib/libdtrace/nfs.d) ============================================================================== --- head/cddl/lib/libdtrace/nfs.d Mon Apr 15 18:38:21 2013 (r249521, copy source) +++ head/cddl/lib/libdtrace/nfssrv.d Mon Apr 15 20:16:31 2013 (r249526) @@ -32,50 +32,8 @@ #pragma D depends_on library ip.d #pragma D depends_on library net.d -#pragma D depends_on module genunix - -typedef struct nfsv4opinfo { - uint64_t noi_xid; /* unique transation ID */ - cred_t *noi_cred; /* credentials for operation */ - string noi_curpath; /* current file handle path (if any) */ -} nfsv4opinfo_t; - -typedef struct nfsv4cbinfo { - string nci_curpath; /* current file handle path (if any) */ -} nfsv4cbinfo_t; - -#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 == "tcp6" ? "ipv6" : - ""; - - ci_local = inet_ntoa6(&((conn_t *)P->rq_xprt->xp_xpc. - xpc_wq->q_next->q_ptr)->connua_v6addr.connua_laddr); - - ci_remote = inet_ntoa6(&((conn_t *)P->rq_xprt->xp_xpc. - xpc_wq->q_next->q_ptr)->connua_v6addr.connua_faddr); -}; - -#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" : - ""; - - 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) ? "" : P->vp->v_path; -}; +#pragma D depends_on module nfs.d +#pragma D depends_on module nfssrv #pragma D binding "1.5" translator translator conninfo_t < rfs4_client_t *P > {