Separate vm.stats.sys.v_forks module
Vladimir Kobal committed
Mar 9, 2017 at 02:22 UTC
a7fe8a2acaf490ce7de877cbc5a808cf816f6710
3 files changed
+49
-29
src/freebsd_sysctl.c
+42
-25
@@ -576,7 +576,6 @@ int do_vm_stats_sys_v_swtch(int update_every, usec_t dt) {
576
static RRDSET *st = NULL;
577
static RRDDIM *rd = NULL;
578
579
- st = rrdset_find_bytype_localhost("system", "ctxt");
579
if (unlikely(!st)) {
580
st = rrdset_create_localhost("system",
581
"ctxt",
@@ -601,6 +600,47 @@ int do_vm_stats_sys_v_swtch(int update_every, usec_t dt) {
600
return 0;
601
}
602
603
+// --------------------------------------------------------------------------------------------------------------------
604
+// vm.stats.vm.v_forks
605
+
606
+int do_vm_stats_sys_v_forks(int update_every, usec_t dt) {
607
+ static int mib[4] = {0, 0, 0, 0};
608
+ u_int forks_number;
609
+
610
+ if (unlikely(GETSYSCTL_SIMPLE("vm.stats.vm.v_forks", mib, forks_number))) {
611
+ error("DISABLED: system.forks chart");
612
+ error("DISABLED: vm.stats.sys.v_swtch module");
613
+ return 1;
614
+ } else {
615
+ static RRDSET *st = NULL;
616
+ static RRDDIM *rd = NULL;
617
+
618
+ if (unlikely(!st)) {
619
+ st = rrdset_create_localhost("system",
620
+ "forks",
621
+ NULL,
622
+ "processes",
623
+ NULL,
624
+ "Started Processes",
625
+ "processes/s",
626
+ 700,
627
+ update_every,
628
+ RRDSET_TYPE_LINE
629
+ );
630
+
631
+ rrdset_flag_set(st, RRDSET_FLAG_DETAIL);
632
+
633
+ rd = rrddim_add(st, "started", NULL, 1, 1, RRD_ALGORITHM_INCREMENTAL);
634
+ }
635
+ else rrdset_next(st);
636
+
637
+ rrddim_set_by_pointer(st, rd, forks_number);
638
+ rrdset_done(st);
639
+ }
640
+
641
+ return 0;
642
+}
643
+
644
// --------------------------------------------------------------------------------------------------------------------
645
// old sources
646
@@ -611,7 +651,7 @@ int do_vm_stats_sys_v_swtch(int update_every, usec_t dt) {
651
#define IFA_DATA(s) (((struct if_data *)ifa->ifa_data)->ifi_ ## s)
652
653
int do_freebsd_sysctl_old(int update_every, usec_t dt) {
614
- static int do_forks = -1, do_disk_io = -1, do_swap = -1, do_ram = -1, do_swapio = -1,
654
+ static int do_disk_io = -1, do_swap = -1, do_ram = -1, do_swapio = -1,
655
do_pgfaults = -1, do_ipc_semaphores = -1, do_ipc_shared_mem = -1, do_ipc_msg_queues = -1,
656
do_netisr = -1, do_netisr_per_core = -1, do_bandwidth = -1,
657
do_tcp_sockets = -1, do_tcp_packets = -1, do_tcp_errors = -1, do_tcp_handshake = -1,
@@ -623,7 +663,6 @@ int do_freebsd_sysctl_old(int update_every, usec_t dt) {
663
do_icmp6_neighbor = -1, do_icmp6_types = -1, do_space = -1, do_inodes = -1, do_uptime = -1;
664
665
if (unlikely(do_uptime == -1)) {
626
- do_forks = config_get_boolean("plugin:freebsd:sysctl", "processes started", 1);
666
do_disk_io = config_get_boolean("plugin:freebsd:sysctl", "stats for all disks", 1);
667
do_swap = config_get_boolean("plugin:freebsd:sysctl", "system swap", 1);
668
do_ram = config_get_boolean("plugin:freebsd:sysctl", "system ram", 1);
@@ -800,28 +839,6 @@ int do_freebsd_sysctl_old(int update_every, usec_t dt) {
839
840
// --------------------------------------------------------------------
841
803
- if (likely(do_forks)) {
804
- if (unlikely(GETSYSCTL_BY_NAME("vm.stats.vm.v_forks", u_int_data))) {
805
- do_forks = 0;
806
- error("DISABLED: system.forks");
807
- } else {
808
-
809
- st = rrdset_find_bytype_localhost("system", "forks");
810
- if (unlikely(!st)) {
811
- st = rrdset_create_localhost("system", "forks", NULL, "processes", NULL, "Started Processes", "processes/s", 700, update_every, RRDSET_TYPE_LINE);
812
- rrdset_flag_set(st, RRDSET_FLAG_DETAIL);
813
-
814
- rrddim_add(st, "started", NULL, 1, 1, RRD_ALGORITHM_INCREMENTAL);
815
- }
816
- else rrdset_next(st);
817
-
818
- rrddim_set(st, "started", u_int_data);
819
- rrdset_done(st);
820
- }
821
- }
822
-
823
- // --------------------------------------------------------------------
824
-
842
if (likely(do_disk_io)) {
843
if (unlikely(GETSYSCTL_BY_NAME("kern.devstat.numdevs", numdevs))) {
844
do_disk_io = 0;
src/plugin_freebsd.c
+5
-4
@@ -20,10 +20,11 @@ static struct freebsd_module {
20
{ .name = "vm.vmtotal", .dim = "vmtotal", .enabled = 1, .func = do_vm_vmtotal },
21
{ .name = "kern.cp_time", .dim = "cp_time", .enabled = 1, .func = do_kern_cp_time },
22
{ .name = "kern.cp_times", .dim = "cp_times", .enabled = 1, .func = do_kern_cp_times },
23
- { .name = "hw.intrcnt", .dim = "hw_intrcnt", .enabled = 1, .func = do_hw_intcnt },
24
- { .name = "vm.stats.sys.v_intr", .dim = "dev_intrcnt", .enabled = 1, .func = do_vm_stats_sys_v_intr },
25
- { .name = "vm.stats.sys.v_soft", .dim = "dev_intrcnt", .enabled = 1, .func = do_vm_stats_sys_v_soft },
26
- { .name = "vm.stats.sys.v_swtch", .dim = "dev_intrcnt", .enabled = 1, .func = do_vm_stats_sys_v_swtch },
23
+ { .name = "hw.intrcnt", .dim = "hw_intr", .enabled = 1, .func = do_hw_intcnt },
24
+ { .name = "vm.stats.sys.v_intr", .dim = "dev_intr", .enabled = 1, .func = do_vm_stats_sys_v_intr },
25
+ { .name = "vm.stats.sys.v_soft", .dim = "soft_intr", .enabled = 1, .func = do_vm_stats_sys_v_soft },
26
+ { .name = "vm.stats.sys.v_swtch", .dim = "context_swtch", .enabled = 1, .func = do_vm_stats_sys_v_swtch },
27
+ { .name = "vm.stats.vm.v_forks", .dim = "forks", .enabled = 1, .func = do_vm_stats_sys_v_forks },
28
29
// the terminator of this array
30
{ .name = NULL, .dim = NULL, .enabled = 0, .func = NULL }
src/plugin_freebsd.h
+2
@@ -15,6 +15,8 @@ extern int do_hw_intcnt(int update_every, usec_t dt);
15
extern int do_vm_stats_sys_v_intr(int update_every, usec_t dt);
16
extern int do_vm_stats_sys_v_soft(int update_every, usec_t dt);
17
extern int do_vm_stats_sys_v_swtch(int update_every, usec_t dt);
18
+extern int do_vm_stats_sys_v_forks(int update_every, usec_t dt);
19
+
20
extern int do_freebsd_sysctl_old(int update_every, usec_t dt);
21
22
#define GETSYSCTL_MIB(name, mib) getsysctl_mib(name, mib, sizeof(mib)/sizeof(int))