Date: Fri, 1 Jul 2005 18:33:35 GMT From: Peter Wemm <peter@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Subject: PERFORCE change 79396 for review Message-ID: <200507011833.j61IXZUa006969@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://perforce.freebsd.org/chv.cgi?CH=79396 Change 79396 by peter@peter_overcee on 2005/07/01 18:33:25 IFC @79392 Affected files ... .. //depot/projects/hammer/UPDATING#80 integrate .. //depot/projects/hammer/etc/rc.d/dhclient#15 integrate .. //depot/projects/hammer/lib/libc/sys/fhopen.2#3 integrate .. //depot/projects/hammer/lib/libc/sys/kenv.2#3 integrate .. //depot/projects/hammer/lib/libdevstat/devstat.3#7 integrate .. //depot/projects/hammer/lib/libpmc/pmclog.c#2 integrate .. //depot/projects/hammer/lib/libpmc/pmclog.h#2 integrate .. //depot/projects/hammer/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml#101 integrate .. //depot/projects/hammer/release/doc/ja_JP.eucJP/Makefile#3 integrate .. //depot/projects/hammer/release/doc/ja_JP.eucJP/early-adopter/Makefile#2 delete .. //depot/projects/hammer/release/doc/ja_JP.eucJP/early-adopter/article.sgml#9 delete .. //depot/projects/hammer/release/doc/ja_JP.eucJP/errata/article.sgml#14 integrate .. //depot/projects/hammer/release/doc/ja_JP.eucJP/hardware/common/dev.sgml#18 integrate .. //depot/projects/hammer/release/doc/ja_JP.eucJP/relnotes/common/artheader.sgml#2 delete .. //depot/projects/hammer/release/doc/ja_JP.eucJP/relnotes/common/intro.sgml#3 delete .. //depot/projects/hammer/release/doc/ja_JP.eucJP/relnotes/common/relnotes.ent#2 integrate .. //depot/projects/hammer/release/doc/ja_JP.eucJP/relnotes/common/upgrading.sgml#3 delete .. //depot/projects/hammer/release/doc/ru_RU.KOI8-R/hardware/common/dev.sgml#12 integrate .. //depot/projects/hammer/release/doc/ru_RU.KOI8-R/installation/common/artheader.sgml#3 integrate .. //depot/projects/hammer/release/doc/ru_RU.KOI8-R/installation/common/install.sgml#8 integrate .. //depot/projects/hammer/release/doc/ru_RU.KOI8-R/installation/common/trouble.sgml#5 integrate .. //depot/projects/hammer/release/doc/ru_RU.KOI8-R/readme/article.sgml#7 integrate .. //depot/projects/hammer/release/doc/ru_RU.KOI8-R/relnotes/common/new.sgml#14 integrate .. //depot/projects/hammer/release/doc/ru_RU.KOI8-R/share/examples/dev-auto-translate.pl#3 integrate .. //depot/projects/hammer/release/doc/ru_RU.KOI8-R/share/sgml/dev-auto-ru.sgml#4 integrate .. //depot/projects/hammer/sbin/ipfw/ipfw.8#44 integrate .. //depot/projects/hammer/share/doc/papers/Makefile#5 integrate .. //depot/projects/hammer/share/doc/papers/nqnfs/Makefile#4 delete .. //depot/projects/hammer/share/doc/papers/nqnfs/nqnfs.me#2 delete .. //depot/projects/hammer/share/man/man3/pthread_cancel.3#3 integrate .. //depot/projects/hammer/share/man/man3/pthread_testcancel.3#3 integrate .. //depot/projects/hammer/share/man/man3/sysexits.3#7 integrate .. //depot/projects/hammer/share/man/man4/man4.i386/ep.4#11 integrate .. //depot/projects/hammer/share/man/man5/a.out.5#4 integrate .. //depot/projects/hammer/share/man/man5/hosts.equiv.5#4 integrate .. //depot/projects/hammer/share/man/man5/make.conf.5#36 integrate .. //depot/projects/hammer/share/man/man5/periodic.conf.5#12 integrate .. //depot/projects/hammer/share/man/man5/rc.conf.5#58 integrate .. //depot/projects/hammer/share/man/man7/clocks.7#5 integrate .. //depot/projects/hammer/share/man/man7/sdoc.7#3 integrate .. //depot/projects/hammer/share/man/man7/tuning.7#14 integrate .. //depot/projects/hammer/share/man/man8/crash.8#4 integrate .. //depot/projects/hammer/sys/cam/cam_periph.c#17 integrate .. //depot/projects/hammer/sys/cam/cam_queue.c#5 integrate .. //depot/projects/hammer/sys/cam/cam_sim.c#5 integrate .. //depot/projects/hammer/sys/cam/cam_xpt.c#22 integrate .. //depot/projects/hammer/sys/cam/cam_xpt_periph.h#3 integrate .. //depot/projects/hammer/sys/cam/scsi/scsi_low.c#8 integrate .. //depot/projects/hammer/sys/cam/scsi/scsi_sa.c#16 integrate .. //depot/projects/hammer/sys/cam/scsi/scsi_ses.c#11 integrate .. //depot/projects/hammer/sys/cam/scsi/scsi_targ_bh.c#9 integrate .. //depot/projects/hammer/sys/cam/scsi/scsi_target.c#15 integrate .. //depot/projects/hammer/sys/conf/newvers.sh#15 integrate .. //depot/projects/hammer/sys/dev/ep/if_ep.c#19 integrate .. //depot/projects/hammer/sys/dev/ep/if_ep_isa.c#11 integrate .. //depot/projects/hammer/sys/dev/ep/if_ep_mca.c#8 integrate .. //depot/projects/hammer/sys/dev/ep/if_ep_pccard.c#15 integrate .. //depot/projects/hammer/sys/dev/ep/if_epvar.h#9 integrate .. //depot/projects/hammer/sys/dev/fatm/if_fatm.c#12 integrate .. //depot/projects/hammer/sys/dev/hatm/if_hatm.c#14 integrate .. //depot/projects/hammer/sys/dev/hatm/if_hatm_ioctl.c#6 integrate .. //depot/projects/hammer/sys/dev/hatm/if_hatm_tx.c#9 integrate .. //depot/projects/hammer/sys/dev/hwpmc/hwpmc_logging.c#2 integrate .. //depot/projects/hammer/sys/dev/hwpmc/hwpmc_mod.c#4 integrate .. //depot/projects/hammer/sys/dev/patm/if_patm_attach.c#9 integrate .. //depot/projects/hammer/sys/dev/patm/if_patm_tx.c#7 integrate .. //depot/projects/hammer/sys/dev/pccard/card_if.m#9 integrate .. //depot/projects/hammer/sys/dev/pccard/pccard.c#25 integrate .. //depot/projects/hammer/sys/dev/pccard/pccard_cis.c#12 integrate .. //depot/projects/hammer/sys/dev/pccard/pccardvar.h#15 integrate .. //depot/projects/hammer/sys/dev/re/if_re.c#27 integrate .. //depot/projects/hammer/sys/i386/isa/clock.c#26 integrate .. //depot/projects/hammer/sys/kern/init_main.c#35 integrate .. //depot/projects/hammer/sys/kern/kern_clock.c#28 integrate .. //depot/projects/hammer/sys/kern/kern_event.c#36 integrate .. //depot/projects/hammer/sys/kern/kern_exec.c#52 integrate .. //depot/projects/hammer/sys/kern/kern_fork.c#51 integrate .. //depot/projects/hammer/sys/kern/sys_pipe.c#28 integrate .. //depot/projects/hammer/sys/kern/tty.c#46 integrate .. //depot/projects/hammer/sys/kern/uipc_socket.c#56 integrate .. //depot/projects/hammer/sys/kern/uipc_socket2.c#36 integrate .. //depot/projects/hammer/sys/kern/vfs_aio.c#32 integrate .. //depot/projects/hammer/sys/kern/vfs_subr.c#86 integrate .. //depot/projects/hammer/sys/net/bpf.c#34 integrate .. //depot/projects/hammer/sys/net/if.c#49 integrate .. //depot/projects/hammer/sys/net/ppp_tty.c#13 integrate .. //depot/projects/hammer/sys/netinet/ip_carp.c#9 integrate .. //depot/projects/hammer/sys/pc98/pc98/machdep.c#2 integrate .. //depot/projects/hammer/sys/sys/event.h#11 integrate .. //depot/projects/hammer/sys/sys/mount.h#35 integrate .. //depot/projects/hammer/sys/sys/pmc.h#5 integrate .. //depot/projects/hammer/sys/sys/pmckern.h#4 integrate .. //depot/projects/hammer/sys/sys/pmclog.h#2 integrate .. //depot/projects/hammer/sys/sys/vnode.h#56 integrate .. //depot/projects/hammer/usr.bin/gencat/Makefile#3 integrate .. //depot/projects/hammer/usr.sbin/pmcstat/Makefile#2 integrate .. //depot/projects/hammer/usr.sbin/pmcstat/pmcstat.8#4 integrate .. //depot/projects/hammer/usr.sbin/pmcstat/pmcstat.c#4 integrate .. //depot/projects/hammer/usr.sbin/pmcstat/pmcstat.h#1 branch .. //depot/projects/hammer/usr.sbin/pmcstat/pmcstat_log.c#1 branch .. //depot/projects/hammer/usr.sbin/usbd/usbd.c#8 integrate Differences ... ==== //depot/projects/hammer/UPDATING#80 (text+ko) ==== @@ -28,6 +28,14 @@ do not have ifconfig_ifn entries rather than just those in removable_interfaces. +20050616: + Some previous versions of PAM have permitted the use of + non-absolute paths in /etc/pam.conf or /etc/pam.d/* when referring + to third party PAM modules in /usr/local/lib. A change has been + made to require the use of absolute paths in order to avoid + ambiguity and dependence on library path configuration, which may + affect existing configurations. + 20050610: Major changes to network interface API. All drivers must be recompiled. Drivers not in the base system will need to be @@ -389,4 +397,4 @@ Contact Warner Losh if you have any questions about your use of this document. -$FreeBSD: src/UPDATING,v 1.415 2005/06/30 05:02:34 brooks Exp $ +$FreeBSD: src/UPDATING,v 1.416 2005/07/01 15:12:09 des Exp $ ==== //depot/projects/hammer/etc/rc.d/dhclient#15 (text+ko) ==== @@ -1,12 +1,10 @@ #!/bin/sh # # $NetBSD: dhclient,v 1.8 2002/03/22 04:33:58 thorpej Exp $ -# $FreeBSD: src/etc/rc.d/dhclient,v 1.19 2005/06/07 04:49:12 brooks Exp $ +# $FreeBSD: src/etc/rc.d/dhclient,v 1.20 2005/06/30 17:50:34 brooks Exp $ # # PROVIDE: dhclient -# REQUIRE: netif ipfw ipfilter mountcritlocal cleanvar -# BEFORE: NETWORKING # KEYWORD: nojail nostart # ==== //depot/projects/hammer/lib/libc/sys/fhopen.2#3 (text+ko) ==== @@ -31,7 +31,7 @@ .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE .\" POSSIBILITY OF SUCH DAMAGE. .\" -.\" $FreeBSD: src/lib/libc/sys/fhopen.2,v 1.15 2002/12/27 12:15:29 schweikh Exp $ +.\" $FreeBSD: src/lib/libc/sys/fhopen.2,v 1.16 2005/06/30 13:18:15 hmp Exp $ .\" .Dd June 29, 1999 .Dt FHOPEN 2 @@ -141,7 +141,7 @@ by .An Alfred Perlstein . .Sh AUTHORS -This man page was written by +This manual page was written by .An William Studenmund for .Nx . ==== //depot/projects/hammer/lib/libc/sys/kenv.2#3 (text+ko) ==== @@ -24,7 +24,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH .\" DAMAGE. .\" -.\" $FreeBSD: src/lib/libc/sys/kenv.2,v 1.4 2002/12/19 09:40:25 ru Exp $ +.\" $FreeBSD: src/lib/libc/sys/kenv.2,v 1.5 2005/06/30 13:18:15 hmp Exp $ .\" .Dd April 17, 2002 .Dt KENV 2 @@ -170,7 +170,7 @@ .Xr kenv 1 .Sh AUTHORS .An -nosplit -This man page was written by +This manual page was written by .An Chad David Aq davidc@FreeBSD.org . .Pp The ==== //depot/projects/hammer/lib/libdevstat/devstat.3#7 (text+ko) ==== @@ -25,9 +25,9 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/lib/libdevstat/devstat.3,v 1.25 2004/07/02 23:52:15 ru Exp $ +.\" $FreeBSD: src/lib/libdevstat/devstat.3,v 1.26 2005/06/30 06:35:51 ru Exp $ .\" -.Dd July 15, 2001 +.Dd March 18, 2003 .Dt DEVSTAT 3 .Os .Sh NAME @@ -47,26 +47,15 @@ .Sh SYNOPSIS .In devstat.h .Ft int -.Fo devstat_getnumdevs -.Fa "kvm_t *kd" -.Fc +.Fn devstat_getnumdevs "kvm_t *kd" .Ft long -.Fo devstat_getgeneration -.Fa "kvm_t *kd" -.Fc +.Fn devstat_getgeneration "kvm_t *kd" .Ft int -.Fo devstat_getversion -.Fa "kvm_t *kd" -.Fc +.Fn devstat_getversion "kvm_t *kd" .Ft int -.Fo devstat_checkversion -.Fa "kvm_t *kd" -.Fc +.Fn devstat_checkversion "kvm_t *kd" .Ft int -.Fo devstat_getdevs -.Fa "kvm_t *kd" -.Fa "struct statinfo *stats" -.Fc +.Fn devstat_getdevs "kvm_t *kd" "struct statinfo *stats" .Ft int .Fo devstat_selectdevs .Fa "struct device_selection **dev_select" @@ -97,11 +86,8 @@ .Fa "long double etime" .Fa "..." .Fc -.Ft long double -.Fo devstat_compute_etime -.Fa "struct bintime cur_time" -.Fa "struct bintime prev_time" -.Fc +.Ft "long double" +.Fn devstat_compute_etime "struct bintime cur_time" "struct bintime prev_time" .Sh DESCRIPTION The .Nm @@ -112,7 +98,7 @@ and .Xr kvm 3 . All functions that take a -.Vt kvm_t * +.Vt "kvm_t *" as first argument can be passed .Dv NULL instead of a kvm handle as this argument, @@ -121,41 +107,57 @@ Otherwise, it is read via .Xr kvm 3 using the supplied handle. +The .Fn devstat_checkversion +function should be called with each kvm handle that is going to be used (or with .Dv NULL if .Xr sysctl 3 is going to be used). .Pp +The .Fn devstat_getnumdevs +function returns the number of devices registered with the .Nm subsystem in the kernel. .Pp +The .Fn devstat_getgeneration +function returns the current generation of the .Nm list of devices in the kernel. .Pp +The .Fn devstat_getversion +function returns the current kernel .Nm version. .Pp +The .Fn devstat_checkversion -checks the userland devstat version against the kernel devstat version. +function +checks the userland +.Nm +version against the kernel +.Nm +version. If the two are identical, it returns zero. Otherwise, it prints an appropriate error in .Va devstat_errbuf -and returns -1. +and returns \-1. .Pp +The .Fn devstat_getdevs +function fetches the current list of devices and statistics into the supplied -.Va statinfo +.Vt statinfo structure. The -.Va statinfo +.Vt statinfo structure can be found in .In devstat.h : .Bd -literal -offset indent @@ -168,9 +170,11 @@ }; .Ed .Pp +The .Fn devstat_getdevs +function expects the -.Va statinfo +.Vt statinfo structure to be allocated, and it also expects the .Va dinfo subelement to be allocated and zeroed prior to the first invocation of @@ -194,17 +198,19 @@ .Pp The .Va kern.devstat.all -.Nm sysctl +.Xr sysctl 8 variable contains an array of .Nm structures, but at the head of the array is the current .Nm generation. The reason the generation is at the head of the buffer is so that userland -software accessing the devstat statistics information can atomically get +software accessing the +.Nm +statistics information can atomically get both the statistics information and the corresponding generation number. If client software were forced to get the generation number via a separate -.Nm sysctl +.Xr sysctl 8 variable (which is available for convenience), the list of devices could change between the time the client gets the generation and the time the client gets the device list. @@ -212,36 +218,39 @@ The .Va mem_ptr subelement of the -.Va devinfo +.Vt devinfo structure is a pointer to memory that is allocated, and resized if necessary, by .Fn devstat_getdevs . The devices subelement of the -.Va devinfo +.Vt devinfo structure is basically a pointer to the beginning of the array of devstat structures from the .Va kern.devstat.all -.Nm sysctl +.Xr sysctl 8 variable (or the corresponding values read via .Xr kvm 3 ) . The generation subelement of the -.Va devinfo +.Vt devinfo structure contains the corresponding generation number. The .Va numdevs subelement of the -.Va devinfo +.Vt devinfo structure contains the current number of devices registered with the kernel .Nm subsystem. .Pp +The .Fn devstat_selectdevs +function selects devices to display based upon a number of criteria: -.Bl -tag -width flag +.Bl -tag -width indent .It specified devices Specified devices are the first selection priority. -These are generally devices specified by name by the user e.g.\& da0, da1, cd0. +These are generally devices specified by name by the user e.g.\& +.Li da0 , da1 , cd0 . .It match patterns These are pattern matching expressions generated by .Fn devstat_buildmatch @@ -250,7 +259,7 @@ If performance mode is enabled, devices will be sorted based on the .Va bytes field in the -.Va device_selection +.Vt device_selection structure passed in to .Fn devstat_selectdevs . The @@ -266,50 +275,64 @@ code will honor those selections and will only sort among the selected devices. .It order in the devstat list -If the selection mode is set to DS_SELECT_ADD, and if there are still less +If the selection mode is set to +.Dv DS_SELECT_ADD , +and if there are still less than -.Va maxshowdevs +.Fa maxshowdevs devices selected, .Fn devstat_selectdevs will automatically select up to -.Va maxshowdevs +.Fa maxshowdevs devices. .El .Pp +The .Fn devstat_selectdevs +function performs selections in four different modes: -.Bl -tag -width DS_SELECT_ADDONLY -.It DS_SELECT_ADD -In add mode, +.Bl -tag -width ".Dv DS_SELECT_ADDONLY" +.It Dv DS_SELECT_ADD +In +.Dq add +mode, .Fn devstat_selectdevs will select any unselected devices specified by name or matching pattern. It will also select more devices, in devstat list order, until the number of selected devices is equal to -.Va maxshowdevs +.Fa maxshowdevs or until all devices are selected. -.It DS_SELECT_ONLY -In only mode, +.It Dv DS_SELECT_ONLY +In +.Dq only +mode, .Fn devstat_selectdevs will clear all current selections, and will only select devices specified by name or by matching pattern. -.It DS_SELECT_REMOVE -In remove mode, +.It Dv DS_SELECT_REMOVE +In +.Dq remove +mode, .Fn devstat_selectdevs will remove devices specified by name or by matching pattern. It will not select any additional devices. -.It DS_SELECT_ADDONLY -In add only mode, +.It Dv DS_SELECT_ADDONLY +In +.Dq "add only" +mode, .Fn devstat_selectdevs will select any unselected devices specified by name or matching pattern. -In this respect it is identical to add mode. +In this respect it is identical to +.Dq add +mode. It will not, however, select any devices other than those specified. .El .Pp In all selection modes, .Fn devstat_selectdevs will not select any more than -.Va maxshowdevs +.Fa maxshowdevs devices. One exception to this is when you are in .Dq top @@ -321,307 +344,341 @@ to pay attention to a particular device. This may be the wrong behavior, and probably requires additional thought. .Pp +The .Fn devstat_selectdevs +function handles allocation and resizing of the -.Va dev_select +.Fa dev_select structure passed in by the client. +The .Fn devstat_selectdevs +function uses the -.Va numdevs +.Fa numdevs and -.Va current_generation +.Fa current_generation fields to track the current .Nm generation and number of devices. If -.Va num_selections +.Fa num_selections is not the same as -.Va numdevs +.Fa numdevs or if -.Va select_generation +.Fa select_generation is not the same as -.Va current_generation , +.Fa current_generation , .Fn devstat_selectdevs will resize the selection list as necessary, and re-initialize the selection array. .Pp +The .Fn devstat_buildmatch -take a comma separated match string and compile it into a -\fBdevstat_match\fR structure that is understood by -.Fn selectdevs . +function +takes a comma separated match string and compiles it into a +.Vt devstat_match +structure that is understood by +.Fn devstat_selectdevs . Match strings have the following format: .Pp -.Bd -literal -offset indent -device,type,if -.Ed +.D1 Ar device , Ns Ar type , Ns Ar if .Pp +The .Fn devstat_buildmatch +function takes care of allocating and reallocating the match list as necessary. Currently known match types include: -.Pp -.Bl -tag -width indent -compact +.Bl -tag -width indent .It device type: -.Bl -tag -width 9n -compact -.It da +.Bl -tag -width ".Li enclosure" -compact +.It Li da Direct Access devices -.It sa +.It Li sa Sequential Access devices -.It printer +.It Li printer Printers -.It proc +.It Li proc Processor devices -.It worm +.It Li worm Write Once Read Multiple devices -.It cd +.It Li cd CD devices -.It scanner +.It Li scanner Scanner devices -.It optical +.It Li optical Optical Memory devices -.It changer +.It Li changer Medium Changer devices -.It comm +.It Li comm Communication devices -.It array +.It Li array Storage Array devices -.It enclosure +.It Li enclosure Enclosure Services devices -.It floppy +.It Li floppy Floppy devices .El -.Pp .It interface: -.Bl -tag -width 9n -compact -.It IDE +.Bl -tag -width ".Li enclosure" -compact +.It Li IDE Integrated Drive Electronics devices -.It SCSI +.It Li SCSI Small Computer System Interface devices -.It other +.It Li other Any other device interface .El -.Pp .It passthrough: -.Bl -tag -width 9n -compact -.It pass +.Bl -tag -width ".Li enclosure" -compact +.It Li pass Passthrough devices .El .El .Pp +The .Fn devstat_compute_statistics +function is an updated version of .Fn compute_stats that provides more complete statistics calculation. -There are four arguments for which values \fBmust\fR be supplied: -.Va current , -.Va previous , -.Va etime , +There are four arguments for which values +.Em must +be supplied: +.Fa current , +.Fa previous , +.Fa etime , and the terminating argument for the varargs list, -.Va DSM_NONE . -For most applications, the user will want to supply valid devstat +.Dv DSM_NONE . +For most applications, the user will want to supply valid +.Vt devstat structures for both -.Va current +.Fa current and -.Va previous . +.Fa previous . In some instances, for instance when calculating statistics since system -boot, the user may pass in a NULL pointer for the -.Va previous +boot, the user may pass in a +.Dv NULL +pointer for the +.Fa previous argument. In that case, .Fn devstat_compute_statistics will use the total stats in the -.Va current +.Fa current structure to calculate statistics over -.Va etime . -For each statistic to be calculated, the user should supply the proper +.Fa etime . +For each statistics to be calculated, the user should supply the proper enumerated type (listed below), and a variable of the indicated type. -All statistics are either integer values, for which a u_int64_t is used, -or floating point, for which a long double is used. +All statistics are either integer values, for which a +.Vt u_int64_t +is used, +or floating point, for which a +.Vt "long double" +is used. The statistics that may be calculated are: -.Bl -tag -width DSM_TRANSFERS_PER_SECOND_OTHER -.It DSM_NONE +.Bl -tag -width ".Dv DSM_TRANSFERS_PER_SECOND_OTHER" +.It Dv DSM_NONE type: N/A .Pp -This \fBmust\fR +This +.Em must be the last argument passed to .Fn devstat_compute_statistics . It is an argument list terminator. -.It DSM_TOTAL_BYTES -type: u_int64_t * +.It Dv DSM_TOTAL_BYTES +type: +.Vt "u_int64_t *" .Pp The total number of bytes transferred between the acquisition of -.Va previous +.Fa previous and -.Va current . -.It DSM_TOTAL_BYTES_READ -.It DSM_TOTAL_BYTES_WRITE -.It DSM_TOTAL_BYTES_FREE -type: u_int64_t * +.Fa current . +.It Dv DSM_TOTAL_BYTES_READ +.It Dv DSM_TOTAL_BYTES_WRITE +.It Dv DSM_TOTAL_BYTES_FREE +type: +.Vt "u_int64_t *" .Pp The total number of bytes in transactions of the specified type between the acquisition of -.Va previous +.Fa previous and -.Va current . -.It DSM_TOTAL_TRANSFERS -type: u_int64_t * +.Fa current . +.It Dv DSM_TOTAL_TRANSFERS +type: +.Vt "u_int64_t *" .Pp The total number of transfers between the acquisition of -.Va previous +.Fa previous and -.Va current . -.It DSM_TOTAL_TRANSFERS_OTHER -.It DSM_TOTAL_TRANSFERS_READ -.It DSM_TOTAL_TRANSFERS_WRITE -.It DSM_TOTAL_TRANSFERS_FREE -type: u_int64_t * +.Fa current . +.It Dv DSM_TOTAL_TRANSFERS_OTHER +.It Dv DSM_TOTAL_TRANSFERS_READ +.It Dv DSM_TOTAL_TRANSFERS_WRITE +.It Dv DSM_TOTAL_TRANSFERS_FREE +type: +.Vt "u_int64_t *" .Pp The total number of transactions of the specified type between the acquisition of -.Va previous +.Fa previous and -.Va current . -.It DSM_TOTAL_BLOCKS -type: u_int64_t * +.Fa current . +.It Dv DSM_TOTAL_BLOCKS +type: +.Vt "u_int64_t *" .Pp The total number of blocks transferred between the acquisition of -.Va previous +.Fa previous and -.Va current . +.Fa current . This number is in terms of the blocksize reported by the device. If no blocksize has been reported (i.e., the block size is 0), a default blocksize of 512 bytes will be used in the calculation. -.It DSM_TOTAL_BLOCKS_READ -.It DSM_TOTAL_BLOCKS_WRITE -.It DSM_TOTAL_BLOCKS_FREE -type: u_int64_t * +.It Dv DSM_TOTAL_BLOCKS_READ +.It Dv DSM_TOTAL_BLOCKS_WRITE +.It Dv DSM_TOTAL_BLOCKS_FREE +type: +.Vt "u_int64_t *" .Pp The total number of blocks of the specified type between the acquisition of -.Va previous +.Fa previous and -.Va current . +.Fa current . This number is in terms of the blocksize reported by the device. If no blocksize has been reported (i.e., the block size is 0), a default blocksize of 512 bytes will be used in the calculation. -.It DSM_KB_PER_TRANSFER -type: long double * +.It Dv DSM_KB_PER_TRANSFER +type: +.Vt "long double *" .Pp The average number of kilobytes per transfer between the acquisition of -.Va previous +.Fa previous and -.Va current . -.It DSM_KB_PER_TRANSFER_READ -.It DSM_KB_PER_TRANSFER_WRITE -.It DSM_KB_PER_TRANSFER_FREE -type: long double * +.Fa current . +.It Dv DSM_KB_PER_TRANSFER_READ +.It Dv DSM_KB_PER_TRANSFER_WRITE +.It Dv DSM_KB_PER_TRANSFER_FREE +type: +.Vt "long double *" .Pp The average number of kilobytes in the specified type transaction between the acquisition of -.Va previous +.Fa previous and -.Va current . -.It DSM_TRANSFERS_PER_SECOND -type: long double * +.Fa current . +.It Dv DSM_TRANSFERS_PER_SECOND +type: +.Vt "long double *" .Pp The average number of transfers per second between the acquisition of -.Va previous +.Fa previous and -.Va current . -.It DSM_TRANSFERS_PER_SECOND_OTHER -.It DSM_TRANSFERS_PER_SECOND_READ -.It DSM_TRANSFERS_PER_SECOND_WRITE -.It DSM_TRANSFERS_PER_SECOND_FREE -type: long double * +.Fa current . +.It Dv DSM_TRANSFERS_PER_SECOND_OTHER +.It Dv DSM_TRANSFERS_PER_SECOND_READ +.It Dv DSM_TRANSFERS_PER_SECOND_WRITE +.It Dv DSM_TRANSFERS_PER_SECOND_FREE +type: +.Vt "long double *" .Pp The average number of transactions of the specified type per second between the acquisition of -.Va previous +.Fa previous and -.Va current . -.It DSM_MB_PER_SECOND -type: long double * +.Fa current . +.It Dv DSM_MB_PER_SECOND +type: +.Vt "long double *" .Pp The average number of megabytes transferred per second between the acquisition of -.Va previous +.Fa previous and -.Va current . -.It DSM_MB_PER_SECOND_READ -.It DSM_MB_PER_SECOND_WRITE -.It DSM_MB_PER_SECOND_FREE -type: long double * +.Fa current . +.It Dv DSM_MB_PER_SECOND_READ +.It Dv DSM_MB_PER_SECOND_WRITE +.It Dv DSM_MB_PER_SECOND_FREE +type: +.Vt "long double *" .Pp The average number of megabytes per second in the specified type of transaction between the acquisition of -.Va previous +.Fa previous and -.Va current . -.It DSM_BLOCKS_PER_SECOND -type: long double * +.Fa current . +.It Dv DSM_BLOCKS_PER_SECOND +type: +.Vt "long double *" .Pp The average number of blocks transferred per second between the acquisition of -.Va previous +.Fa previous and -.Va current . +.Fa current . This number is in terms of the blocksize reported by the device. If no blocksize has been reported (i.e., the block size is 0), a default blocksize of 512 bytes will be used in the calculation. -.It DSM_BLOCKS_PER_SECOND_READ -.It DSM_BLOCKS_PER_SECOND_WRITE -.It DSM_BLOCKS_PER_SECOND_FREE -type: long double * +.It Dv DSM_BLOCKS_PER_SECOND_READ +.It Dv DSM_BLOCKS_PER_SECOND_WRITE +.It Dv DSM_BLOCKS_PER_SECOND_FREE +type: +.Vt "long double *" .Pp The average number of blocks per second in the specificed type of transaction between the acquisition of -.Va previous +.Fa previous and -.Va current . +.Fa current . This number is in terms of the blocksize reported by the device. If no blocksize has been reported (i.e., the block size is 0), a default blocksize of 512 bytes will be used in the calculation. -.It DSM_MS_PER_TRANSACTION -type: long double * +.It Dv DSM_MS_PER_TRANSACTION +type: +.Vt "long double *" .Pp The average duration of transactions between the acquisition of -.Va previous +.Fa previous and -.Va current . -.It DSM_MS_PER_TRANSACTION_OTHER -.It DSM_MS_PER_TRANSACTION_READ -.It DSM_MS_PER_TRANSACTION_WRITE -.It DSM_MS_PER_TRANSACTION_FREE -type: long double * +.Fa current . +.It Dv DSM_MS_PER_TRANSACTION_OTHER +.It Dv DSM_MS_PER_TRANSACTION_READ +.It Dv DSM_MS_PER_TRANSACTION_WRITE +.It Dv DSM_MS_PER_TRANSACTION_FREE +type: +.Vt "long double *" .Pp The average duration of transactions of the specified type between the acquisition of -.Va previous +.Fa previous and -.Va current . -.It DSM_BUSY_PCT -type: long double * +.Fa current . +.It Dv DSM_BUSY_PCT +type: +.Vt "long double *" .Pp The percentage of time the device had one or more transactions outstanding between the acquisition of -.Va previous +.Fa previous and -.Va current . -.It DSM_QUEUE_LENGTH -type: u_int64_t * +.Fa current . +.It Dv DSM_QUEUE_LENGTH +type: +.Vt "u_int64_t *" .Pp The number of not yet completed transactions at the time when -.Va current +.Fa current was acquired. -.It DSM_SKIP +.It Dv DSM_SKIP type: N/A .Pp If you do not need a result from .Fn devstat_compute_statistics , just put -.Va DSM_SKIP +.Dv DSM_SKIP as first (type) parameter and -.Va NULL +.Dv NULL as second parameter. This can be useful in scenarios where the statistics to be calculated are determined at run time. @@ -629,33 +686,39 @@ .Pp .Fn devstat_compute_etime provides an easy way to find the difference in seconds between two -.Va bintime +.Vt bintime structures. This is most commonly used in conjunction with the time recorded by the .Fn devstat_getdevs -function (in struct -.Va statinfo ) +function (in +.Vt "struct statinfo" ) each time it fetches the current >>> TRUNCATED FOR MAIL (1000 lines) <<<
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200507011833.j61IXZUa006969>