d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

DTrace: NFS translators should be split into client/server pieces

Browse Source 
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
This commit is contained in:
Pedro F. Giffuni 2013-04-15 20:16:31 +00:00
parent 32e1d8010b
commit 98aff789ce
2 changed files with 55 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
cddl/lib/libdtrace/nfs.d
View File

@ -32,7 +32,7 @@
#pragma D depends_on library ip.d #pragma D depends_on library ip.d
#pragma D depends_on library net.d #pragma D depends_on library net.d
#pragma D depends_on module genunix #pragma D depends_on module nfs
typedef struct nfsv4opinfo { typedef struct nfsv4opinfo {
uint64_t noi_xid; /* unique transation ID */ uint64_t noi_xid; /* unique transation ID */
@ -76,21 +76,3 @@ translator nfsv4opinfo_t < struct compound_state *P > {
noi_cred = P->basecr; noi_cred = P->basecr;
noi_curpath = (P->vp == NULL) ? "<unknown>" : P->vp->v_path; noi_curpath = (P->vp == NULL) ? "<unknown>" : 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 = "<unknown>";
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;
};

54
cddl/lib/libdtrace/nfssrv.d Normal file
View File

@ -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@freebsd.org
*
* $FreeBSD$
*/
/*
* Copyright 2007 Sun Microsystems, Inc. All rights reserved.
* 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 nfs.d
#pragma D depends_on module nfssrv
#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 = "<unknown>";
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;
};