summaryrefslogtreecommitdiffstats
path: root/collectors/macos.plugin/macos_fw.c
diff options
context:
space:
mode:
Diffstat (limited to 'collectors/macos.plugin/macos_fw.c')
-rw-r--r--collectors/macos.plugin/macos_fw.c46
1 files changed, 2 insertions, 44 deletions
diff --git a/collectors/macos.plugin/macos_fw.c b/collectors/macos.plugin/macos_fw.c
index 08d1ddadd..07f7d773d 100644
--- a/collectors/macos.plugin/macos_fw.c
+++ b/collectors/macos.plugin/macos_fw.c
@@ -168,14 +168,11 @@ int do_macos_iokit(int update_every, usec_t dt) {
rrddim_add(st, "reads", NULL, 1, 1024, RRD_ALGORITHM_INCREMENTAL);
rrddim_add(st, "writes", NULL, -1, 1024, RRD_ALGORITHM_INCREMENTAL);
}
- else rrdset_next(st);
prev_diskstat.bytes_read = rrddim_set(st, "reads", diskstat.bytes_read);
prev_diskstat.bytes_write = rrddim_set(st, "writes", diskstat.bytes_write);
rrdset_done(st);
- // --------------------------------------------------------------------
-
/* Get number of reads. */
if (likely(number = (CFNumberRef)CFDictionaryGetValue(statistics, CFSTR(kIOBlockStorageDriverStatisticsReadsKey)))) {
CFNumberGetValue(number, kCFNumberSInt64Type, &diskstat.reads);
@@ -207,14 +204,11 @@ int do_macos_iokit(int update_every, usec_t dt) {
rrddim_add(st, "reads", NULL, 1, 1, RRD_ALGORITHM_INCREMENTAL);
rrddim_add(st, "writes", NULL, -1, 1, RRD_ALGORITHM_INCREMENTAL);
}
- else rrdset_next(st);
prev_diskstat.operations_read = rrddim_set(st, "reads", diskstat.reads);
prev_diskstat.operations_write = rrddim_set(st, "writes", diskstat.writes);
rrdset_done(st);
- // --------------------------------------------------------------------
-
/* Get reads time. */
if (likely(number = (CFNumberRef)CFDictionaryGetValue(statistics, CFSTR(kIOBlockStorageDriverStatisticsTotalReadTimeKey)))) {
CFNumberGetValue(number, kCFNumberSInt64Type, &diskstat.time_read);
@@ -245,14 +239,11 @@ int do_macos_iokit(int update_every, usec_t dt) {
rrddim_add(st, "utilization", NULL, 1, 10000000, RRD_ALGORITHM_INCREMENTAL);
}
- else rrdset_next(st);
cur_diskstat.busy_time_ns = (diskstat.time_read + diskstat.time_write);
prev_diskstat.busy_time_ns = rrddim_set(st, "utilization", cur_diskstat.busy_time_ns);
rrdset_done(st);
- // --------------------------------------------------------------------
-
/* Get reads latency. */
if (likely(number = (CFNumberRef)CFDictionaryGetValue(statistics, CFSTR(kIOBlockStorageDriverStatisticsLatentReadTimeKey)))) {
CFNumberGetValue(number, kCFNumberSInt64Type, &diskstat.latency_read);
@@ -284,7 +275,6 @@ int do_macos_iokit(int update_every, usec_t dt) {
rrddim_add(st, "reads", NULL, 1, 1000000, RRD_ALGORITHM_INCREMENTAL);
rrddim_add(st, "writes", NULL, -1, 1000000, RRD_ALGORITHM_INCREMENTAL);
}
- else rrdset_next(st);
cur_diskstat.duration_read_ns = diskstat.time_read + diskstat.latency_read;
cur_diskstat.duration_write_ns = diskstat.time_write + diskstat.latency_write;
@@ -292,14 +282,10 @@ int do_macos_iokit(int update_every, usec_t dt) {
prev_diskstat.duration_write_ns = rrddim_set(st, "writes", cur_diskstat.duration_write_ns);
rrdset_done(st);
- // --------------------------------------------------------------------
// calculate differential charts
// only if this is not the first time we run
if (likely(dt)) {
-
- // --------------------------------------------------------------------
-
st = rrdset_find_active_bytype_localhost("disk_await", diskstat.name);
if (unlikely(!st)) {
st = rrdset_create_localhost(
@@ -321,7 +307,6 @@ int do_macos_iokit(int update_every, usec_t dt) {
rrddim_add(st, "reads", NULL, 1, 1000000, RRD_ALGORITHM_ABSOLUTE);
rrddim_add(st, "writes", NULL, -1, 1000000, RRD_ALGORITHM_ABSOLUTE);
}
- else rrdset_next(st);
rrddim_set(st, "reads", (diskstat.reads - prev_diskstat.operations_read) ?
(cur_diskstat.duration_read_ns - prev_diskstat.duration_read_ns) / (diskstat.reads - prev_diskstat.operations_read) : 0);
@@ -329,8 +314,6 @@ int do_macos_iokit(int update_every, usec_t dt) {
(cur_diskstat.duration_write_ns - prev_diskstat.duration_write_ns) / (diskstat.writes - prev_diskstat.operations_write) : 0);
rrdset_done(st);
- // --------------------------------------------------------------------
-
st = rrdset_find_active_bytype_localhost("disk_avgsz", diskstat.name);
if (unlikely(!st)) {
st = rrdset_create_localhost(
@@ -352,7 +335,6 @@ int do_macos_iokit(int update_every, usec_t dt) {
rrddim_add(st, "reads", NULL, 1, 1024, RRD_ALGORITHM_ABSOLUTE);
rrddim_add(st, "writes", NULL, -1, 1024, RRD_ALGORITHM_ABSOLUTE);
}
- else rrdset_next(st);
rrddim_set(st, "reads", (diskstat.reads - prev_diskstat.operations_read) ?
(diskstat.bytes_read - prev_diskstat.bytes_read) / (diskstat.reads - prev_diskstat.operations_read) : 0);
@@ -360,8 +342,6 @@ int do_macos_iokit(int update_every, usec_t dt) {
(diskstat.bytes_write - prev_diskstat.bytes_write) / (diskstat.writes - prev_diskstat.operations_write) : 0);
rrdset_done(st);
- // --------------------------------------------------------------------
-
st = rrdset_find_active_bytype_localhost("disk_svctm", diskstat.name);
if (unlikely(!st)) {
st = rrdset_create_localhost(
@@ -382,7 +362,6 @@ int do_macos_iokit(int update_every, usec_t dt) {
rrddim_add(st, "svctm", NULL, 1, 1000000, RRD_ALGORITHM_ABSOLUTE);
}
- else rrdset_next(st);
rrddim_set(st, "svctm", ((diskstat.reads - prev_diskstat.operations_read) + (diskstat.writes - prev_diskstat.operations_write)) ?
(cur_diskstat.busy_time_ns - prev_diskstat.busy_time_ns) / ((diskstat.reads - prev_diskstat.operations_read) + (diskstat.writes - prev_diskstat.operations_write)) : 0);
@@ -423,7 +402,6 @@ int do_macos_iokit(int update_every, usec_t dt) {
rrddim_add(st, "in", NULL, 1, 1024, RRD_ALGORITHM_INCREMENTAL);
rrddim_add(st, "out", NULL, -1, 1024, RRD_ALGORITHM_INCREMENTAL);
}
- else rrdset_next(st);
rrddim_set(st, "in", total_disk_reads);
rrddim_set(st, "out", total_disk_writes);
@@ -431,7 +409,6 @@ int do_macos_iokit(int update_every, usec_t dt) {
}
// Can be merged with FreeBSD plugin
- // --------------------------------------------------------------------------
if (likely(do_space || do_inodes)) {
// there is no mount info in sysctl MIBs
@@ -477,8 +454,7 @@ int do_macos_iokit(int update_every, usec_t dt) {
rrddim_add(st, "avail", NULL, mntbuf[i].f_bsize, GIGA_FACTOR, RRD_ALGORITHM_ABSOLUTE);
rrddim_add(st, "used", NULL, mntbuf[i].f_bsize, GIGA_FACTOR, RRD_ALGORITHM_ABSOLUTE);
rrddim_add(st, "reserved_for_root", "reserved for root", mntbuf[i].f_bsize, GIGA_FACTOR, RRD_ALGORITHM_ABSOLUTE);
- } else
- rrdset_next(st);
+ }
rrddim_set(st, "avail", (collected_number) mntbuf[i].f_bavail);
rrddim_set(st, "used", (collected_number) (mntbuf[i].f_blocks - mntbuf[i].f_bfree));
@@ -510,8 +486,7 @@ int do_macos_iokit(int update_every, usec_t dt) {
rrddim_add(st, "avail", NULL, 1, 1, RRD_ALGORITHM_ABSOLUTE);
rrddim_add(st, "used", NULL, 1, 1, RRD_ALGORITHM_ABSOLUTE);
rrddim_add(st, "reserved_for_root", "reserved for root", 1, 1, RRD_ALGORITHM_ABSOLUTE);
- } else
- rrdset_next(st);
+ }
rrddim_set(st, "avail", (collected_number) mntbuf[i].f_ffree);
rrddim_set(st, "used", (collected_number) (mntbuf[i].f_files - mntbuf[i].f_ffree));
@@ -522,7 +497,6 @@ int do_macos_iokit(int update_every, usec_t dt) {
}
// Can be merged with FreeBSD plugin
- // --------------------------------------------------------------------
if (likely(do_bandwidth)) {
if (unlikely(getifaddrs(&ifap))) {
@@ -534,8 +508,6 @@ int do_macos_iokit(int update_every, usec_t dt) {
if (ifa->ifa_addr->sa_family != AF_LINK)
continue;
- // --------------------------------------------------------------------
-
st = rrdset_find_active_bytype_localhost("net", ifa->ifa_name);
if (unlikely(!st)) {
st = rrdset_create_localhost(
@@ -556,14 +528,11 @@ int do_macos_iokit(int update_every, usec_t dt) {
rrddim_add(st, "received", NULL, 8, BITS_IN_A_KILOBIT, RRD_ALGORITHM_INCREMENTAL);
rrddim_add(st, "sent", NULL, -8, BITS_IN_A_KILOBIT, RRD_ALGORITHM_INCREMENTAL);
}
- else rrdset_next(st);
rrddim_set(st, "received", IFA_DATA(ibytes));
rrddim_set(st, "sent", IFA_DATA(obytes));
rrdset_done(st);
- // --------------------------------------------------------------------
-
st = rrdset_find_active_bytype_localhost("net_packets", ifa->ifa_name);
if (unlikely(!st)) {
st = rrdset_create_localhost(
@@ -587,7 +556,6 @@ int do_macos_iokit(int update_every, usec_t dt) {
rrddim_add(st, "multicast_received", NULL, 1, 1, RRD_ALGORITHM_INCREMENTAL);
rrddim_add(st, "multicast_sent", NULL, -1, 1, RRD_ALGORITHM_INCREMENTAL);
}
- else rrdset_next(st);
rrddim_set(st, "received", IFA_DATA(ipackets));
rrddim_set(st, "sent", IFA_DATA(opackets));
@@ -595,8 +563,6 @@ int do_macos_iokit(int update_every, usec_t dt) {
rrddim_set(st, "multicast_sent", IFA_DATA(omcasts));
rrdset_done(st);
- // --------------------------------------------------------------------
-
st = rrdset_find_active_bytype_localhost("net_errors", ifa->ifa_name);
if (unlikely(!st)) {
st = rrdset_create_localhost(
@@ -618,14 +584,11 @@ int do_macos_iokit(int update_every, usec_t dt) {
rrddim_add(st, "inbound", NULL, 1, 1, RRD_ALGORITHM_INCREMENTAL);
rrddim_add(st, "outbound", NULL, -1, 1, RRD_ALGORITHM_INCREMENTAL);
}
- else rrdset_next(st);
rrddim_set(st, "inbound", IFA_DATA(ierrors));
rrddim_set(st, "outbound", IFA_DATA(oerrors));
rrdset_done(st);
- // --------------------------------------------------------------------
-
st = rrdset_find_active_bytype_localhost("net_drops", ifa->ifa_name);
if (unlikely(!st)) {
st = rrdset_create_localhost(
@@ -646,13 +609,10 @@ int do_macos_iokit(int update_every, usec_t dt) {
rrddim_add(st, "inbound", NULL, 1, 1, RRD_ALGORITHM_INCREMENTAL);
}
- else rrdset_next(st);
rrddim_set(st, "inbound", IFA_DATA(iqdrops));
rrdset_done(st);
- // --------------------------------------------------------------------
-
st = rrdset_find_active_bytype_localhost("net_events", ifa->ifa_name);
if (unlikely(!st)) {
st = rrdset_create_localhost(
@@ -675,7 +635,6 @@ int do_macos_iokit(int update_every, usec_t dt) {
rrddim_add(st, "collisions", NULL, -1, 1, RRD_ALGORITHM_INCREMENTAL);
rrddim_add(st, "carrier", NULL, -1, 1, RRD_ALGORITHM_INCREMENTAL);
}
- else rrdset_next(st);
rrddim_set(st, "collisions", IFA_DATA(collisions));
rrdset_done(st);
@@ -685,6 +644,5 @@ int do_macos_iokit(int update_every, usec_t dt) {
}
}
-
return 0;
}
generated by cgit v1.2.3 (git 2.39.1) at 2024-05-06 07:20:45 +0000