Minor style cleanups
Vladimir Kobal committed
Mar 14, 2017 at 20:43 UTC
765bd4a30f8a55bb042b98cf9934f00d883eec6e
1 file changed
+106
-108
src/freebsd_sysctl.c
+106
-108
@@ -177,7 +177,6 @@ int do_vm_vmtotal(int update_every, usec_t dt) {
177
static RRDSET *st = NULL;
178
static RRDDIM *rd_running = NULL, *rd_blocked = NULL;
179
180
- st = rrdset_find_bytype_localhost("system", "processes");
180
if (unlikely(!st)) {
181
st = rrdset_create_localhost("system",
182
"processes",
@@ -334,15 +333,15 @@ int do_kern_cp_times(int update_every, usec_t dt) {
333
if (unlikely(!all_cpu_charts[i].st)) {
334
snprintfz(all_cpu_charts[i].cpuid, MAX_INT_DIGITS, "cpu%d", i);
335
all_cpu_charts[i].st = rrdset_create_localhost("cpu",
337
- all_cpu_charts[i].cpuid,
338
- NULL,
339
- "utilization",
340
- "cpu.cpu",
341
- "Core utilization",
342
- "percentage",
343
- 1000,
344
- update_every,
345
- RRDSET_TYPE_STACKED
336
+ all_cpu_charts[i].cpuid,
337
+ NULL,
338
+ "utilization",
339
+ "cpu.cpu",
340
+ "Core utilization",
341
+ "percentage",
342
+ 1000,
343
+ update_every,
344
+ RRDSET_TYPE_STACKED
345
);
346
347
all_cpu_charts[i].rd_nice = rrddim_add(all_cpu_charts[i].st, "nice", NULL, 1, 1,
@@ -407,15 +406,15 @@ int do_hw_intcnt(int update_every, usec_t dt) {
406
407
if (unlikely(!st_intr)) {
408
st_intr = rrdset_create_localhost("system",
410
- "intr",
411
- NULL,
412
- "interrupts",
413
- NULL,
414
- "Total Hardware Interrupts",
415
- "interrupts/s",
416
- 900,
417
- update_every,
418
- RRDSET_TYPE_LINE
409
+ "intr",
410
+ NULL,
411
+ "interrupts",
412
+ NULL,
413
+ "Total Hardware Interrupts",
414
+ "interrupts/s",
415
+ 900,
416
+ update_every,
417
+ RRDSET_TYPE_LINE
418
);
419
rrdset_flag_set(st_intr, RRDSET_FLAG_DETAIL);
420
@@ -449,15 +448,15 @@ int do_hw_intcnt(int update_every, usec_t dt) {
448
449
if (unlikely(!st_interrupts))
450
st_interrupts = rrdset_create_localhost("system",
452
- "interrupts",
453
- NULL,
454
- "interrupts",
455
- NULL,
456
- "System interrupts",
457
- "interrupts/s",
458
- 1000,
459
- update_every,
460
- RRDSET_TYPE_STACKED
451
+ "interrupts",
452
+ NULL,
453
+ "interrupts",
454
+ NULL,
455
+ "System interrupts",
456
+ "interrupts/s",
457
+ 1000,
458
+ update_every,
459
+ RRDSET_TYPE_STACKED
460
);
461
else
462
rrdset_next(st_interrupts);
@@ -497,7 +496,6 @@ int do_vm_stats_sys_v_intr(int update_every, usec_t dt) {
496
static RRDSET *st = NULL;
497
static RRDDIM *rd = NULL;
498
500
- st = rrdset_find_bytype_localhost("system", "dev_intr");
499
if (unlikely(!st)) {
500
st = rrdset_create_localhost("system",
501
"dev_intr",
@@ -1486,23 +1484,23 @@ int do_net_inet_tcp_stats(int update_every, usec_t dt) {
1484
1485
if (unlikely(!st)) {
1486
st = rrdset_create_localhost("ipv4",
1489
- "tcppackets",
1490
- NULL,
1491
- "tcp",
1492
- NULL,
1493
- "IPv4 TCP Packets",
1494
- "packets/s",
1495
- 2600,
1496
- update_every,
1497
- RRDSET_TYPE_LINE
1487
+ "tcppackets",
1488
+ NULL,
1489
+ "tcp",
1490
+ NULL,
1491
+ "IPv4 TCP Packets",
1492
+ "packets/s",
1493
+ 2600,
1494
+ update_every,
1495
+ RRDSET_TYPE_LINE
1496
);
1497
1500
- rd_in_segs = rrddim_add(st, "InSegs", "received", 1, 1, RRD_ALGORITHM_INCREMENTAL);
1501
- rd_out_segs = rrddim_add(st, "OutSegs", "sent", -1, 1, RRD_ALGORITHM_INCREMENTAL);
1498
+ rd_in_segs = rrddim_add(st, "InSegs", "received", 1, 1, RRD_ALGORITHM_INCREMENTAL);
1499
+ rd_out_segs = rrddim_add(st, "OutSegs", "sent", -1, 1, RRD_ALGORITHM_INCREMENTAL);
1500
} else
1501
rrdset_next(st);
1502
1505
- rrddim_set_by_pointer(st, rd_in_segs, tcpstat.tcps_rcvtotal);
1503
+ rrddim_set_by_pointer(st, rd_in_segs, tcpstat.tcps_rcvtotal);
1504
rrddim_set_by_pointer(st, rd_out_segs, tcpstat.tcps_sndtotal);
1505
rrdset_done(st);
1506
}
@@ -1515,15 +1513,15 @@ int do_net_inet_tcp_stats(int update_every, usec_t dt) {
1513
1514
if (unlikely(!st)) {
1515
st = rrdset_create_localhost("ipv4",
1518
- "tcperrors",
1519
- NULL,
1520
- "tcp",
1521
- NULL,
1522
- "IPv4 TCP Errors",
1523
- "packets/s",
1524
- 2700,
1525
- update_every,
1526
- RRDSET_TYPE_LINE
1516
+ "tcperrors",
1517
+ NULL,
1518
+ "tcp",
1519
+ NULL,
1520
+ "IPv4 TCP Errors",
1521
+ "packets/s",
1522
+ 2700,
1523
+ update_every,
1524
+ RRDSET_TYPE_LINE
1525
);
1526
1527
rrdset_flag_set(st, RRDSET_FLAG_DETAIL);
@@ -1536,7 +1534,7 @@ int do_net_inet_tcp_stats(int update_every, usec_t dt) {
1534
1535
#if __FreeBSD__ >= 11
1536
rrddim_set_by_pointer(st, rd_in_errs, tcpstat.tcps_rcvbadoff + tcpstat.tcps_rcvreassfull +
1539
- tcpstat.tcps_rcvshort);
1537
+ tcpstat.tcps_rcvshort);
1538
#else
1539
rrddim_set_by_pointer(st, rd_in_errs, tcpstat.tcps_rcvbadoff + tcpstat.tcps_rcvshort);
1540
#endif
@@ -1554,15 +1552,15 @@ int do_net_inet_tcp_stats(int update_every, usec_t dt) {
1552
1553
if (unlikely(!st)) {
1554
st = rrdset_create_localhost("ipv4",
1557
- "tcphandshake",
1558
- NULL,
1559
- "tcp",
1560
- NULL,
1561
- "IPv4 TCP Handshake Issues",
1562
- "events/s",
1563
- 2900,
1564
- update_every,
1565
- RRDSET_TYPE_LINE
1555
+ "tcphandshake",
1556
+ NULL,
1557
+ "tcp",
1558
+ NULL,
1559
+ "IPv4 TCP Handshake Issues",
1560
+ "events/s",
1561
+ 2900,
1562
+ update_every,
1563
+ RRDSET_TYPE_LINE
1564
);
1565
1566
rrdset_flag_set(st, RRDSET_FLAG_DETAIL);
@@ -1592,15 +1590,15 @@ int do_net_inet_tcp_stats(int update_every, usec_t dt) {
1590
1591
if (unlikely(!st)) {
1592
st = rrdset_create_localhost("ipv4",
1595
- "tcpconnaborts",
1596
- NULL,
1597
- "tcp",
1598
- NULL,
1599
- "TCP Connection Aborts",
1600
- "connections/s",
1601
- 3010,
1602
- update_every,
1603
- RRDSET_TYPE_LINE
1593
+ "tcpconnaborts",
1594
+ NULL,
1595
+ "tcp",
1596
+ NULL,
1597
+ "TCP Connection Aborts",
1598
+ "connections/s",
1599
+ 3010,
1600
+ update_every,
1601
+ RRDSET_TYPE_LINE
1602
);
1603
1604
rd_on_data = rrddim_add(st, "TCPAbortOnData", "baddata", 1, 1, RRD_ALGORITHM_INCREMENTAL);
@@ -1629,15 +1627,15 @@ int do_net_inet_tcp_stats(int update_every, usec_t dt) {
1627
1628
if (unlikely(!st)) {
1629
st = rrdset_create_localhost("ipv4",
1632
- "tcpofo",
1633
- NULL,
1634
- "tcp",
1635
- NULL,
1636
- "TCP Out-Of-Order Queue",
1637
- "packets/s",
1638
- 3050,
1639
- update_every,
1640
- RRDSET_TYPE_LINE
1630
+ "tcpofo",
1631
+ NULL,
1632
+ "tcp",
1633
+ NULL,
1634
+ "TCP Out-Of-Order Queue",
1635
+ "packets/s",
1636
+ 3050,
1637
+ update_every,
1638
+ RRDSET_TYPE_LINE
1639
);
1640
1641
rd_ofo_queue = rrddim_add(st, "TCPOFOQueue", "inqueue", 1, 1, RRD_ALGORITHM_INCREMENTAL);
@@ -1658,15 +1656,15 @@ int do_net_inet_tcp_stats(int update_every, usec_t dt) {
1656
1657
if (unlikely(!st)) {
1658
st = rrdset_create_localhost("ipv4",
1661
- "tcpsyncookies",
1662
- NULL,
1663
- "tcp",
1664
- NULL,
1665
- "TCP SYN Cookies",
1666
- "packets/s",
1667
- 3100,
1668
- update_every,
1669
- RRDSET_TYPE_LINE
1659
+ "tcpsyncookies",
1660
+ NULL,
1661
+ "tcp",
1662
+ NULL,
1663
+ "TCP SYN Cookies",
1664
+ "packets/s",
1665
+ 3100,
1666
+ update_every,
1667
+ RRDSET_TYPE_LINE
1668
);
1669
1670
rd_recv = rrddim_add(st, "SyncookiesRecv", "received", 1, 1, RRD_ALGORITHM_INCREMENTAL);
@@ -1691,15 +1689,15 @@ int do_net_inet_tcp_stats(int update_every, usec_t dt) {
1689
1690
if (unlikely(!st)) {
1691
st = rrdset_create_localhost("ipv4",
1694
- "ecnpkts",
1695
- NULL,
1696
- "ecn",
1697
- NULL,
1698
- "IPv4 ECN Statistics",
1699
- "packets/s",
1700
- 8700,
1701
- update_every,
1702
- RRDSET_TYPE_LINE
1692
+ "ecnpkts",
1693
+ NULL,
1694
+ "ecn",
1695
+ NULL,
1696
+ "IPv4 ECN Statistics",
1697
+ "packets/s",
1698
+ 8700,
1699
+ update_every,
1700
+ RRDSET_TYPE_LINE
1701
);
1702
1703
rrdset_flag_set(st, RRDSET_FLAG_DETAIL);
@@ -1713,7 +1711,7 @@ int do_net_inet_tcp_stats(int update_every, usec_t dt) {
1711
1712
rrddim_set_by_pointer(st, rd_ce, tcpstat.tcps_ecn_ce);
1713
rrddim_set_by_pointer(st, rd_no_ect, tcpstat.tcps_ecn_ce - (tcpstat.tcps_ecn_ect0 +
1716
- tcpstat.tcps_ecn_ect1));
1714
+ tcpstat.tcps_ecn_ect1));
1715
rrddim_set_by_pointer(st, rd_ect0, tcpstat.tcps_ecn_ect0);
1716
rrddim_set_by_pointer(st, rd_ect1, tcpstat.tcps_ecn_ect1);
1717
rrdset_done(st);
@@ -1812,11 +1810,11 @@ int do_net_inet_udp_stats(int update_every, usec_t dt) {
1810
} else
1811
rrdset_next(st);
1812
1815
- rrddim_set_by_pointer(st, rd_in_errors, udpstat.udps_hdrops + udpstat.udps_badlen);
1816
- rrddim_set_by_pointer(st, rd_no_ports, udpstat.udps_noport);
1813
+ rrddim_set_by_pointer(st, rd_in_errors, udpstat.udps_hdrops + udpstat.udps_badlen);
1814
+ rrddim_set_by_pointer(st, rd_no_ports, udpstat.udps_noport);
1815
rrddim_set_by_pointer(st, rd_recv_buf_errors, udpstat.udps_fullsock);
1818
- rrddim_set_by_pointer(st, rd_in_csum_errors, udpstat.udps_badsum + udpstat.udps_nosum);
1819
- rrddim_set_by_pointer(st, rd_ignored_multi, udpstat.udps_filtermcast);
1816
+ rrddim_set_by_pointer(st, rd_in_csum_errors, udpstat.udps_badsum + udpstat.udps_nosum);
1817
+ rrddim_set_by_pointer(st, rd_ignored_multi, udpstat.udps_filtermcast);
1818
rrdset_done(st);
1819
}
1820
}
@@ -2234,9 +2232,9 @@ int do_net_inet6_ip6_stats(int update_every, usec_t dt) {
2232
} else
2233
rrdset_next(st);
2234
2237
- rrddim_set_by_pointer(st, rd_ok, ip6stat.ip6s_fragmented);
2235
+ rrddim_set_by_pointer(st, rd_ok, ip6stat.ip6s_fragmented);
2236
rrddim_set_by_pointer(st, rd_failed, ip6stat.ip6s_cantfrag);
2239
- rrddim_set_by_pointer(st, rd_all, ip6stat.ip6s_ofragments);
2237
+ rrddim_set_by_pointer(st, rd_all, ip6stat.ip6s_ofragments);
2238
rrdset_done(st);
2239
}
2240
@@ -2682,11 +2680,11 @@ int do_net_inet6_icmp6_stats(int update_every, usec_t dt) {
2680
} else
2681
rrdset_next(st);
2682
2685
- rrddim_set_by_pointer(st, rd_in_1, icmp6stat.icp6s_inhist[1]);
2686
- rrddim_set_by_pointer(st, rd_in_128, icmp6stat.icp6s_inhist[128]);
2687
- rrddim_set_by_pointer(st, rd_in_129, icmp6stat.icp6s_inhist[129]);
2688
- rrddim_set_by_pointer(st, rd_in_136, icmp6stat.icp6s_inhist[136]);
2689
- rrddim_set_by_pointer(st, rd_out_1, icmp6stat.icp6s_outhist[1]);
2683
+ rrddim_set_by_pointer(st, rd_in_1, icmp6stat.icp6s_inhist[1]);
2684
+ rrddim_set_by_pointer(st, rd_in_128, icmp6stat.icp6s_inhist[128]);
2685
+ rrddim_set_by_pointer(st, rd_in_129, icmp6stat.icp6s_inhist[129]);
2686
+ rrddim_set_by_pointer(st, rd_in_136, icmp6stat.icp6s_inhist[136]);
2687
+ rrddim_set_by_pointer(st, rd_out_1, icmp6stat.icp6s_outhist[1]);
2688
rrddim_set_by_pointer(st, rd_out_128, icmp6stat.icp6s_outhist[128]);
2689
rrddim_set_by_pointer(st, rd_out_129, icmp6stat.icp6s_outhist[129]);
2690
rrddim_set_by_pointer(st, rd_out_133, icmp6stat.icp6s_outhist[133]);