Fix Codacy issues for FreeBSD plugin (#5334)
* Fix kstat-zfs issues * Fix devstat issue * Fix kstat-zfs issues * Fix sysctl issues * Fix sysctl issues
Vladimir Kobal committed
Feb 5, 2019 at 19:52 UTC
4c441397dd2b0114a2382c7fb9470ac49a3629c8
3 files changed
+81
-67
collectors/freebsd.plugin/freebsd_devstat.c
+1
-1
@@ -256,7 +256,7 @@ int do_kern_devstat(int update_every, usec_t dt) {
256
257
disks_found = 0;
258
259
- dstat = devstat_data + sizeof(long); // skip generation number
259
+ dstat = (struct devstat*)((char*)devstat_data + sizeof(long)); // skip generation number
260
261
for (i = 0; i < numdevs; i++) {
262
if (likely(do_system_io)) {
collectors/freebsd.plugin/freebsd_kstat_zfs.c
+50
-50
@@ -35,11 +35,11 @@ int do_kstat_zfs_misc_arcstats(int update_every, usec_t dt) {
35
int deleted[5];
36
int mutex_miss[5];
37
int evict_skip[5];
38
- int evict_not_enough[5];
39
- int evict_l2_cached[5];
40
- int evict_l2_eligible[5];
41
- int evict_l2_ineligible[5];
42
- int evict_l2_skip[5];
38
+ // int evict_not_enough[5];
39
+ // int evict_l2_cached[5];
40
+ // int evict_l2_eligible[5];
41
+ // int evict_l2_ineligible[5];
42
+ // int evict_l2_skip[5];
43
int hash_elements[5];
44
int hash_elements_max[5];
45
int hash_collisions[5];
@@ -50,60 +50,60 @@ int do_kstat_zfs_misc_arcstats(int update_every, usec_t dt) {
50
int c_min[5];
51
int c_max[5];
52
int size[5];
53
- int hdr_size[5];
54
- int data_size[5];
55
- int metadata_size[5];
56
- int other_size[5];
57
- int anon_size[5];
58
- int anon_evictable_data[5];
59
- int anon_evictable_metadata[5];
53
+ // int hdr_size[5];
54
+ // int data_size[5];
55
+ // int metadata_size[5];
56
+ // int other_size[5];
57
+ // int anon_size[5];
58
+ // int anon_evictable_data[5];
59
+ // int anon_evictable_metadata[5];
60
int mru_size[5];
61
- int mru_evictable_data[5];
62
- int mru_evictable_metadata[5];
63
- int mru_ghost_size[5];
64
- int mru_ghost_evictable_data[5];
65
- int mru_ghost_evictable_metadata[5];
61
+ // int mru_evictable_data[5];
62
+ // int mru_evictable_metadata[5];
63
+ // int mru_ghost_size[5];
64
+ // int mru_ghost_evictable_data[5];
65
+ // int mru_ghost_evictable_metadata[5];
66
int mfu_size[5];
67
- int mfu_evictable_data[5];
68
- int mfu_evictable_metadata[5];
69
- int mfu_ghost_size[5];
70
- int mfu_ghost_evictable_data[5];
71
- int mfu_ghost_evictable_metadata[5];
67
+ // int mfu_evictable_data[5];
68
+ // int mfu_evictable_metadata[5];
69
+ // int mfu_ghost_size[5];
70
+ // int mfu_ghost_evictable_data[5];
71
+ // int mfu_ghost_evictable_metadata[5];
72
int l2_hits[5];
73
int l2_misses[5];
74
- int l2_feeds[5];
75
- int l2_rw_clash[5];
74
+ // int l2_feeds[5];
75
+ // int l2_rw_clash[5];
76
int l2_read_bytes[5];
77
int l2_write_bytes[5];
78
- int l2_writes_sent[5];
79
- int l2_writes_done[5];
80
- int l2_writes_error[5];
81
- int l2_writes_lock_retry[5];
82
- int l2_evict_lock_retry[5];
83
- int l2_evict_reading[5];
84
- int l2_evict_l1cached[5];
85
- int l2_free_on_write[5];
86
- int l2_cdata_free_on_write[5];
87
- int l2_abort_lowmem[5];
88
- int l2_cksum_bad[5];
89
- int l2_io_error[5];
78
+ // int l2_writes_sent[5];
79
+ // int l2_writes_done[5];
80
+ // int l2_writes_error[5];
81
+ // int l2_writes_lock_retry[5];
82
+ // int l2_evict_lock_retry[5];
83
+ // int l2_evict_reading[5];
84
+ // int l2_evict_l1cached[5];
85
+ // int l2_free_on_write[5];
86
+ // int l2_cdata_free_on_write[5];
87
+ // int l2_abort_lowmem[5];
88
+ // int l2_cksum_bad[5];
89
+ // int l2_io_error[5];
90
int l2_size[5];
91
int l2_asize[5];
92
- int l2_hdr_size[5];
93
- int l2_compress_successes[5];
94
- int l2_compress_zeros[5];
95
- int l2_compress_failures[5];
92
+ // int l2_hdr_size[5];
93
+ // int l2_compress_successes[5];
94
+ // int l2_compress_zeros[5];
95
+ // int l2_compress_failures[5];
96
int memory_throttle_count[5];
97
- int duplicate_buffers[5];
98
- int duplicate_buffers_size[5];
99
- int duplicate_reads[5];
100
- int memory_direct_count[5];
101
- int memory_indirect_count[5];
102
- int arc_no_grow[5];
103
- int arc_tempreserve[5];
104
- int arc_loaned_bytes[5];
105
- int arc_prune[5];
106
- int arc_meta_used[5];
97
+ // int duplicate_buffers[5];
98
+ // int duplicate_buffers_size[5];
99
+ // int duplicate_reads[5];
100
+ // int memory_direct_count[5];
101
+ // int memory_indirect_count[5];
102
+ // int arc_no_grow[5];
103
+ // int arc_tempreserve[5];
104
+ // int arc_loaned_bytes[5];
105
+ // int arc_prune[5];
106
+ // int arc_meta_used[5];
107
int arc_meta_limit[5];
108
int arc_meta_max[5];
109
int arc_meta_min[5];
collectors/freebsd.plugin/freebsd_sysctl.c
+30
-16
@@ -580,7 +580,6 @@ int do_hw_intcnt(int update_every, usec_t dt) {
580
(void)dt;
581
static int mib_hw_intrcnt[2] = {0, 0};
582
size_t intrcnt_size = 0;
583
- unsigned long i;
583
584
if (unlikely(GETSYSCTL_SIZE("hw.intrcnt", mib_hw_intrcnt, intrcnt_size))) {
585
error("DISABLED: system.intr chart");
@@ -591,7 +590,7 @@ int do_hw_intcnt(int update_every, usec_t dt) {
590
unsigned long nintr = 0;
591
static unsigned long old_nintr = 0;
592
static unsigned long *intrcnt = NULL;
594
- unsigned long long totalintr = 0;
593
+ unsigned long i;
594
595
nintr = intrcnt_size / sizeof(u_long);
596
if (unlikely(nintr != old_nintr))
@@ -602,6 +601,8 @@ int do_hw_intcnt(int update_every, usec_t dt) {
601
error("DISABLED: hw.intrcnt module");
602
return 1;
603
} else {
604
+ unsigned long long totalintr = 0;
605
+
606
for (i = 0; i < nintr; i++)
607
totalintr += intrcnt[i];
608
@@ -653,7 +654,6 @@ int do_hw_intcnt(int update_every, usec_t dt) {
654
// --------------------------------------------------------------------
655
656
static RRDSET *st_interrupts = NULL;
656
- void *p;
657
658
if (unlikely(!st_interrupts))
659
st_interrupts = rrdset_create_localhost(
@@ -674,6 +674,8 @@ int do_hw_intcnt(int update_every, usec_t dt) {
674
rrdset_next(st_interrupts);
675
676
for (i = 0; i < nintr; i++) {
677
+ void *p;
678
+
679
p = intrnames + i * (MAXCOMLEN + 1);
680
if (unlikely((intrcnt[i] != 0) && (*(char *) p != 0))) {
681
RRDDIM *rd_interrupts = rrddim_find(st_interrupts, p);
@@ -965,11 +967,14 @@ int do_vm_swap_info(int update_every, usec_t dt) {
967
int do_system_ram(int update_every, usec_t dt) {
968
(void)dt;
969
static int mib_active_count[4] = {0, 0, 0, 0}, mib_inactive_count[4] = {0, 0, 0, 0}, mib_wire_count[4] = {0, 0, 0, 0},
968
- mib_cache_count[4] = {0, 0, 0, 0}, mib_laundry_count[4] = {0, 0, 0, 0}, mib_vfs_bufspace[2] = {0, 0},
969
- mib_free_count[4] = {0, 0, 0, 0};
970
+ mib_cache_count[4] = {0, 0, 0, 0}, mib_vfs_bufspace[2] = {0, 0}, mib_free_count[4] = {0, 0, 0, 0};
971
vmmeter_t vmmeter_data;
972
int vfs_bufspace_count;
973
974
+#if defined(NETDATA_COLLECT_LAUNDRY)
975
+ static int mib_laundry_count[4] = {0, 0, 0, 0};
976
+#endif
977
+
978
if (unlikely(GETSYSCTL_SIMPLE("vm.stats.vm.v_active_count", mib_active_count, vmmeter_data.v_active_count) ||
979
GETSYSCTL_SIMPLE("vm.stats.vm.v_inactive_count", mib_inactive_count, vmmeter_data.v_inactive_count) ||
980
GETSYSCTL_SIMPLE("vm.stats.vm.v_wire_count", mib_wire_count, vmmeter_data.v_wire_count) ||
@@ -990,7 +995,11 @@ int do_system_ram(int update_every, usec_t dt) {
995
996
static RRDSET *st = NULL;
997
static RRDDIM *rd_free = NULL, *rd_active = NULL, *rd_inactive = NULL, *rd_wired = NULL,
993
- *rd_cache = NULL, *rd_laundry = NULL, *rd_buffers = NULL;
998
+ *rd_cache = NULL, *rd_buffers = NULL;
999
+
1000
+#if defined(NETDATA_COLLECT_LAUNDRY)
1001
+ static RRDDIM *rd_laundry = NULL;
1002
+#endif
1003
1004
if (unlikely(!st)) {
1005
st = rrdset_create_localhost(
@@ -1155,7 +1164,7 @@ int do_vm_stats_sys_v_pgfaults(int update_every, usec_t dt) {
1164
1165
int do_kern_ipc_sem(int update_every, usec_t dt) {
1166
(void)dt;
1158
- static int mib_semmni[3] = {0, 0, 0}, mib_sema[3] = {0, 0, 0};
1167
+ static int mib_semmni[3] = {0, 0, 0};
1168
struct ipc_sem {
1169
int semmni;
1170
collected_number sets;
@@ -1170,6 +1179,7 @@ int do_kern_ipc_sem(int update_every, usec_t dt) {
1179
} else {
1180
static struct semid_kernel *ipc_sem_data = NULL;
1181
static int old_semmni = 0;
1182
+ static int mib_sema[3] = {0, 0, 0};
1183
1184
if (unlikely(ipc_sem.semmni != old_semmni)) {
1185
ipc_sem_data = reallocz(ipc_sem_data, sizeof(struct semid_kernel) * ipc_sem.semmni);
@@ -1253,7 +1263,7 @@ int do_kern_ipc_sem(int update_every, usec_t dt) {
1263
1264
int do_kern_ipc_shm(int update_every, usec_t dt) {
1265
(void)dt;
1256
- static int mib_shmmni[3] = {0, 0, 0}, mib_shmsegs[3] = {0, 0, 0};
1266
+ static int mib_shmmni[3] = {0, 0, 0};
1267
struct ipc_shm {
1268
u_long shmmni;
1269
collected_number segs;
@@ -1268,6 +1278,7 @@ int do_kern_ipc_shm(int update_every, usec_t dt) {
1278
} else {
1279
static struct shmid_kernel *ipc_shm_data = NULL;
1280
static u_long old_shmmni = 0;
1281
+ static int mib_shmsegs[3] = {0, 0, 0};
1282
1283
if (unlikely(ipc_shm.shmmni != old_shmmni)) {
1284
ipc_shm_data = reallocz(ipc_shm_data, sizeof(struct shmid_kernel) * ipc_shm.shmmni);
@@ -1352,7 +1363,7 @@ int do_kern_ipc_shm(int update_every, usec_t dt) {
1363
1364
int do_kern_ipc_msq(int update_every, usec_t dt) {
1365
(void)dt;
1355
- static int mib_msgmni[3] = {0, 0, 0}, mib_msqids[3] = {0, 0, 0};
1366
+ static int mib_msgmni[3] = {0, 0, 0};
1367
struct ipc_msq {
1368
int msgmni;
1369
collected_number queues;
@@ -1370,6 +1381,7 @@ int do_kern_ipc_msq(int update_every, usec_t dt) {
1381
} else {
1382
static struct msqid_kernel *ipc_msq_data = NULL;
1383
static int old_msgmni = 0;
1384
+ static int mib_msqids[3] = {0, 0, 0};
1385
1386
if (unlikely(ipc_msq.msgmni != old_msgmni)) {
1387
ipc_msq_data = reallocz(ipc_msq_data, sizeof(struct msqid_kernel) * ipc_msq.msgmni);
@@ -1531,12 +1543,6 @@ int do_net_isr(int update_every, usec_t dt) {
1543
do_netisr_per_core = config_get_boolean("plugin:freebsd:net.isr", "netisr per core", 1);
1544
}
1545
1534
- static int mib_workstream[3] = {0, 0, 0}, mib_work[3] = {0, 0, 0};
1535
- int common_error = 0;
1536
- size_t netisr_workstream_size = 0, netisr_work_size = 0;
1537
- unsigned long num_netisr_workstreams = 0, num_netisr_works = 0;
1538
- static struct sysctl_netisr_workstream *netisr_workstream = NULL;
1539
- static struct sysctl_netisr_work *netisr_work = NULL;
1546
static struct netisr_stats {
1547
collected_number dispatched;
1548
collected_number hybrid_dispatched;
@@ -1545,6 +1551,13 @@ int do_net_isr(int update_every, usec_t dt) {
1551
} *netisr_stats = NULL;
1552
1553
if (likely(do_netisr || do_netisr_per_core)) {
1554
+ static int mib_workstream[3] = {0, 0, 0}, mib_work[3] = {0, 0, 0};
1555
+ size_t netisr_workstream_size = 0, netisr_work_size = 0;
1556
+ static struct sysctl_netisr_workstream *netisr_workstream = NULL;
1557
+ static struct sysctl_netisr_work *netisr_work = NULL;
1558
+ unsigned long num_netisr_workstreams = 0, num_netisr_works = 0;
1559
+ int common_error = 0;
1560
+
1561
if (unlikely(GETSYSCTL_SIZE("net.isr.workstream", mib_workstream, netisr_workstream_size))) {
1562
common_error = 1;
1563
} else if (unlikely(GETSYSCTL_SIZE("net.isr.work", mib_work, netisr_work_size))) {
@@ -2243,7 +2256,6 @@ int do_net_inet_icmp_stats(int update_every, usec_t dt) {
2256
if (likely(do_icmp_packets || do_icmp_errors || do_icmpmsg)) {
2257
static int mib[4] = {0, 0, 0, 0};
2258
struct icmpstat icmpstat;
2246
- int i;
2259
struct icmp_total {
2260
u_long msgs_in;
2261
u_long msgs_out;
@@ -2259,6 +2271,8 @@ int do_net_inet_icmp_stats(int update_every, usec_t dt) {
2271
error("DISABLED: net.inet.icmp.stats module");
2272
return 1;
2273
} else {
2274
+ int i;
2275
+
2276
for (i = 0; i <= ICMP_MAXTYPE; i++) {
2277
icmp_total.msgs_in += icmpstat.icps_inhist[i];
2278
icmp_total.msgs_out += icmpstat.icps_outhist[i];