svn commit: r248795 - in projects/counters: share/man/man9 sys/amd64/include sys/arm/include sys/i386/include sys/ia64/include sys/mips/include sys/netinet sys/powerpc/include sys/sparc64/include
Gleb Smirnoff
glebius at FreeBSD.org
Wed Mar 27 11:58:11 UTC 2013
Author: glebius
Date: Wed Mar 27 11:58:08 2013
New Revision: 248795
URL: http://svnweb.freebsd.org/changeset/base/248795
Log:
Mechanically rename:
counter_u64_inc -> counter_u64_add
counter_u64_dec -> counter_u64_subtract
This is done to match atomic(9) API, making it
easier to remember.
Discussed with: kib
Modified:
projects/counters/share/man/man9/Makefile
projects/counters/share/man/man9/counter.9
projects/counters/sys/amd64/include/counter.h
projects/counters/sys/arm/include/counter.h
projects/counters/sys/i386/include/counter.h
projects/counters/sys/ia64/include/counter.h
projects/counters/sys/mips/include/counter.h
projects/counters/sys/netinet/ip_input.c
projects/counters/sys/netinet/ip_var.h
projects/counters/sys/netinet/tcp_input.c
projects/counters/sys/netinet/tcp_var.h
projects/counters/sys/powerpc/include/counter.h
projects/counters/sys/sparc64/include/counter.h
Modified: projects/counters/share/man/man9/Makefile
==============================================================================
--- projects/counters/share/man/man9/Makefile Wed Mar 27 11:47:52 2013 (r248794)
+++ projects/counters/share/man/man9/Makefile Wed Mar 27 11:58:08 2013 (r248795)
@@ -572,8 +572,8 @@ MLINKS+=copy.9 copyin.9 \
copy.9 copystr.9
MLINKS+=counter.9 counter_u64_alloc.9 \
counter.9 counter_u64_free.9 \
- counter.9 counter_u64_inc.9 \
- counter.9 counter_u64_dec.9 \
+ counter.9 counter_u64_add.9 \
+ counter.9 counter_u64_subtract.9 \
counter.9 counter_u64_fetch.9 \
counter.9 counter_u64_zero.9
MLINKS+=critical_enter.9 critical.9 \
Modified: projects/counters/share/man/man9/counter.9
==============================================================================
--- projects/counters/share/man/man9/counter.9 Wed Mar 27 11:47:52 2013 (r248794)
+++ projects/counters/share/man/man9/counter.9 Wed Mar 27 11:58:08 2013 (r248795)
@@ -39,9 +39,9 @@
.Ft void
.Fn counter_u64_free "counter_u64_t cnt"
.Ft void
-.Fn counter_u64_inc "counter_u64_t cnt" "uint64_t inc"
+.Fn counter_u64_add "counter_u64_t cnt" "uint64_t inc"
.Ft void
-.Fn counter_u64_dec "counter_u64_t cnt" "uint64_t dec"
+.Fn counter_u64_subtract "counter_u64_t cnt" "uint64_t dec"
.Ft uint64_t
.Fn counter_u64_fetch "counter_u64_t cnt"
.Ft void
@@ -92,13 +92,13 @@ is specified the operation may fail.
Free previously allocated
.Nm
.Fa cnt .
-.It Fn counter_u64_inc cnt inc
+.It Fn counter_u64_add cnt inc
Add value of
.Fa inc
to
.Nm
.Fa cnt .
-.It Fn counter_u64_dec cnt dec
+.It Fn counter_u64_subtract cnt dec
Subtract value of
.Fa dec
from
Modified: projects/counters/sys/amd64/include/counter.h
==============================================================================
--- projects/counters/sys/amd64/include/counter.h Wed Mar 27 11:47:52 2013 (r248794)
+++ projects/counters/sys/amd64/include/counter.h Wed Mar 27 11:58:08 2013 (r248795)
@@ -34,7 +34,7 @@
extern struct pcpu __pcpu[1];
static inline void
-counter_u64_inc(counter_u64_t c, uint64_t inc)
+counter_u64_add(counter_u64_t c, uint64_t inc)
{
__asm __volatile("addq\t%1,%%gs:(%0)"
@@ -44,7 +44,7 @@ counter_u64_inc(counter_u64_t c, uint64_
}
static inline void
-counter_u64_dec(counter_u64_t c, uint64_t dec)
+counter_u64_subtract(counter_u64_t c, uint64_t dec)
{
__asm __volatile("subq\t%1,%%gs:(%0)"
Modified: projects/counters/sys/arm/include/counter.h
==============================================================================
--- projects/counters/sys/arm/include/counter.h Wed Mar 27 11:47:52 2013 (r248794)
+++ projects/counters/sys/arm/include/counter.h Wed Mar 27 11:58:08 2013 (r248795)
@@ -32,7 +32,7 @@
#include <sys/pcpu.h>
static inline void
-counter_u64_inc(counter_u64_t c, uint64_t inc)
+counter_u64_add(counter_u64_t c, uint64_t inc)
{
critical_enter();
@@ -41,7 +41,7 @@ counter_u64_inc(counter_u64_t c, uint64_
}
static inline void
-counter_u64_dec(counter_u64_t c, uint64_t dec)
+counter_u64_subtract(counter_u64_t c, uint64_t dec)
{
critical_enter();
Modified: projects/counters/sys/i386/include/counter.h
==============================================================================
--- projects/counters/sys/i386/include/counter.h Wed Mar 27 11:47:52 2013 (r248794)
+++ projects/counters/sys/i386/include/counter.h Wed Mar 27 11:58:08 2013 (r248795)
@@ -53,7 +53,7 @@ counter_64_inc_8b(uint64_t *p, uint64_t
}
static inline void
-counter_u64_inc(counter_u64_t c, uint64_t inc)
+counter_u64_add(counter_u64_t c, uint64_t inc)
{
if ((cpu_feature & CPUID_CX8) == 0) {
@@ -66,10 +66,10 @@ counter_u64_inc(counter_u64_t c, uint64_
}
static inline void
-counter_u64_dec(counter_u64_t c, uint64_t dec)
+counter_u64_subtract(counter_u64_t c, uint64_t dec)
{
- counter_u64_inc(c, -(int64_t)dec);
+ counter_u64_add(c, -(int64_t)dec);
}
#endif /* ! __MACHINE_COUNTER_H__ */
Modified: projects/counters/sys/ia64/include/counter.h
==============================================================================
--- projects/counters/sys/ia64/include/counter.h Wed Mar 27 11:47:52 2013 (r248794)
+++ projects/counters/sys/ia64/include/counter.h Wed Mar 27 11:58:08 2013 (r248795)
@@ -32,7 +32,7 @@
#include <sys/pcpu.h>
static inline void
-counter_u64_inc(counter_u64_t c, uint64_t inc)
+counter_u64_add(counter_u64_t c, uint64_t inc)
{
critical_enter();
@@ -41,7 +41,7 @@ counter_u64_inc(counter_u64_t c, uint64_
}
static inline void
-counter_u64_dec(counter_u64_t c, uint64_t dec)
+counter_u64_subtract(counter_u64_t c, uint64_t dec)
{
critical_enter();
Modified: projects/counters/sys/mips/include/counter.h
==============================================================================
--- projects/counters/sys/mips/include/counter.h Wed Mar 27 11:47:52 2013 (r248794)
+++ projects/counters/sys/mips/include/counter.h Wed Mar 27 11:58:08 2013 (r248795)
@@ -32,7 +32,7 @@
#include <sys/pcpu.h>
static inline void
-counter_u64_inc(counter_u64_t c, uint64_t inc)
+counter_u64_add(counter_u64_t c, uint64_t inc)
{
critical_enter();
@@ -41,7 +41,7 @@ counter_u64_inc(counter_u64_t c, uint64_
}
static inline void
-counter_u64_dec(counter_u64_t c, uint64_t dec)
+counter_u64_subtract(counter_u64_t c, uint64_t dec)
{
critical_enter();
Modified: projects/counters/sys/netinet/ip_input.c
==============================================================================
--- projects/counters/sys/netinet/ip_input.c Wed Mar 27 11:47:52 2013 (r248794)
+++ projects/counters/sys/netinet/ip_input.c Wed Mar 27 11:58:08 2013 (r248795)
@@ -286,14 +286,14 @@ void
kmod_ipstat_inc(int statnum)
{
- counter_u64_inc((counter_u64_t )&V_ipstatp + statnum, 1);
+ counter_u64_add((counter_u64_t )&V_ipstatp + statnum, 1);
}
void
kmod_ipstat_dec(int statnum)
{
- counter_u64_dec((counter_u64_t )&V_ipstatp + statnum, 1);
+ counter_u64_subtract((counter_u64_t )&V_ipstatp + statnum, 1);
}
static int
Modified: projects/counters/sys/netinet/ip_var.h
==============================================================================
--- projects/counters/sys/netinet/ip_var.h Wed Mar 27 11:47:52 2013 (r248794)
+++ projects/counters/sys/netinet/ip_var.h Wed Mar 27 11:58:08 2013 (r248795)
@@ -172,8 +172,8 @@ VNET_DECLARE(struct ipstat_p, ipstatp);
* In-kernel consumers can use these accessor macros directly to update
* stats.
*/
-#define IPSTAT_ADD(name, val) counter_u64_inc(V_ipstatp.name, (val))
-#define IPSTAT_SUB(name, val) counter_u64_dec(V_ipstatp.name, (val))
+#define IPSTAT_ADD(name, val) counter_u64_add(V_ipstatp.name, (val))
+#define IPSTAT_SUB(name, val) counter_u64_subtract(V_ipstatp.name, (val))
#define IPSTAT_INC(name) IPSTAT_ADD(name, 1)
#define IPSTAT_DEC(name) IPSTAT_SUB(name, 1)
Modified: projects/counters/sys/netinet/tcp_input.c
==============================================================================
--- projects/counters/sys/netinet/tcp_input.c Wed Mar 27 11:47:52 2013 (r248794)
+++ projects/counters/sys/netinet/tcp_input.c Wed Mar 27 11:58:08 2013 (r248795)
@@ -313,7 +313,7 @@ void
kmod_tcpstat_inc(int statnum)
{
- counter_u64_inc((counter_u64_t )&V_tcpstatp + statnum, 1);
+ counter_u64_add((counter_u64_t )&V_tcpstatp + statnum, 1);
}
/*
Modified: projects/counters/sys/netinet/tcp_var.h
==============================================================================
--- projects/counters/sys/netinet/tcp_var.h Wed Mar 27 11:47:52 2013 (r248794)
+++ projects/counters/sys/netinet/tcp_var.h Wed Mar 27 11:58:08 2013 (r248795)
@@ -615,7 +615,7 @@ VNET_DECLARE(struct tcpstat_p, tcpstatp)
* In-kernel consumers can use these accessor macros directly to update
* stats.
*/
-#define TCPSTAT_ADD(name, val) counter_u64_inc(V_tcpstatp.name, (val))
+#define TCPSTAT_ADD(name, val) counter_u64_add(V_tcpstatp.name, (val))
#define TCPSTAT_INC(name) TCPSTAT_ADD(name, 1)
/*
Modified: projects/counters/sys/powerpc/include/counter.h
==============================================================================
--- projects/counters/sys/powerpc/include/counter.h Wed Mar 27 11:47:52 2013 (r248794)
+++ projects/counters/sys/powerpc/include/counter.h Wed Mar 27 11:58:08 2013 (r248795)
@@ -34,7 +34,7 @@
#if defined(AIM) && defined(__powerpc64__)
static inline void
-counter_u64_inc(counter_u64_t c, uint64_t inc)
+counter_u64_add(counter_u64_t c, uint64_t inc)
{
uint64_t ccpu, old;
@@ -51,16 +51,16 @@ counter_u64_inc(counter_u64_t c, uint64_
}
static inline void
-counter_u64_dec(counter_u64_t c, uint64_t dec)
+counter_u64_subtract(counter_u64_t c, uint64_t dec)
{
- counter_u64_inc(c, -dec);
+ counter_u64_add(c, -dec);
}
#else /* !AIM || !64bit */
static inline void
-counter_u64_inc(counter_u64_t c, uint64_t inc)
+counter_u64_add(counter_u64_t c, uint64_t inc)
{
critical_enter();
@@ -69,7 +69,7 @@ counter_u64_inc(counter_u64_t c, uint64_
}
static inline void
-counter_u64_dec(counter_u64_t c, uint64_t dec)
+counter_u64_subtract(counter_u64_t c, uint64_t dec)
{
critical_enter();
Modified: projects/counters/sys/sparc64/include/counter.h
==============================================================================
--- projects/counters/sys/sparc64/include/counter.h Wed Mar 27 11:47:52 2013 (r248794)
+++ projects/counters/sys/sparc64/include/counter.h Wed Mar 27 11:58:08 2013 (r248795)
@@ -32,7 +32,7 @@
#include <sys/pcpu.h>
static inline void
-counter_u64_inc(counter_u64_t c, uint64_t inc)
+counter_u64_add(counter_u64_t c, uint64_t inc)
{
critical_enter();
@@ -41,7 +41,7 @@ counter_u64_inc(counter_u64_t c, uint64_
}
static inline void
-counter_u64_dec(counter_u64_t c, uint64_t dec)
+counter_u64_subtract(counter_u64_t c, uint64_t dec)
{
critical_enter();
More information about the svn-src-projects
mailing list