X-Git-Url: https://arthur.barton.de/gitweb/?a=blobdiff_plain;f=src%2Ffreebsd_sysctl.c;h=ab2eaee7aa04dd5957348c635e268ac4a0075c6a;hb=9dccc16d3763392f0b13349de18c3a838a667653;hp=37fc8e5242b69ee2f1ad2c607d313e7cd1983cd2;hpb=1952db7266cda5c0e857a98ace40ea65e70eb204;p=netdata.git diff --git a/src/freebsd_sysctl.c b/src/freebsd_sysctl.c index 37fc8e52..ab2eaee7 100644 --- a/src/freebsd_sysctl.c +++ b/src/freebsd_sysctl.c @@ -122,6 +122,7 @@ int do_vm_loadavg(int update_every, usec_t dt){ // vm.vmtotal int do_vm_vmtotal(int update_every, usec_t dt) { + (void)dt; static int do_all_processes = -1, do_processes = -1, do_committed = -1; if (unlikely(do_all_processes == -1)) { @@ -240,6 +241,8 @@ int do_vm_vmtotal(int update_every, usec_t dt) { // kern.cp_time int do_kern_cp_time(int update_every, usec_t dt) { + (void)dt; + if (unlikely(CPUSTATES != 5)) { error("FREEBSD: There are %d CPU states (5 was expected)", CPUSTATES); error("DISABLED: system.cpu chart"); @@ -297,6 +300,8 @@ int do_kern_cp_time(int update_every, usec_t dt) { // kern.cp_times int do_kern_cp_times(int update_every, usec_t dt) { + (void)dt; + if (unlikely(CPUSTATES != 5)) { error("FREEBSD: There are %d CPU states (5 was expected)", CPUSTATES); error("DISABLED: cpu.cpuXX charts"); @@ -306,8 +311,10 @@ int do_kern_cp_times(int update_every, usec_t dt) { static int mib[2] = {0, 0}; long cp_time[CPUSTATES]; static long *pcpu_cp_time = NULL; + static int old_number_of_cpus = 0; - pcpu_cp_time = reallocz(pcpu_cp_time, sizeof(cp_time) * number_of_cpus); + if(unlikely(number_of_cpus != old_number_of_cpus)) + pcpu_cp_time = reallocz(pcpu_cp_time, sizeof(cp_time) * number_of_cpus); if (unlikely(GETSYSCTL_WSIZE("kern.cp_times", mib, pcpu_cp_time, sizeof(cp_time) * number_of_cpus))) { error("DISABLED: cpu.cpuXX charts"); error("DISABLED: kern.cp_times module"); @@ -326,12 +333,10 @@ int do_kern_cp_times(int update_every, usec_t dt) { RRDDIM *rd_interrupt; RRDDIM *rd_idle; } *all_cpu_charts = NULL; - static int old_number_of_cpus = 0; if(unlikely(number_of_cpus > old_number_of_cpus)) { all_cpu_charts = reallocz(all_cpu_charts, sizeof(struct cpu_chart) * number_of_cpus); memset(&all_cpu_charts[old_number_of_cpus], 0, sizeof(struct cpu_chart) * (number_of_cpus - old_number_of_cpus)); - old_number_of_cpus = number_of_cpus; } for (i = 0; i < number_of_cpus; i++) { @@ -370,6 +375,8 @@ int do_kern_cp_times(int update_every, usec_t dt) { rrdset_done(all_cpu_charts[i].st); } } + + old_number_of_cpus = number_of_cpus; } return 0; @@ -379,9 +386,10 @@ int do_kern_cp_times(int update_every, usec_t dt) { // hw.intrcnt int do_hw_intcnt(int update_every, usec_t dt) { + (void)dt; static int mib_hw_intrcnt[2] = {0, 0}; - size_t intrcnt_size; - int i; + size_t intrcnt_size = sizeof(mib_hw_intrcnt); + unsigned long i; if (unlikely(GETSYSCTL_SIZE("hw.intrcnt", mib_hw_intrcnt, intrcnt_size))) { error("DISABLED: system.intr chart"); @@ -390,11 +398,13 @@ int do_hw_intcnt(int update_every, usec_t dt) { return 1; } else { unsigned long nintr = 0; + static unsigned long old_nintr = 0; static unsigned long *intrcnt = NULL; unsigned long long totalintr = 0; nintr = intrcnt_size / sizeof(u_long); - intrcnt = reallocz(intrcnt, nintr * sizeof(u_long)); + if (unlikely(nintr != old_nintr)) + intrcnt = reallocz(intrcnt, nintr * sizeof(u_long)); if (unlikely(GETSYSCTL_WSIZE("hw.intrcnt", mib_hw_intrcnt, intrcnt, nintr * sizeof(u_long)))) { error("DISABLED: system.intr chart"); error("DISABLED: system.interrupts chart"); @@ -437,7 +447,8 @@ int do_hw_intcnt(int update_every, usec_t dt) { static char *intrnames = NULL; size = nintr * (MAXCOMLEN + 1); - intrnames = reallocz(intrnames, size); + if (unlikely(nintr != old_nintr)) + intrnames = reallocz(intrnames, size); if (unlikely(GETSYSCTL_WSIZE("hw.intrnames", mib_hw_intrnames, intrnames, size))) { error("DISABLED: system.intr chart"); error("DISABLED: system.interrupts chart"); @@ -478,6 +489,8 @@ int do_hw_intcnt(int update_every, usec_t dt) { rrdset_done(st_interrupts); } } + + old_nintr = nintr; } return 0; @@ -487,6 +500,7 @@ int do_hw_intcnt(int update_every, usec_t dt) { // vm.stats.sys.v_intr int do_vm_stats_sys_v_intr(int update_every, usec_t dt) { + (void)dt; static int mib[4] = {0, 0, 0, 0}; u_int int_number; @@ -529,6 +543,7 @@ int do_vm_stats_sys_v_intr(int update_every, usec_t dt) { // vm.stats.sys.v_soft int do_vm_stats_sys_v_soft(int update_every, usec_t dt) { + (void)dt; static int mib[4] = {0, 0, 0, 0}; u_int soft_intr_number; @@ -571,6 +586,7 @@ int do_vm_stats_sys_v_soft(int update_every, usec_t dt) { // vm.stats.sys.v_swtch int do_vm_stats_sys_v_swtch(int update_every, usec_t dt) { + (void)dt; static int mib[4] = {0, 0, 0, 0}; u_int ctxt_number; @@ -613,6 +629,7 @@ int do_vm_stats_sys_v_swtch(int update_every, usec_t dt) { // vm.stats.vm.v_forks int do_vm_stats_sys_v_forks(int update_every, usec_t dt) { + (void)dt; static int mib[4] = {0, 0, 0, 0}; u_int forks_number; @@ -657,6 +674,7 @@ int do_vm_stats_sys_v_forks(int update_every, usec_t dt) { // vm.swap_info int do_vm_swap_info(int update_every, usec_t dt) { + (void)dt; static int mib[3] = {0, 0, 0}; if (unlikely(getsysctl_mib("vm.swap_info", mib, 2))) { @@ -732,6 +750,7 @@ int do_vm_swap_info(int update_every, usec_t dt) { // system.ram int do_system_ram(int update_every, usec_t dt) { + (void)dt; 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}, mib_cache_count[4] = {0, 0, 0, 0}, mib_vfs_bufspace[2] = {0, 0}, mib_free_count[4] = {0, 0, 0, 0}; struct vmmeter vmmeter_data; @@ -799,6 +818,7 @@ int do_system_ram(int update_every, usec_t dt) { // vm.stats.vm.v_swappgs int do_vm_stats_sys_v_swappgs(int update_every, usec_t dt) { + (void)dt; static int mib_swappgsin[4] = {0, 0, 0, 0}, mib_swappgsout[4] = {0, 0, 0, 0}; struct vmmeter vmmeter_data; @@ -844,6 +864,7 @@ int do_vm_stats_sys_v_swappgs(int update_every, usec_t dt) { // vm.stats.vm.v_pgfaults int do_vm_stats_sys_v_pgfaults(int update_every, usec_t dt) { + (void)dt; 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}, mib_cow_optim[4] = {0, 0, 0, 0}, mib_intrans[4] = {0, 0, 0, 0}; struct vmmeter vmmeter_data; @@ -902,6 +923,7 @@ int do_vm_stats_sys_v_pgfaults(int update_every, usec_t dt) { // kern.ipc.sem int do_kern_ipc_sem(int update_every, usec_t dt) { + (void)dt; static int mib_semmni[3] = {0, 0, 0}, mib_sema[3] = {0, 0, 0}; struct ipc_sem { int semmni; @@ -916,8 +938,12 @@ int do_kern_ipc_sem(int update_every, usec_t dt) { return 1; } else { static struct semid_kernel *ipc_sem_data = NULL; + static int old_semmni = 0; - ipc_sem_data = reallocz(ipc_sem_data, sizeof(struct semid_kernel) * ipc_sem.semmni); + if (unlikely(ipc_sem.semmni != old_semmni)) { + ipc_sem_data = reallocz(ipc_sem_data, sizeof(struct semid_kernel) * ipc_sem.semmni); + old_semmni = ipc_sem.semmni; + } if (unlikely(GETSYSCTL_WSIZE("kern.ipc.sema", mib_sema, ipc_sem_data, sizeof(struct semid_kernel) * ipc_sem.semmni))) { error("DISABLED: system.ipc_semaphores chart"); error("DISABLED: system.ipc_semaphore_arrays chart"); @@ -947,7 +973,7 @@ int do_kern_ipc_sem(int update_every, usec_t dt) { "IPC Semaphores", "semaphores", 1000, - localhost->rrd_update_every, + update_every, RRDSET_TYPE_AREA ); @@ -969,7 +995,7 @@ int do_kern_ipc_sem(int update_every, usec_t dt) { "IPC Semaphore Arrays", "arrays", 1000, - localhost->rrd_update_every, + update_every, RRDSET_TYPE_AREA ); @@ -989,6 +1015,7 @@ int do_kern_ipc_sem(int update_every, usec_t dt) { // kern.ipc.shm int do_kern_ipc_shm(int update_every, usec_t dt) { + (void)dt; static int mib_shmmni[3] = {0, 0, 0}, mib_shmsegs[3] = {0, 0, 0}; struct ipc_shm { u_long shmmni; @@ -1003,8 +1030,12 @@ int do_kern_ipc_shm(int update_every, usec_t dt) { return 1; } else { static struct shmid_kernel *ipc_shm_data = NULL; + static u_long old_shmmni = 0; - ipc_shm_data = reallocz(ipc_shm_data, sizeof(struct shmid_kernel) * ipc_shm.shmmni); + if (unlikely(ipc_shm.shmmni != old_shmmni)) { + ipc_shm_data = reallocz(ipc_shm_data, sizeof(struct shmid_kernel) * ipc_shm.shmmni); + old_shmmni = ipc_shm.shmmni; + } if (unlikely( GETSYSCTL_WSIZE("kern.ipc.shmsegs", mib_shmsegs, ipc_shm_data, sizeof(struct shmid_kernel) * ipc_shm.shmmni))) { error("DISABLED: system.ipc_shared_mem_segs chart"); @@ -1012,7 +1043,7 @@ int do_kern_ipc_shm(int update_every, usec_t dt) { error("DISABLED: kern.ipc.shmmodule"); return 1; } else { - int i; + unsigned long i; for (i = 0; i < ipc_shm.shmmni; i++) { if (unlikely(ipc_shm_data[i].u.shm_perm.mode & 0x0800)) { @@ -1035,7 +1066,7 @@ int do_kern_ipc_shm(int update_every, usec_t dt) { "IPC Shared Memory Segments", "segments", 1000, - localhost->rrd_update_every, + update_every, RRDSET_TYPE_AREA ); @@ -1057,7 +1088,7 @@ int do_kern_ipc_shm(int update_every, usec_t dt) { "IPC Shared Memory Segments Size", "kilobytes", 1000, - localhost->rrd_update_every, + update_every, RRDSET_TYPE_AREA ); @@ -1077,6 +1108,7 @@ int do_kern_ipc_shm(int update_every, usec_t dt) { // kern.ipc.msq int do_kern_ipc_msq(int update_every, usec_t dt) { + (void)dt; static int mib_msgmni[3] = {0, 0, 0}, mib_msqids[3] = {0, 0, 0}; struct ipc_msq { int msgmni; @@ -1094,8 +1126,12 @@ int do_kern_ipc_msq(int update_every, usec_t dt) { return 1; } else { static struct msqid_kernel *ipc_msq_data = NULL; + static int old_msgmni = 0; - ipc_msq_data = reallocz(ipc_msq_data, sizeof(struct msqid_kernel) * ipc_msq.msgmni); + if (unlikely(ipc_msq.msgmni != old_msgmni)) { + ipc_msq_data = reallocz(ipc_msq_data, sizeof(struct msqid_kernel) * ipc_msq.msgmni); + old_msgmni = ipc_msq.msgmni; + } if (unlikely( GETSYSCTL_WSIZE("kern.ipc.msqids", mib_msqids, ipc_msq_data, sizeof(struct msqid_kernel) * ipc_msq.msgmni))) { error("DISABLED: system.ipc_msq_queues chart"); @@ -1129,7 +1165,7 @@ int do_kern_ipc_msq(int update_every, usec_t dt) { "Number of IPC Message Queues", "queues", 990, - localhost->rrd_update_every, + update_every, RRDSET_TYPE_AREA ); @@ -1151,7 +1187,7 @@ int do_kern_ipc_msq(int update_every, usec_t dt) { "Number of Messages in IPC Message Queues", "messages", 1000, - localhost->rrd_update_every, + update_every, RRDSET_TYPE_AREA ); @@ -1173,7 +1209,7 @@ int do_kern_ipc_msq(int update_every, usec_t dt) { "Size of IPC Message Queues", "bytes", 1100, - localhost->rrd_update_every, + update_every, RRDSET_TYPE_LINE ); @@ -1195,6 +1231,7 @@ int do_kern_ipc_msq(int update_every, usec_t dt) { // uptime int do_uptime(int update_every, usec_t dt) { + (void)dt; struct timespec up_time; clock_gettime(CLOCK_UPTIME, &up_time); @@ -1231,6 +1268,7 @@ int do_uptime(int update_every, usec_t dt) { // net.isr int do_net_isr(int update_every, usec_t dt) { + (void)dt; static int do_netisr = -1, do_netisr_per_core = -1; if (unlikely(do_netisr == -1)) { @@ -1240,8 +1278,7 @@ int do_net_isr(int update_every, usec_t dt) { static int mib_workstream[3] = {0, 0, 0}, mib_work[3] = {0, 0, 0}; int common_error = 0; - int i, n; - size_t netisr_workstream_size, netisr_work_size; + size_t netisr_workstream_size = sizeof(mib_workstream), netisr_work_size = sizeof(mib_work); unsigned long num_netisr_workstreams = 0, num_netisr_works = 0; static struct sysctl_netisr_workstream *netisr_workstream = NULL; static struct sysctl_netisr_work *netisr_work = NULL; @@ -1258,14 +1295,25 @@ int do_net_isr(int update_every, usec_t dt) { } else if (unlikely(GETSYSCTL_SIZE("net.isr.work", mib_work, netisr_work_size))) { common_error = 1; } else { + static size_t old_netisr_workstream_size = 0; + num_netisr_workstreams = netisr_workstream_size / sizeof(struct sysctl_netisr_workstream); - netisr_workstream = reallocz(netisr_workstream, num_netisr_workstreams * sizeof(struct sysctl_netisr_workstream)); + if (unlikely(netisr_workstream_size != old_netisr_workstream_size)) { + netisr_workstream = reallocz(netisr_workstream, + num_netisr_workstreams * sizeof(struct sysctl_netisr_workstream)); + old_netisr_workstream_size = netisr_workstream_size; + } if (unlikely(GETSYSCTL_WSIZE("net.isr.workstream", mib_workstream, netisr_workstream, num_netisr_workstreams * sizeof(struct sysctl_netisr_workstream)))){ common_error = 1; } else { + static size_t old_netisr_work_size = 0; + num_netisr_works = netisr_work_size / sizeof(struct sysctl_netisr_work); - netisr_work = reallocz(netisr_work, num_netisr_works * sizeof(struct sysctl_netisr_work)); + if (unlikely(netisr_work_size != old_netisr_work_size)) { + netisr_work = reallocz(netisr_work, num_netisr_works * sizeof(struct sysctl_netisr_work)); + old_netisr_work_size = netisr_work_size; + } if (unlikely(GETSYSCTL_WSIZE("net.isr.work", mib_work, netisr_work, num_netisr_works * sizeof(struct sysctl_netisr_work)))){ common_error = 1; @@ -1281,7 +1329,14 @@ int do_net_isr(int update_every, usec_t dt) { error("DISABLED: net.isr module"); return 1; } else { - netisr_stats = reallocz(netisr_stats, (number_of_cpus + 1) * sizeof(struct netisr_stats)); + unsigned long i, n; + int j; + static int old_number_of_cpus = 0; + + if (unlikely(number_of_cpus != old_number_of_cpus)) { + netisr_stats = reallocz(netisr_stats, (number_of_cpus + 1) * sizeof(struct netisr_stats)); + old_number_of_cpus = number_of_cpus; + } memset(netisr_stats, 0, (number_of_cpus + 1) * sizeof(struct netisr_stats)); for (i = 0; i < num_netisr_workstreams; i++) { for (n = 0; n < num_netisr_works; n++) { @@ -1293,11 +1348,11 @@ int do_net_isr(int update_every, usec_t dt) { } } } - for (i = 0; i < number_of_cpus; i++) { - netisr_stats[number_of_cpus].dispatched += netisr_stats[i].dispatched; - netisr_stats[number_of_cpus].hybrid_dispatched += netisr_stats[i].hybrid_dispatched; - netisr_stats[number_of_cpus].qdrops += netisr_stats[i].qdrops; - netisr_stats[number_of_cpus].queued += netisr_stats[i].queued; + for (j = 0; j < number_of_cpus; j++) { + netisr_stats[number_of_cpus].dispatched += netisr_stats[j].dispatched; + netisr_stats[number_of_cpus].hybrid_dispatched += netisr_stats[j].hybrid_dispatched; + netisr_stats[number_of_cpus].qdrops += netisr_stats[j].qdrops; + netisr_stats[number_of_cpus].queued += netisr_stats[j].queued; } } } else { @@ -1350,6 +1405,7 @@ int do_net_isr(int update_every, usec_t dt) { RRDDIM *rd_queued; } *all_softnet_charts = NULL; static int old_number_of_cpus = 0; + int i; if(unlikely(number_of_cpus > old_number_of_cpus)) { all_softnet_charts = reallocz(all_softnet_charts, sizeof(struct softnet_chart) * number_of_cpus); @@ -1403,6 +1459,7 @@ int do_net_isr(int update_every, usec_t dt) { // net.inet.tcp.states int do_net_inet_tcp_states(int update_every, usec_t dt) { + (void)dt; static int mib[4] = {0, 0, 0, 0}; uint64_t tcps_states[TCP_NSTATES]; @@ -1446,6 +1503,7 @@ int do_net_inet_tcp_states(int update_every, usec_t dt) { // net.inet.tcp.stats int do_net_inet_tcp_stats(int update_every, usec_t dt) { + (void)dt; 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; if (unlikely(do_tcp_packets == -1)) { @@ -1740,6 +1798,7 @@ int do_net_inet_tcp_stats(int update_every, usec_t dt) { // net.inet.udp.stats int do_net_inet_udp_stats(int update_every, usec_t dt) { + (void)dt; static int do_udp_packets = -1, do_udp_errors = -1; if (unlikely(do_udp_packets == -1)) { @@ -1840,6 +1899,7 @@ int do_net_inet_udp_stats(int update_every, usec_t dt) { // net.inet.icmp.stats int do_net_inet_icmp_stats(int update_every, usec_t dt) { + (void)dt; static int do_icmp_packets = -1, do_icmp_errors = -1, do_icmpmsg = -1; if (unlikely(do_icmp_packets == -1)) { @@ -1965,6 +2025,7 @@ int do_net_inet_icmp_stats(int update_every, usec_t dt) { // net.inet.ip.stats int do_net_inet_ip_stats(int update_every, usec_t dt) { + (void)dt; static int do_ip_packets = -1, do_ip_fragsout = -1, do_ip_fragsin = -1, do_ip_errors = -1; if (unlikely(do_ip_packets == -1)) { @@ -2147,6 +2208,7 @@ int do_net_inet_ip_stats(int update_every, usec_t dt) { // net.inet6.ip6.stats int do_net_inet6_ip6_stats(int update_every, usec_t dt) { + (void)dt; static int do_ip6_packets = -1, do_ip6_fragsout = -1, do_ip6_fragsin = -1, do_ip6_errors = -1; if (unlikely(do_ip6_packets == -1)) { @@ -2357,6 +2419,7 @@ int do_net_inet6_ip6_stats(int update_every, usec_t dt) { // net.inet6.icmp6.stats int do_net_inet6_icmp6_stats(int update_every, usec_t dt) { + (void)dt; static int do_icmp6 = -1, do_icmp6_redir = -1, do_icmp6_errors = -1, do_icmp6_echos = -1, do_icmp6_router = -1, do_icmp6_neighbor = -1, do_icmp6_types = -1; @@ -2725,6 +2788,7 @@ int do_net_inet6_icmp6_stats(int update_every, usec_t dt) { // getmntinfo int do_getmntinfo(int update_every, usec_t dt) { + (void)dt; #define DELAULT_EXLUDED_PATHS "/proc/*" // taken from gnulib/mountlist.c and shortened to FreeBSD related fstypes @@ -2930,6 +2994,7 @@ int do_getmntinfo(int update_every, usec_t dt) { // getifaddrs int do_getifaddrs(int update_every, usec_t dt) { + (void)dt; #define DELAULT_EXLUDED_INTERFACES "lo*" #define CONFIG_SECTION_GETIFADDRS "plugin:freebsd:getifaddrs" @@ -3267,7 +3332,11 @@ int do_getifaddrs(int update_every, usec_t dt) { // -------------------------------------------------------------------- if (ifm->do_drops == CONFIG_BOOLEAN_YES || (ifm->do_drops == CONFIG_BOOLEAN_AUTO && - (IFA_DATA(iqdrops) || IFA_DATA(oqdrops)))) { + (IFA_DATA(iqdrops) +#if __FreeBSD__ >= 11 + || IFA_DATA(oqdrops) +#endif + ))) { if (unlikely(!ifm->st_drops)) { ifm->st_drops = rrdset_create_localhost("net_drops", ifa->ifa_name, @@ -3383,8 +3452,13 @@ int do_kern_devstat(int update_every, usec_t dt) { } else { static int mib_devstat[3] = {0, 0, 0}; static void *devstat_data = NULL; + static int old_numdevs = 0; - devstat_data = reallocz(devstat_data, sizeof(long) + sizeof(struct devstat) * numdevs); // there is generation number before devstat structures + if (unlikely(numdevs != old_numdevs)) { + devstat_data = reallocz(devstat_data, sizeof(long) + sizeof(struct devstat) * + numdevs); // there is generation number before devstat structures + old_numdevs = numdevs; + } if (unlikely(GETSYSCTL_WSIZE("kern.devstat.all", mib_devstat, devstat_data, sizeof(long) + sizeof(struct devstat) * numdevs))) { common_error = 1; @@ -3476,7 +3550,7 @@ int do_kern_devstat(int update_every, usec_t dt) { } if (unlikely(!enable_pass_devices)) - if (dstat[i].device_type & DEVSTAT_TYPE_PASS == DEVSTAT_TYPE_PASS) + if ((dstat[i].device_type & DEVSTAT_TYPE_PASS) == DEVSTAT_TYPE_PASS) continue; if (((dstat[i].device_type & DEVSTAT_TYPE_MASK) == DEVSTAT_TYPE_DIRECT) || ((dstat[i].device_type & DEVSTAT_TYPE_MASK) == DEVSTAT_TYPE_STORARRAY)) { @@ -3536,19 +3610,6 @@ int do_kern_devstat(int update_every, usec_t dt) { .do_avagsz = iter_avagsz, .do_svctm = iter_svctm, - // initialise data for differential charts - - .prev_dstat.bytes_read = dstat[i].bytes[DEVSTAT_READ], - .prev_dstat.bytes_write = dstat[i].bytes[DEVSTAT_WRITE], - .prev_dstat.operations_read = dstat[i].operations[DEVSTAT_READ], - .prev_dstat.operations_write = dstat[i].operations[DEVSTAT_WRITE], - .prev_dstat.duration_read_ms = dstat[i].duration[DEVSTAT_READ].sec * 1000 - + dstat[i].duration[DEVSTAT_READ].frac * BINTIME_SCALE, - .prev_dstat.duration_write_ms = dstat[i].duration[DEVSTAT_WRITE].sec * 1000 - + dstat[i].duration[DEVSTAT_READ].frac * BINTIME_SCALE, - .prev_dstat.busy_time_ms = dstat[i].busy_time.sec * 1000 - + dstat[i].busy_time.frac * BINTIME_SCALE, - .st_io = NULL, .rd_io_in = NULL, .rd_io_out = NULL, @@ -3579,6 +3640,19 @@ int do_kern_devstat(int update_every, usec_t dt) { .rd_svctm = NULL, }; + // initialise data for differential charts + + dmp.prev_dstat.bytes_read = dstat[i].bytes[DEVSTAT_READ]; + dmp.prev_dstat.bytes_write = dstat[i].bytes[DEVSTAT_WRITE]; + dmp.prev_dstat.operations_read = dstat[i].operations[DEVSTAT_READ]; + dmp.prev_dstat.operations_write = dstat[i].operations[DEVSTAT_WRITE]; + dmp.prev_dstat.duration_read_ms = dstat[i].duration[DEVSTAT_READ].sec * 1000 + + dstat[i].duration[DEVSTAT_READ].frac * BINTIME_SCALE; + dmp.prev_dstat.duration_write_ms = dstat[i].duration[DEVSTAT_WRITE].sec * 1000 + + dstat[i].duration[DEVSTAT_READ].frac * BINTIME_SCALE; + dmp.prev_dstat.busy_time_ms = dstat[i].busy_time.sec * 1000 + + dstat[i].busy_time.frac * BINTIME_SCALE; + dm = dictionary_set(disks, disk, &dmp, sizeof(struct disks_metadata)); }