Author: glebius
Date: Tue Mar 4 14:23:58 2014
New Revision: 262738
URL: http://svnweb.freebsd.org/changeset/base/262738
Log:
Merge 261595: simplify the SYSCTL_COUNTER_U64() macro.
Modified:
stable/10/share/man/man9/counter.9
stable/10/sys/sys/sysctl.h
Directory Properties:
stable/10/ (props changed)
Modified: stable/10/share/man/man9/counter.9
==============================================================================
--- stable/10/share/man/man9/counter.9 Tue Mar 4 14:21:07 2014
(r262737)
+++ stable/10/share/man/man9/counter.9 Tue Mar 4 14:23:58 2014
(r262738)
@@ -25,7 +25,7 @@
.\"
.\" $FreeBSD$
.\"
-.Dd April 3, 2013
+.Dd February 7, 2014
.Dt COUNTER 9
.Os
.Sh NAME
@@ -52,7 +52,7 @@
.Ft void
.Fn counter_u64_zero "counter_u64_t c"
.In sys/sysctl.h
-.Fn SYSCTL_COUNTER_U64 parent nbr name access ptr val descr
+.Fn SYSCTL_COUNTER_U64 parent nbr name access ptr descr
.Fn SYSCTL_ADD_COUNTER_U64 ctx parent nbr name access ptr descr
.Sh DESCRIPTION
.Nm
@@ -126,7 +126,7 @@ value for any moment.
Clear the counter
.Fa c
and set it to zero.
-.It Fn SYSCTL_COUNTER_U64 parent nbr name access ptr val descr
+.It Fn SYSCTL_COUNTER_U64 parent nbr name access ptr descr
Declare a static
.Xr sysctl
oid that would represent a
Modified: stable/10/sys/sys/sysctl.h
==============================================================================
--- stable/10/sys/sys/sysctl.h Tue Mar 4 14:21:07 2014 (r262737)
+++ stable/10/sys/sys/sysctl.h Tue Mar 4 14:23:58 2014 (r262738)
@@ -393,11 +393,11 @@ SYSCTL_ALLOWED_TYPES(UINT64, uint64_t *a
sysctl_handle_64, "QU", __DESCR(descr))
/* Oid for a 64-bit unsigned counter(9). The pointer must be non NULL. */
-#define SYSCTL_COUNTER_U64(parent, nbr, name, access, ptr, val, descr)
\
+#define SYSCTL_COUNTER_U64(parent, nbr, name, access, ptr, descr)
\
SYSCTL_ASSERT_TYPE(UINT64, ptr, parent, name); \
SYSCTL_OID(parent, nbr, name, \
CTLTYPE_U64 | CTLFLAG_MPSAFE | (access), \
- ptr, val, sysctl_handle_counter_u64, "QU", descr)
+ ptr, 0, sysctl_handle_counter_u64, "QU", descr)
#define SYSCTL_ADD_COUNTER_U64(ctx, parent, nbr, name, access, ptr,
descr)\
sysctl_add_oid(ctx, parent, nbr, name, \
_______________________________________________
[email protected] mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "[email protected]"
