mirror/freebsd
1
0
Fork 0
mirror of https://git.FreeBSD.org/src.git synced 2024-12-19 10:53:58 +00:00
Code Issues Releases Activity

Migrate struct carpstats to PCPU counters.

Browse Source
This commit is contained in:
Andrey V. Elsukov 2013-07-09 10:02:51 +00:00
parent 2841260cd6
commit 69edf037d7
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=253087
3 changed files with 25 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
sys/netinet/ip_carp.c
View File

@ -50,6 +50,7 @@ __FBSDID("$FreeBSD$");
#include <sys/sysctl.h> #include <sys/sysctl.h>
#include <sys/syslog.h> #include <sys/syslog.h>
#include <sys/taskqueue.h> #include <sys/taskqueue.h>
#include <sys/counter.h>
#include <net/ethernet.h> #include <net/ethernet.h>
#include <net/fddi.h> #include <net/fddi.h>
@ -209,9 +210,25 @@ SYSCTL_INT(_net_inet_carp, OID_AUTO, senderr_demotion_factor, CTLFLAG_RW,
SYSCTL_INT(_net_inet_carp, OID_AUTO, ifdown_demotion_factor, CTLFLAG_RW, SYSCTL_INT(_net_inet_carp, OID_AUTO, ifdown_demotion_factor, CTLFLAG_RW,
&carp_ifdown_adj, 0, "Interface down demotion factor adjustment"); &carp_ifdown_adj, 0, "Interface down demotion factor adjustment");
static struct carpstats carpstats; static counter_u64_t carpstats[sizeof(struct carpstats) / sizeof(uint64_t)];
SYSCTL_STRUCT(_net_inet_carp, OID_AUTO, stats, CTLFLAG_RW, &carpstats, #define CARPSTATS_ADD(name, val) \
carpstats, "CARP statistics (struct carpstats, netinet/ip_carp.h)"); counter_u64_add(carpstats[offsetof(struct carpstats, name) / \
sizeof(uint64_t)], (val))
#define CARPSTATS_INC(name) CARPSTATS_ADD(name, 1)
static int
carpstats_sysctl(SYSCTL_HANDLER_ARGS)
{
struct carpstats s;
COUNTER_ARRAY_COPY(carpstats, &s, sizeof(s) / sizeof(uint64_t));
if (req->newptr)
COUNTER_ARRAY_ZERO(carpstats, sizeof(s) / sizeof(uint64_t));
return (SYSCTL_OUT(req, &s, sizeof(s)));
}
SYSCTL_PROC(_net_inet_carp, OID_AUTO, stats, CTLTYPE_OPAQUE | CTLFLAG_RW,
NULL, 0, carpstats_sysctl, "I",
"CARP statistics (struct carpstats, netinet/ip_carp.h)");
#define CARP_LOCK_INIT(sc) mtx_init(&(sc)->sc_mtx, "carp_softc", \ #define CARP_LOCK_INIT(sc) mtx_init(&(sc)->sc_mtx, "carp_softc", \
NULL, MTX_DEF) NULL, MTX_DEF)
@ -2084,6 +2101,8 @@ carp_mod_cleanup(void)
mtx_unlock(&carp_mtx); mtx_unlock(&carp_mtx);
taskqueue_drain(taskqueue_swi, &carp_sendall_task); taskqueue_drain(taskqueue_swi, &carp_sendall_task);
mtx_destroy(&carp_mtx); mtx_destroy(&carp_mtx);
COUNTER_ARRAY_FREE(carpstats,
sizeof(struct carpstats) / sizeof(uint64_t));
} }
static int static int
@ -2093,6 +2112,8 @@ carp_mod_load(void)
mtx_init(&carp_mtx, "carp_mtx", NULL, MTX_DEF); mtx_init(&carp_mtx, "carp_mtx", NULL, MTX_DEF);
LIST_INIT(&carp_list); LIST_INIT(&carp_list);
COUNTER_ARRAY_ALLOC(carpstats,
sizeof(struct carpstats) / sizeof(uint64_t), M_WAITOK);
carp_get_vhid_p = carp_get_vhid; carp_get_vhid_p = carp_get_vhid;
carp_forus_p = carp_forus; carp_forus_p = carp_forus;
carp_output_p = carp_output; carp_output_p = carp_output;

5
sys/netinet/ip_carp.h
View File

@ -117,11 +117,6 @@ struct carpstats {
uint64_t carps_preempt; /* if enabled, preemptions */ uint64_t carps_preempt; /* if enabled, preemptions */
}; };
#ifdef _KERNEL
#define CARPSTATS_ADD(name, val) carpstats.name += (val)
#define CARPSTATS_INC(name) CARPSTATS_ADD(name, 1)
#endif
/* /*
* Configuration structure for SIOCSVH SIOCGVH * Configuration structure for SIOCSVH SIOCGVH
*/ */

2
usr.bin/netstat/inet.c
View File

@ -811,7 +811,7 @@ carp_stats(u_long off, const char *name, int af1 __unused, int proto __unused)
} else { } else {
if (off == 0) if (off == 0)
return; return;
kread(off, &carpstat, len); kread_counters(off, &carpstat, len);
} }
printf("%s:\n", name); printf("%s:\n", name);