c88af57ad · cryptotaxi247/netdata-1

@@ -122,6 +122,7 @@ int do_vm_loadavg(int update_every, usec_t dt){

122 // vm.vmtotal

123

124 int do_vm_vmtotal(int update_every, usec_t dt) {

125 + (void)dt;

126 static int do_all_processes = -1, do_processes = -1, do_committed = -1;

127

128 if (unlikely(do_all_processes == -1)) {

@@ -240,6 +241,8 @@ int do_vm_vmtotal(int update_every, usec_t dt) {

241 // kern.cp_time

242

243 int do_kern_cp_time(int update_every, usec_t dt) {

244 + (void)dt;

245 +

246 if (unlikely(CPUSTATES != 5)) {

247 error("FREEBSD: There are %d CPU states (5 was expected)", CPUSTATES);

248 error("DISABLED: system.cpu chart");

@@ -297,6 +300,8 @@ int do_kern_cp_time(int update_every, usec_t dt) {

300 // kern.cp_times

301

302 int do_kern_cp_times(int update_every, usec_t dt) {

303 + (void)dt;

304 +

305 if (unlikely(CPUSTATES != 5)) {

306 error("FREEBSD: There are %d CPU states (5 was expected)", CPUSTATES);

307 error("DISABLED: cpu.cpuXX charts");

@@ -379,9 +384,10 @@ int do_kern_cp_times(int update_every, usec_t dt) {

384 // hw.intrcnt

385

386 int do_hw_intcnt(int update_every, usec_t dt) {

387 + (void)dt;

388 static int mib_hw_intrcnt[2] = {0, 0};

389 size_t intrcnt_size = sizeof(mib_hw_intrcnt);

384 - int i;

390 + unsigned long i;

391

392 if (unlikely(GETSYSCTL_SIZE("hw.intrcnt", mib_hw_intrcnt, intrcnt_size))) {

393 error("DISABLED: system.intr chart");

@@ -487,6 +493,7 @@ int do_hw_intcnt(int update_every, usec_t dt) {

493 // vm.stats.sys.v_intr

494

495 int do_vm_stats_sys_v_intr(int update_every, usec_t dt) {

496 + (void)dt;

497 static int mib[4] = {0, 0, 0, 0};

498 u_int int_number;

499

@@ -529,6 +536,7 @@ int do_vm_stats_sys_v_intr(int update_every, usec_t dt) {

536 // vm.stats.sys.v_soft

537

538 int do_vm_stats_sys_v_soft(int update_every, usec_t dt) {

539 + (void)dt;

540 static int mib[4] = {0, 0, 0, 0};

541 u_int soft_intr_number;

542

@@ -571,6 +579,7 @@ int do_vm_stats_sys_v_soft(int update_every, usec_t dt) {

579 // vm.stats.sys.v_swtch

580

581 int do_vm_stats_sys_v_swtch(int update_every, usec_t dt) {

582 + (void)dt;

583 static int mib[4] = {0, 0, 0, 0};

584 u_int ctxt_number;

585

@@ -613,6 +622,7 @@ int do_vm_stats_sys_v_swtch(int update_every, usec_t dt) {

622 // vm.stats.vm.v_forks

623

624 int do_vm_stats_sys_v_forks(int update_every, usec_t dt) {

625 + (void)dt;

626 static int mib[4] = {0, 0, 0, 0};

627 u_int forks_number;

628

@@ -657,6 +667,7 @@ int do_vm_stats_sys_v_forks(int update_every, usec_t dt) {

667 // vm.swap_info

668

669 int do_vm_swap_info(int update_every, usec_t dt) {

670 + (void)dt;

671 static int mib[3] = {0, 0, 0};

672

673 if (unlikely(getsysctl_mib("vm.swap_info", mib, 2))) {

@@ -732,6 +743,7 @@ int do_vm_swap_info(int update_every, usec_t dt) {

743 // system.ram

744

745 int do_system_ram(int update_every, usec_t dt) {

746 + (void)dt;

747 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},

748 mib_cache_count[4] = {0, 0, 0, 0}, mib_vfs_bufspace[2] = {0, 0}, mib_free_count[4] = {0, 0, 0, 0};

749 struct vmmeter vmmeter_data;

@@ -799,6 +811,7 @@ int do_system_ram(int update_every, usec_t dt) {

811 // vm.stats.vm.v_swappgs

812

813 int do_vm_stats_sys_v_swappgs(int update_every, usec_t dt) {

814 + (void)dt;

815 static int mib_swappgsin[4] = {0, 0, 0, 0}, mib_swappgsout[4] = {0, 0, 0, 0};

816 struct vmmeter vmmeter_data;

817

@@ -844,6 +857,7 @@ int do_vm_stats_sys_v_swappgs(int update_every, usec_t dt) {

857 // vm.stats.vm.v_pgfaults

858

859 int do_vm_stats_sys_v_pgfaults(int update_every, usec_t dt) {

860 + (void)dt;

861 static int mib_vm_faults[4] = {0, 0, 0, 0}, mib_io_faults[4] = {0, 0, 0, 0}, mib_cow_faults[4] = {0, 0, 0, 0},

862 mib_cow_optim[4] = {0, 0, 0, 0}, mib_intrans[4] = {0, 0, 0, 0};

863 struct vmmeter vmmeter_data;

@@ -902,6 +916,7 @@ int do_vm_stats_sys_v_pgfaults(int update_every, usec_t dt) {

916 // kern.ipc.sem

917

918 int do_kern_ipc_sem(int update_every, usec_t dt) {

919 + (void)dt;

920 static int mib_semmni[3] = {0, 0, 0}, mib_sema[3] = {0, 0, 0};

921 struct ipc_sem {

922 int semmni;

@@ -947,7 +962,7 @@ int do_kern_ipc_sem(int update_every, usec_t dt) {

962 "IPC Semaphores",

963 "semaphores",

964 1000,

950 - localhost->rrd_update_every,

965 + update_every,

966 RRDSET_TYPE_AREA

967 );

968

@@ -969,7 +984,7 @@ int do_kern_ipc_sem(int update_every, usec_t dt) {

984 "IPC Semaphore Arrays",

985 "arrays",

986 1000,

972 - localhost->rrd_update_every,

987 + update_every,

988 RRDSET_TYPE_AREA

989 );

990

@@ -989,6 +1004,7 @@ int do_kern_ipc_sem(int update_every, usec_t dt) {

1004 // kern.ipc.shm

1005

1006 int do_kern_ipc_shm(int update_every, usec_t dt) {

1007 + (void)dt;

1008 static int mib_shmmni[3] = {0, 0, 0}, mib_shmsegs[3] = {0, 0, 0};

1009 struct ipc_shm {

1010 u_long shmmni;

@@ -1012,7 +1028,7 @@ int do_kern_ipc_shm(int update_every, usec_t dt) {

1028 error("DISABLED: kern.ipc.shmmodule");

1029 return 1;

1030 } else {

1015 - int i;

1031 + unsigned long i;

1032

1033 for (i = 0; i < ipc_shm.shmmni; i++) {

1034 if (unlikely(ipc_shm_data[i].u.shm_perm.mode & 0x0800)) {

@@ -1035,7 +1051,7 @@ int do_kern_ipc_shm(int update_every, usec_t dt) {

1051 "IPC Shared Memory Segments",

1052 "segments",

1053 1000,

1038 - localhost->rrd_update_every,

1054 + update_every,

1055 RRDSET_TYPE_AREA

1056 );

1057

@@ -1057,7 +1073,7 @@ int do_kern_ipc_shm(int update_every, usec_t dt) {

1073 "IPC Shared Memory Segments Size",

1074 "kilobytes",

1075 1000,

1060 - localhost->rrd_update_every,

1076 + update_every,

1077 RRDSET_TYPE_AREA

1078 );

1079

@@ -1077,6 +1093,7 @@ int do_kern_ipc_shm(int update_every, usec_t dt) {

1093 // kern.ipc.msq

1094

1095 int do_kern_ipc_msq(int update_every, usec_t dt) {

1096 + (void)dt;

1097 static int mib_msgmni[3] = {0, 0, 0}, mib_msqids[3] = {0, 0, 0};

1098 struct ipc_msq {

1099 int msgmni;

@@ -1129,7 +1146,7 @@ int do_kern_ipc_msq(int update_every, usec_t dt) {

1146 "Number of IPC Message Queues",

1147 "queues",

1148 990,

1132 - localhost->rrd_update_every,

1149 + update_every,

1150 RRDSET_TYPE_AREA

1151 );

1152

@@ -1151,7 +1168,7 @@ int do_kern_ipc_msq(int update_every, usec_t dt) {

1168 "Number of Messages in IPC Message Queues",

1169 "messages",

1170 1000,

1154 - localhost->rrd_update_every,

1171 + update_every,

1172 RRDSET_TYPE_AREA

1173 );

1174

@@ -1173,7 +1190,7 @@ int do_kern_ipc_msq(int update_every, usec_t dt) {

1190 "Size of IPC Message Queues",

1191 "bytes",

1192 1100,

1176 - localhost->rrd_update_every,

1193 + update_every,

1194 RRDSET_TYPE_LINE

1195 );

1196

@@ -1195,6 +1212,7 @@ int do_kern_ipc_msq(int update_every, usec_t dt) {

1212 // uptime

1213

1214 int do_uptime(int update_every, usec_t dt) {

1215 + (void)dt;

1216 struct timespec up_time;

1217

1218 clock_gettime(CLOCK_UPTIME, &up_time);

@@ -1231,6 +1249,7 @@ int do_uptime(int update_every, usec_t dt) {

1249 // net.isr

1250

1251 int do_net_isr(int update_every, usec_t dt) {

1252 + (void)dt;

1253 static int do_netisr = -1, do_netisr_per_core = -1;

1254

1255 if (unlikely(do_netisr == -1)) {

@@ -1240,7 +1259,6 @@ int do_net_isr(int update_every, usec_t dt) {

1259

1260 static int mib_workstream[3] = {0, 0, 0}, mib_work[3] = {0, 0, 0};

1261 int common_error = 0;

1243 - int i, n;

1262 size_t netisr_workstream_size = sizeof(mib_workstream), netisr_work_size = sizeof(mib_work);

1263 unsigned long num_netisr_workstreams = 0, num_netisr_works = 0;

1264 static struct sysctl_netisr_workstream *netisr_workstream = NULL;

@@ -1281,6 +1299,9 @@ int do_net_isr(int update_every, usec_t dt) {

1299 error("DISABLED: net.isr module");

1300 return 1;

1301 } else {

1302 + unsigned long i, n;

1303 + int j;

1304 +

1305 netisr_stats = reallocz(netisr_stats, (number_of_cpus + 1) * sizeof(struct netisr_stats));

1306 memset(netisr_stats, 0, (number_of_cpus + 1) * sizeof(struct netisr_stats));

1307 for (i = 0; i < num_netisr_workstreams; i++) {

@@ -1293,11 +1314,11 @@ int do_net_isr(int update_every, usec_t dt) {

1314 }

1315 }

1316 }

1296 - for (i = 0; i < number_of_cpus; i++) {

1297 - netisr_stats[number_of_cpus].dispatched += netisr_stats[i].dispatched;

1298 - netisr_stats[number_of_cpus].hybrid_dispatched += netisr_stats[i].hybrid_dispatched;

1299 - netisr_stats[number_of_cpus].qdrops += netisr_stats[i].qdrops;

1300 - netisr_stats[number_of_cpus].queued += netisr_stats[i].queued;

1317 + for (j = 0; j < number_of_cpus; j++) {

1318 + netisr_stats[number_of_cpus].dispatched += netisr_stats[j].dispatched;

1319 + netisr_stats[number_of_cpus].hybrid_dispatched += netisr_stats[j].hybrid_dispatched;

1320 + netisr_stats[number_of_cpus].qdrops += netisr_stats[j].qdrops;

1321 + netisr_stats[number_of_cpus].queued += netisr_stats[j].queued;

1322 }

1323 }

1324 } else {

@@ -1350,6 +1371,7 @@ int do_net_isr(int update_every, usec_t dt) {

1371 RRDDIM *rd_queued;

1372 } *all_softnet_charts = NULL;

1373 static int old_number_of_cpus = 0;

1374 + int i;

1375

1376 if(unlikely(number_of_cpus > old_number_of_cpus)) {

1377 all_softnet_charts = reallocz(all_softnet_charts, sizeof(struct softnet_chart) * number_of_cpus);

@@ -1403,6 +1425,7 @@ int do_net_isr(int update_every, usec_t dt) {

1425 // net.inet.tcp.states

1426

1427 int do_net_inet_tcp_states(int update_every, usec_t dt) {

1428 + (void)dt;

1429 static int mib[4] = {0, 0, 0, 0};

1430 uint64_t tcps_states[TCP_NSTATES];

1431

@@ -1446,6 +1469,7 @@ int do_net_inet_tcp_states(int update_every, usec_t dt) {

1469 // net.inet.tcp.stats

1470

1471 int do_net_inet_tcp_stats(int update_every, usec_t dt) {

1472 + (void)dt;

1473 static int do_tcp_packets = -1, do_tcp_errors = -1, do_tcp_handshake = -1, do_tcpext_connaborts = -1, do_tcpext_ofo = -1, do_tcpext_syncookies = -1, do_ecn = -1;

1474

1475 if (unlikely(do_tcp_packets == -1)) {

@@ -1740,6 +1764,7 @@ int do_net_inet_tcp_stats(int update_every, usec_t dt) {

1764 // net.inet.udp.stats

1765

1766 int do_net_inet_udp_stats(int update_every, usec_t dt) {

1767 + (void)dt;

1768 static int do_udp_packets = -1, do_udp_errors = -1;

1769

1770 if (unlikely(do_udp_packets == -1)) {

@@ -1840,6 +1865,7 @@ int do_net_inet_udp_stats(int update_every, usec_t dt) {

1865 // net.inet.icmp.stats

1866

1867 int do_net_inet_icmp_stats(int update_every, usec_t dt) {

1868 + (void)dt;

1869 static int do_icmp_packets = -1, do_icmp_errors = -1, do_icmpmsg = -1;

1870

1871 if (unlikely(do_icmp_packets == -1)) {

@@ -1965,6 +1991,7 @@ int do_net_inet_icmp_stats(int update_every, usec_t dt) {

1991 // net.inet.ip.stats

1992

1993 int do_net_inet_ip_stats(int update_every, usec_t dt) {

1994 + (void)dt;

1995 static int do_ip_packets = -1, do_ip_fragsout = -1, do_ip_fragsin = -1, do_ip_errors = -1;

1996

1997 if (unlikely(do_ip_packets == -1)) {

@@ -2147,6 +2174,7 @@ int do_net_inet_ip_stats(int update_every, usec_t dt) {

2174 // net.inet6.ip6.stats

2175

2176 int do_net_inet6_ip6_stats(int update_every, usec_t dt) {

2177 + (void)dt;

2178 static int do_ip6_packets = -1, do_ip6_fragsout = -1, do_ip6_fragsin = -1, do_ip6_errors = -1;

2179

2180 if (unlikely(do_ip6_packets == -1)) {

@@ -2357,6 +2385,7 @@ int do_net_inet6_ip6_stats(int update_every, usec_t dt) {

2385 // net.inet6.icmp6.stats

2386

2387 int do_net_inet6_icmp6_stats(int update_every, usec_t dt) {

2388 + (void)dt;

2389 static int do_icmp6 = -1, do_icmp6_redir = -1, do_icmp6_errors = -1, do_icmp6_echos = -1, do_icmp6_router = -1,

2390 do_icmp6_neighbor = -1, do_icmp6_types = -1;

2391

@@ -2725,6 +2754,7 @@ int do_net_inet6_icmp6_stats(int update_every, usec_t dt) {

2754 // getmntinfo

2755

2756 int do_getmntinfo(int update_every, usec_t dt) {

2757 + (void)dt;

2758

2759 #define DELAULT_EXLUDED_PATHS "/proc/*"

2760 // taken from gnulib/mountlist.c and shortened to FreeBSD related fstypes

@@ -2930,6 +2960,7 @@ int do_getmntinfo(int update_every, usec_t dt) {

2960 // getifaddrs

2961

2962 int do_getifaddrs(int update_every, usec_t dt) {

2963 + (void)dt;

2964

2965 #define DELAULT_EXLUDED_INTERFACES "lo*"

2966 #define CONFIG_SECTION_GETIFADDRS "plugin:freebsd:getifaddrs"

@@ -3536,19 +3567,6 @@ int do_kern_devstat(int update_every, usec_t dt) {

3567 .do_avagsz = iter_avagsz,

3568 .do_svctm = iter_svctm,

3569

3539 - // initialise data for differential charts

3540 -

3541 - .prev_dstat.bytes_read = dstat[i].bytes[DEVSTAT_READ],

3542 - .prev_dstat.bytes_write = dstat[i].bytes[DEVSTAT_WRITE],

3543 - .prev_dstat.operations_read = dstat[i].operations[DEVSTAT_READ],

3544 - .prev_dstat.operations_write = dstat[i].operations[DEVSTAT_WRITE],

3545 - .prev_dstat.duration_read_ms = dstat[i].duration[DEVSTAT_READ].sec * 1000

3546 - + dstat[i].duration[DEVSTAT_READ].frac * BINTIME_SCALE,

3547 - .prev_dstat.duration_write_ms = dstat[i].duration[DEVSTAT_WRITE].sec * 1000

3548 - + dstat[i].duration[DEVSTAT_READ].frac * BINTIME_SCALE,

3549 - .prev_dstat.busy_time_ms = dstat[i].busy_time.sec * 1000

3550 - + dstat[i].busy_time.frac * BINTIME_SCALE,

3551 -

3570 .st_io = NULL,

3571 .rd_io_in = NULL,

3572 .rd_io_out = NULL,

@@ -3579,6 +3597,19 @@ int do_kern_devstat(int update_every, usec_t dt) {

3597 .rd_svctm = NULL,

3598 };

3599

3600 + // initialise data for differential charts

3601 +

3602 + dmp.prev_dstat.bytes_read = dstat[i].bytes[DEVSTAT_READ];

3603 + dmp.prev_dstat.bytes_write = dstat[i].bytes[DEVSTAT_WRITE];

3604 + dmp.prev_dstat.operations_read = dstat[i].operations[DEVSTAT_READ];

3605 + dmp.prev_dstat.operations_write = dstat[i].operations[DEVSTAT_WRITE];

3606 + dmp.prev_dstat.duration_read_ms = dstat[i].duration[DEVSTAT_READ].sec * 1000

3607 + + dstat[i].duration[DEVSTAT_READ].frac * BINTIME_SCALE;

3608 + dmp.prev_dstat.duration_write_ms = dstat[i].duration[DEVSTAT_WRITE].sec * 1000

3609 + + dstat[i].duration[DEVSTAT_READ].frac * BINTIME_SCALE;

3610 + dmp.prev_dstat.busy_time_ms = dstat[i].busy_time.sec * 1000

3611 + + dstat[i].busy_time.frac * BINTIME_SCALE;

3612 +

3613 dm = dictionary_set(disks, disk, &dmp, sizeof(struct disks_metadata));

3614 }

3615

Fix compiler warnings for FreeBSD plugin