]> arthur.barton.de Git - netdata.git/commitdiff
unified rrdset and rrddim to use enum for flags
authorCosta Tsaousis (ktsaou) <costa@tsaousis.gr>
Sat, 18 Feb 2017 20:29:43 +0000 (22:29 +0200)
committerCosta Tsaousis (ktsaou) <costa@tsaousis.gr>
Tue, 21 Feb 2017 23:00:23 +0000 (01:00 +0200)
23 files changed:
src/freebsd_sysctl.c
src/macos_fw.c
src/macos_mach_smi.c
src/macos_sysctl.c
src/plugins_d.c
src/proc_diskstats.c
src/proc_meminfo.c
src/proc_net_dev.c
src/proc_net_netstat.c
src/proc_net_rpc_nfs.c
src/proc_net_rpc_nfsd.c
src/proc_net_snmp.c
src/proc_net_snmp6.c
src/proc_net_stat_conntrack.c
src/proc_stat.c
src/proc_vmstat.c
src/rrd.h
src/rrd2json.c
src/rrdhost.c
src/rrdset.c
src/sys_devices_system_node.c
src/unit_test.c
src/web_client.c

index c01e8973899ff0a01e0435bb768565af3fb99c6b..8a864236a1580b85c8c5b4eaf5f7cfdd863d7618 100644 (file)
@@ -353,7 +353,7 @@ int do_freebsd_sysctl(int update_every, usec_t dt) {
                 st = rrdset_find_localhost("mem.committed");
                 if (unlikely(!st)) {
                     st = rrdset_create_localhost("mem", "committed", NULL, "system", NULL, "Committed (Allocated) Memory", "MB", 5000, update_every, RRDSET_TYPE_AREA);
-                    st->isdetail = 1;
+                    rrdset_flag_set(st, RRDSET_FLAG_DETAIL);
 
                     rrddim_add(st, "Committed_AS", NULL, system_pagesize, MEGA_FACTOR, RRD_ALGORITHM_ABSOLUTE);
                 }
@@ -466,7 +466,7 @@ int do_freebsd_sysctl(int update_every, usec_t dt) {
                 st = rrdset_find_bytype_localhost("system", "intr");
                 if (unlikely(!st)) {
                     st = rrdset_create_localhost("system", "intr", NULL, "interrupts", NULL, "Total Hardware Interrupts", "interrupts/s", 900, update_every, RRDSET_TYPE_LINE);
-                    st->isdetail = 1;
+                    rrdset_flag_set(st, RRDSET_FLAG_DETAIL);
 
                     rrddim_add(st, "interrupts", NULL, 1, 1, RRD_ALGORITHM_INCREMENTAL);
                 }
@@ -579,7 +579,7 @@ int do_freebsd_sysctl(int update_every, usec_t dt) {
             st = rrdset_find_bytype_localhost("system", "forks");
             if (unlikely(!st)) {
                 st = rrdset_create_localhost("system", "forks", NULL, "processes", NULL, "Started Processes", "processes/s", 700, update_every, RRDSET_TYPE_LINE);
-                st->isdetail = 1;
+                rrdset_flag_set(st, RRDSET_FLAG_DETAIL);
 
                 rrddim_add(st, "started", NULL, 1, 1, RRD_ALGORITHM_INCREMENTAL);
             }
@@ -632,7 +632,7 @@ int do_freebsd_sysctl(int update_every, usec_t dt) {
                         st = rrdset_find_bytype_localhost("disk_ops", disk);
                         if (unlikely(!st)) {
                             st = rrdset_create_localhost("disk_ops", disk, NULL, disk, "disk.ops", "Disk Completed I/O Operations", "operations/s", 2001, update_every, RRDSET_TYPE_LINE);
-                            st->isdetail = 1;
+                            rrdset_flag_set(st, RRDSET_FLAG_DETAIL);
 
                             rrddim_add(st, "reads", NULL, 1, 1, RRD_ALGORITHM_INCREMENTAL);
                             rrddim_add(st, "writes", NULL, -1, 1, RRD_ALGORITHM_INCREMENTAL);
@@ -648,7 +648,7 @@ int do_freebsd_sysctl(int update_every, usec_t dt) {
                         st = rrdset_find_bytype_localhost("disk_qops", disk);
                         if (unlikely(!st)) {
                             st = rrdset_create_localhost("disk_qops", disk, NULL, disk, "disk.qops", "Disk Current I/O Operations", "operations", 2002, update_every, RRDSET_TYPE_LINE);
-                            st->isdetail = 1;
+                            rrdset_flag_set(st, RRDSET_FLAG_DETAIL);
 
                             rrddim_add(st, "operations", NULL, 1, 1, RRD_ALGORITHM_ABSOLUTE);
                         }
@@ -662,7 +662,7 @@ int do_freebsd_sysctl(int update_every, usec_t dt) {
                         st = rrdset_find_bytype_localhost("disk_util", disk);
                         if (unlikely(!st)) {
                             st = rrdset_create_localhost("disk_util", disk, NULL, disk, "disk.util", "Disk Utilization Time", "% of time working", 2004, update_every, RRDSET_TYPE_AREA);
-                            st->isdetail = 1;
+                            rrdset_flag_set(st, RRDSET_FLAG_DETAIL);
 
                             rrddim_add(st, "utilization", NULL, 1, 10, RRD_ALGORITHM_INCREMENTAL);
                         }
@@ -677,7 +677,7 @@ int do_freebsd_sysctl(int update_every, usec_t dt) {
                         st = rrdset_find_bytype_localhost("disk_iotime", disk);
                         if (unlikely(!st)) {
                             st = rrdset_create_localhost("disk_iotime", disk, NULL, disk, "disk.iotime", "Disk Total I/O Time", "milliseconds/s", 2022, update_every, RRDSET_TYPE_LINE);
-                            st->isdetail = 1;
+                            rrdset_flag_set(st, RRDSET_FLAG_DETAIL);
 
                             rrddim_add(st, "reads", NULL, 1, 1, RRD_ALGORITHM_INCREMENTAL);
                             rrddim_add(st, "writes", NULL, -1, 1, RRD_ALGORITHM_INCREMENTAL);
@@ -701,7 +701,7 @@ int do_freebsd_sysctl(int update_every, usec_t dt) {
                             st = rrdset_find_bytype_localhost("disk_await", disk);
                             if (unlikely(!st)) {
                                 st = rrdset_create_localhost("disk_await", disk, NULL, disk, "disk.await", "Average Completed I/O Operation Time", "ms per operation", 2005, update_every, RRDSET_TYPE_LINE);
-                                st->isdetail = 1;
+                                rrdset_flag_set(st, RRDSET_FLAG_DETAIL);
 
                                 rrddim_add(st, "reads", NULL, 1, 1, RRD_ALGORITHM_ABSOLUTE);
                                 rrddim_add(st, "writes", NULL, -1, 1, RRD_ALGORITHM_ABSOLUTE);
@@ -719,7 +719,7 @@ int do_freebsd_sysctl(int update_every, usec_t dt) {
                             st = rrdset_find_bytype_localhost("disk_avgsz", disk);
                             if (unlikely(!st)) {
                                 st = rrdset_create_localhost("disk_avgsz", disk, NULL, disk, "disk.avgsz", "Average Completed I/O Operation Bandwidth", "kilobytes per operation", 2006, update_every, RRDSET_TYPE_AREA);
-                                st->isdetail = 1;
+                                rrdset_flag_set(st, RRDSET_FLAG_DETAIL);
 
                                 rrddim_add(st, "reads", NULL, 1, 1024, RRD_ALGORITHM_ABSOLUTE);
                                 rrddim_add(st, "writes", NULL, -1, 1024, RRD_ALGORITHM_ABSOLUTE);
@@ -737,7 +737,7 @@ int do_freebsd_sysctl(int update_every, usec_t dt) {
                             st = rrdset_find_bytype_localhost("disk_svctm", disk);
                             if (unlikely(!st)) {
                                 st = rrdset_create_localhost("disk_svctm", disk, NULL, disk, "disk.svctm", "Average Service Time", "ms per operation", 2007, update_every, RRDSET_TYPE_LINE);
-                                st->isdetail = 1;
+                                rrdset_flag_set(st, RRDSET_FLAG_DETAIL);
 
                                 rrddim_add(st, "svctm", NULL, 1, 1, RRD_ALGORITHM_ABSOLUTE);
                             }
@@ -801,7 +801,7 @@ int do_freebsd_sysctl(int update_every, usec_t dt) {
                 st = rrdset_find_localhost("system.swap");
                 if (unlikely(!st)) {
                     st = rrdset_create_localhost("system", "swap", NULL, "swap", NULL, "System Swap", "MB", 201, update_every, RRDSET_TYPE_STACKED);
-                    st->isdetail = 1;
+                    rrdset_flag_set(st, RRDSET_FLAG_DETAIL);
 
                     rrddim_add(st, "free",    NULL, system_pagesize, MEGA_FACTOR, RRD_ALGORITHM_ABSOLUTE);
                     rrddim_add(st, "used",    NULL, system_pagesize, MEGA_FACTOR, RRD_ALGORITHM_ABSOLUTE);
@@ -892,7 +892,7 @@ int do_freebsd_sysctl(int update_every, usec_t dt) {
             st = rrdset_find_localhost("mem.pgfaults");
             if (unlikely(!st)) {
                 st = rrdset_create_localhost("mem", "pgfaults", NULL, "system", NULL, "Memory Page Faults", "page faults/s", 500, update_every, RRDSET_TYPE_LINE);
-                st->isdetail = 1;
+                rrdset_flag_set(st, RRDSET_FLAG_DETAIL);
 
                 rrddim_add(st, "memory", NULL, 1, 1, RRD_ALGORITHM_INCREMENTAL);
                 rrddim_add(st, "io_requiring", NULL, 1, 1, RRD_ALGORITHM_INCREMENTAL);
@@ -1246,7 +1246,7 @@ int do_freebsd_sysctl(int update_every, usec_t dt) {
                 st = rrdset_find_bytype_localhost("net_packets", ifa->ifa_name);
                 if (unlikely(!st)) {
                     st = rrdset_create_localhost("net_packets", ifa->ifa_name, NULL, ifa->ifa_name, "net.packets", "Packets", "packets/s", 7001, update_every, RRDSET_TYPE_LINE);
-                    st->isdetail = 1;
+                    rrdset_flag_set(st, RRDSET_FLAG_DETAIL);
 
                     rrddim_add(st, "received", NULL, 1, 1, RRD_ALGORITHM_INCREMENTAL);
                     rrddim_add(st, "sent", NULL, -1, 1, RRD_ALGORITHM_INCREMENTAL);
@@ -1266,7 +1266,7 @@ int do_freebsd_sysctl(int update_every, usec_t dt) {
                 st = rrdset_find_bytype_localhost("net_errors", ifa->ifa_name);
                 if (unlikely(!st)) {
                     st = rrdset_create_localhost("net_errors", ifa->ifa_name, NULL, ifa->ifa_name, "net.errors", "Interface Errors", "errors/s", 7002, update_every, RRDSET_TYPE_LINE);
-                    st->isdetail = 1;
+                    rrdset_flag_set(st, RRDSET_FLAG_DETAIL);
 
                     rrddim_add(st, "inbound", NULL, 1, 1, RRD_ALGORITHM_INCREMENTAL);
                     rrddim_add(st, "outbound", NULL, -1, 1, RRD_ALGORITHM_INCREMENTAL);
@@ -1282,7 +1282,7 @@ int do_freebsd_sysctl(int update_every, usec_t dt) {
                 st = rrdset_find_bytype_localhost("net_drops", ifa->ifa_name);
                 if (unlikely(!st)) {
                     st = rrdset_create_localhost("net_drops", ifa->ifa_name, NULL, ifa->ifa_name, "net.drops", "Interface Drops", "drops/s", 7003, update_every, RRDSET_TYPE_LINE);
-                    st->isdetail = 1;
+                    rrdset_flag_set(st, RRDSET_FLAG_DETAIL);
 
                     rrddim_add(st, "inbound", NULL, 1, 1, RRD_ALGORITHM_INCREMENTAL);
 #if __FreeBSD__ >= 11
@@ -1302,7 +1302,7 @@ int do_freebsd_sysctl(int update_every, usec_t dt) {
                 st = rrdset_find_bytype_localhost("net_events", ifa->ifa_name);
                 if (unlikely(!st)) {
                     st = rrdset_create_localhost("net_events", ifa->ifa_name, NULL, ifa->ifa_name, "net.events", "Network Interface Events", "events/s", 7006, update_every, RRDSET_TYPE_LINE);
-                    st->isdetail = 1;
+                    rrdset_flag_set(st, RRDSET_FLAG_DETAIL);
 
                     rrddim_add(st, "frames", NULL, 1, 1, RRD_ALGORITHM_INCREMENTAL);
                     rrddim_add(st, "collisions", NULL, -1, 1, RRD_ALGORITHM_INCREMENTAL);
@@ -1387,7 +1387,7 @@ int do_freebsd_sysctl(int update_every, usec_t dt) {
                     st = rrdset_create_localhost("ipv4", "tcperrors", NULL, "tcp", NULL, "IPv4 TCP Errors",
                                        "packets/s",
                                        2700, update_every, RRDSET_TYPE_LINE);
-                    st->isdetail = 1;
+                    rrdset_flag_set(st, RRDSET_FLAG_DETAIL);
 
                     rrddim_add(st, "InErrs", NULL, 1, 1, RRD_ALGORITHM_INCREMENTAL);
                     rrddim_add(st, "InCsumErrors", NULL, 1, 1, RRD_ALGORITHM_INCREMENTAL);
@@ -1413,7 +1413,7 @@ int do_freebsd_sysctl(int update_every, usec_t dt) {
                     st = rrdset_create_localhost("ipv4", "tcphandshake", NULL, "tcp", NULL,
                                        "IPv4 TCP Handshake Issues",
                                        "events/s", 2900, update_every, RRDSET_TYPE_LINE);
-                    st->isdetail = 1;
+                    rrdset_flag_set(st, RRDSET_FLAG_DETAIL);
 
                     rrddim_add(st, "EstabResets", NULL, 1, 1, RRD_ALGORITHM_INCREMENTAL);
                     rrddim_add(st, "ActiveOpens", NULL, 1, 1, RRD_ALGORITHM_INCREMENTAL);
@@ -1497,7 +1497,7 @@ int do_freebsd_sysctl(int update_every, usec_t dt) {
                 st = rrdset_find_localhost("ipv4.ecnpkts");
                 if (unlikely(!st)) {
                     st = rrdset_create_localhost("ipv4", "ecnpkts", NULL, "ecn", NULL, "IPv4 ECN Statistics", "packets/s", 8700, update_every, RRDSET_TYPE_LINE);
-                    st->isdetail = 1;
+                    rrdset_flag_set(st, RRDSET_FLAG_DETAIL);
 
                     rrddim_add(st, "InCEPkts", "CEP", 1, 1, RRD_ALGORITHM_INCREMENTAL);
                     rrddim_add(st, "InNoECTPkts", "NoECTP", -1, 1, RRD_ALGORITHM_INCREMENTAL);
@@ -1549,7 +1549,7 @@ int do_freebsd_sysctl(int update_every, usec_t dt) {
                 if (unlikely(!st)) {
                     st = rrdset_create_localhost("ipv4", "udperrors", NULL, "udp", NULL, "IPv4 UDP Errors", "events/s",
                                        2701, update_every, RRDSET_TYPE_LINE);
-                    st->isdetail = 1;
+                    rrdset_flag_set(st, RRDSET_FLAG_DETAIL);
 
                     rrddim_add(st, "RcvbufErrors", NULL, 1, 1, RRD_ALGORITHM_INCREMENTAL);
                     rrddim_add(st, "InErrors", NULL, 1, 1, RRD_ALGORITHM_INCREMENTAL);
@@ -1691,7 +1691,7 @@ int do_freebsd_sysctl(int update_every, usec_t dt) {
                 if (unlikely(!st)) {
                     st = rrdset_create_localhost("ipv4", "fragsout", NULL, "fragments", NULL, "IPv4 Fragments Sent",
                                        "packets/s", 3010, update_every, RRDSET_TYPE_LINE);
-                    st->isdetail = 1;
+                    rrdset_flag_set(st, RRDSET_FLAG_DETAIL);
 
                     rrddim_add(st, "FragOKs", "ok", 1, 1, RRD_ALGORITHM_INCREMENTAL);
                     rrddim_add(st, "FragFails", "failed", -1, 1, RRD_ALGORITHM_INCREMENTAL);
@@ -1713,7 +1713,7 @@ int do_freebsd_sysctl(int update_every, usec_t dt) {
                     st = rrdset_create_localhost("ipv4", "fragsin", NULL, "fragments", NULL,
                                        "IPv4 Fragments Reassembly",
                                        "packets/s", 3011, update_every, RRDSET_TYPE_LINE);
-                    st->isdetail = 1;
+                    rrdset_flag_set(st, RRDSET_FLAG_DETAIL);
 
                     rrddim_add(st, "ReasmOKs", "ok", 1, 1, RRD_ALGORITHM_INCREMENTAL);
                     rrddim_add(st, "ReasmFails", "failed", -1, 1, RRD_ALGORITHM_INCREMENTAL);
@@ -1735,7 +1735,7 @@ int do_freebsd_sysctl(int update_every, usec_t dt) {
                     st = rrdset_create_localhost("ipv4", "errors", NULL, "errors", NULL, "IPv4 Errors", "packets/s",
                                        3002,
                                        update_every, RRDSET_TYPE_LINE);
-                    st->isdetail = 1;
+                    rrdset_flag_set(st, RRDSET_FLAG_DETAIL);
 
                     rrddim_add(st, "InDiscards", NULL, 1, 1, RRD_ALGORITHM_INCREMENTAL);
                     rrddim_add(st, "OutDiscards", NULL, -1, 1, RRD_ALGORITHM_INCREMENTAL);
@@ -1805,7 +1805,7 @@ int do_freebsd_sysctl(int update_every, usec_t dt) {
                 if (unlikely(!st)) {
                     st = rrdset_create_localhost("ipv6", "fragsout", NULL, "fragments", NULL, "IPv6 Fragments Sent",
                                        "packets/s", 3010, update_every, RRDSET_TYPE_LINE);
-                    st->isdetail = 1;
+                    rrdset_flag_set(st, RRDSET_FLAG_DETAIL);
 
                     rrddim_add(st, "ok", NULL, 1, 1, RRD_ALGORITHM_INCREMENTAL);
                     rrddim_add(st, "failed", NULL, -1, 1, RRD_ALGORITHM_INCREMENTAL);
@@ -1829,7 +1829,7 @@ int do_freebsd_sysctl(int update_every, usec_t dt) {
                 if (unlikely(!st)) {
                     st = rrdset_create_localhost("ipv6", "fragsin", NULL, "fragments", NULL, "IPv6 Fragments Reassembly",
                                        "packets/s", 3011, update_every, RRDSET_TYPE_LINE);
-                    st->isdetail = 1;
+                    rrdset_flag_set(st, RRDSET_FLAG_DETAIL);
 
                     rrddim_add(st, "ok", NULL, 1, 1, RRD_ALGORITHM_INCREMENTAL);
                     rrddim_add(st, "failed", NULL, -1, 1, RRD_ALGORITHM_INCREMENTAL);
@@ -1862,7 +1862,7 @@ int do_freebsd_sysctl(int update_every, usec_t dt) {
                 if (unlikely(!st)) {
                     st = rrdset_create_localhost("ipv6", "errors", NULL, "errors", NULL, "IPv6 Errors", "packets/s", 3002,
                                        update_every, RRDSET_TYPE_LINE);
-                    st->isdetail = 1;
+                    rrdset_flag_set(st, RRDSET_FLAG_DETAIL);
 
                     rrddim_add(st, "InDiscards", NULL, 1, 1, RRD_ALGORITHM_INCREMENTAL);
                     rrddim_add(st, "OutDiscards", NULL, -1, 1, RRD_ALGORITHM_INCREMENTAL);
index 0782e4c71e615f22335a8df17f940ea904c6c816..c47da52f1634461a81c74f8b4c7a736ae37013a8 100644 (file)
@@ -168,7 +168,7 @@ int do_macos_iokit(int update_every, usec_t dt) {
                         st = rrdset_create_localhost("disk_ops", diskstat.name, NULL, diskstat.name, "disk.ops"
                                                      , "Disk Completed I/O Operations", "operations/s", 2001
                                                      , update_every, RRDSET_TYPE_LINE);
-                        st->isdetail = 1;
+                        rrdset_flag_set(st, RRDSET_FLAG_DETAIL);
 
                         rrddim_add(st, "reads", NULL, 1, 1, RRD_ALGORITHM_INCREMENTAL);
                         rrddim_add(st, "writes", NULL, -1, 1, RRD_ALGORITHM_INCREMENTAL);
@@ -196,7 +196,7 @@ int do_macos_iokit(int update_every, usec_t dt) {
                         st = rrdset_create_localhost("disk_util", diskstat.name, NULL, diskstat.name, "disk.util"
                                                      , "Disk Utilization Time", "% of time working", 2004, update_every
                                                      , RRDSET_TYPE_AREA);
-                        st->isdetail = 1;
+                        rrdset_flag_set(st, RRDSET_FLAG_DETAIL);
 
                         rrddim_add(st, "utilization", NULL, 1, 10000000, RRD_ALGORITHM_INCREMENTAL);
                     }
@@ -223,7 +223,7 @@ int do_macos_iokit(int update_every, usec_t dt) {
                         st = rrdset_create_localhost("disk_iotime", diskstat.name, NULL, diskstat.name, "disk.iotime"
                                                      , "Disk Total I/O Time", "milliseconds/s", 2022, update_every
                                                      , RRDSET_TYPE_LINE);
-                        st->isdetail = 1;
+                        rrdset_flag_set(st, RRDSET_FLAG_DETAIL);
 
                         rrddim_add(st, "reads", NULL, 1, 1000000, RRD_ALGORITHM_INCREMENTAL);
                         rrddim_add(st, "writes", NULL, -1, 1000000, RRD_ALGORITHM_INCREMENTAL);
@@ -249,7 +249,7 @@ int do_macos_iokit(int update_every, usec_t dt) {
                             st = rrdset_create_localhost("disk_await", diskstat.name, NULL, diskstat.name, "disk.await"
                                                          , "Average Completed I/O Operation Time", "ms per operation"
                                                          , 2005, update_every, RRDSET_TYPE_LINE);
-                            st->isdetail = 1;
+                            rrdset_flag_set(st, RRDSET_FLAG_DETAIL);
 
                             rrddim_add(st, "reads", NULL, 1, 1000000, RRD_ALGORITHM_ABSOLUTE);
                             rrddim_add(st, "writes", NULL, -1, 1000000, RRD_ALGORITHM_ABSOLUTE);
@@ -270,7 +270,7 @@ int do_macos_iokit(int update_every, usec_t dt) {
                                                          , "Average Completed I/O Operation Bandwidth"
                                                          , "kilobytes per operation", 2006, update_every
                                                          , RRDSET_TYPE_AREA);
-                            st->isdetail = 1;
+                            rrdset_flag_set(st, RRDSET_FLAG_DETAIL);
 
                             rrddim_add(st, "reads", NULL, 1, 1024, RRD_ALGORITHM_ABSOLUTE);
                             rrddim_add(st, "writes", NULL, -1, 1024, RRD_ALGORITHM_ABSOLUTE);
@@ -290,7 +290,7 @@ int do_macos_iokit(int update_every, usec_t dt) {
                             st = rrdset_create_localhost("disk_svctm", diskstat.name, NULL, diskstat.name, "disk.svctm"
                                                          , "Average Service Time", "ms per operation", 2007
                                                          , update_every, RRDSET_TYPE_LINE);
-                            st->isdetail = 1;
+                            rrdset_flag_set(st, RRDSET_FLAG_DETAIL);
 
                             rrddim_add(st, "svctm", NULL, 1, 1000000, RRD_ALGORITHM_ABSOLUTE);
                         }
@@ -435,7 +435,7 @@ int do_macos_iokit(int update_every, usec_t dt) {
                 if (unlikely(!st)) {
                     st = rrdset_create_localhost("net_packets", ifa->ifa_name, NULL, ifa->ifa_name, "net.packets"
                                                  , "Packets", "packets/s", 7001, update_every, RRDSET_TYPE_LINE);
-                    st->isdetail = 1;
+                    rrdset_flag_set(st, RRDSET_FLAG_DETAIL);
 
                     rrddim_add(st, "received", NULL, 1, 1, RRD_ALGORITHM_INCREMENTAL);
                     rrddim_add(st, "sent", NULL, -1, 1, RRD_ALGORITHM_INCREMENTAL);
@@ -456,7 +456,7 @@ int do_macos_iokit(int update_every, usec_t dt) {
                 if (unlikely(!st)) {
                     st = rrdset_create_localhost("net_errors", ifa->ifa_name, NULL, ifa->ifa_name, "net.errors"
                                                  , "Interface Errors", "errors/s", 7002, update_every, RRDSET_TYPE_LINE);
-                    st->isdetail = 1;
+                    rrdset_flag_set(st, RRDSET_FLAG_DETAIL);
 
                     rrddim_add(st, "inbound", NULL, 1, 1, RRD_ALGORITHM_INCREMENTAL);
                     rrddim_add(st, "outbound", NULL, -1, 1, RRD_ALGORITHM_INCREMENTAL);
@@ -473,7 +473,7 @@ int do_macos_iokit(int update_every, usec_t dt) {
                 if (unlikely(!st)) {
                     st = rrdset_create_localhost("net_drops", ifa->ifa_name, NULL, ifa->ifa_name, "net.drops"
                                                  , "Interface Drops", "drops/s", 7003, update_every, RRDSET_TYPE_LINE);
-                    st->isdetail = 1;
+                    rrdset_flag_set(st, RRDSET_FLAG_DETAIL);
 
                     rrddim_add(st, "inbound", NULL, 1, 1, RRD_ALGORITHM_INCREMENTAL);
                 }
@@ -489,7 +489,7 @@ int do_macos_iokit(int update_every, usec_t dt) {
                     st = rrdset_create_localhost("net_events", ifa->ifa_name, NULL, ifa->ifa_name, "net.events"
                                                  , "Network Interface Events", "events/s", 7006, update_every
                                                  , RRDSET_TYPE_LINE);
-                    st->isdetail = 1;
+                    rrdset_flag_set(st, RRDSET_FLAG_DETAIL);
 
                     rrddim_add(st, "frames", NULL, 1, 1, RRD_ALGORITHM_INCREMENTAL);
                     rrddim_add(st, "collisions", NULL, -1, 1, RRD_ALGORITHM_INCREMENTAL);
index 9b8e1e9b31b5fa33afaa98656eb483a4170c26c8..da28255137be9741693a54a568e515eb4b3fa98d 100644 (file)
@@ -137,7 +137,7 @@ int do_macos_mach_smi(int update_every, usec_t dt) {
                 if (unlikely(!st)) {
                     st = rrdset_create_localhost("mem", "pgfaults", NULL, "system", NULL, "Memory Page Faults"
                                                  , "page faults/s", 500, update_every, RRDSET_TYPE_LINE);
-                    st->isdetail = 1;
+                    rrdset_flag_set(st, RRDSET_FLAG_DETAIL);
 
                     rrddim_add(st, "memory",    NULL, 1, 1, RRD_ALGORITHM_INCREMENTAL);
                     rrddim_add(st, "cow",       NULL, 1, 1, RRD_ALGORITHM_INCREMENTAL);
index ed4c5363a31752b2d3fcb331863498f28f9b1ce7..58a62832b36131fa28e6a922838fa3d53bba49aa 100644 (file)
@@ -248,7 +248,7 @@ int do_macos_sysctl(int update_every, usec_t dt) {
             if (unlikely(!st)) {
                 st = rrdset_create_localhost("system", "swap", NULL, "swap", NULL, "System Swap", "MB", 201
                                              , update_every, RRDSET_TYPE_STACKED);
-                st->isdetail = 1;
+                rrdset_flag_set(st, RRDSET_FLAG_DETAIL);
 
                 rrddim_add(st, "free",    NULL, 1, 1048576, RRD_ALGORITHM_ABSOLUTE);
                 rrddim_add(st, "used",    NULL, 1, 1048576, RRD_ALGORITHM_ABSOLUTE);
@@ -354,7 +354,7 @@ int do_macos_sysctl(int update_every, usec_t dt) {
                 if (unlikely(!st)) {
                     st = rrdset_create_localhost("ipv4", "tcperrors", NULL, "tcp", NULL, "IPv4 TCP Errors", "packets/s"
                                                  , 2700, update_every, RRDSET_TYPE_LINE);
-                    st->isdetail = 1;
+                    rrdset_flag_set(st, RRDSET_FLAG_DETAIL);
 
                     rrddim_add(st, "InErrs", NULL, 1, 1, RRD_ALGORITHM_INCREMENTAL);
                     rrddim_add(st, "InCsumErrors", NULL, 1, 1, RRD_ALGORITHM_INCREMENTAL);
@@ -375,7 +375,7 @@ int do_macos_sysctl(int update_every, usec_t dt) {
                 if (unlikely(!st)) {
                     st = rrdset_create_localhost("ipv4", "tcphandshake", NULL, "tcp", NULL, "IPv4 TCP Handshake Issues"
                                                  , "events/s", 2900, update_every, RRDSET_TYPE_LINE);
-                    st->isdetail = 1;
+                    rrdset_flag_set(st, RRDSET_FLAG_DETAIL);
 
                     rrddim_add(st, "EstabResets", NULL, 1, 1, RRD_ALGORITHM_INCREMENTAL);
                     rrddim_add(st, "ActiveOpens", NULL, 1, 1, RRD_ALGORITHM_INCREMENTAL);
@@ -461,7 +461,7 @@ int do_macos_sysctl(int update_every, usec_t dt) {
                 if (unlikely(!st)) {
                     st = rrdset_create_localhost("ipv4", "ecnpkts", NULL, "ecn", NULL, "IPv4 ECN Statistics"
                                                  , "packets/s", 8700, update_every, RRDSET_TYPE_LINE);
-                    st->isdetail = 1;
+                    rrdset_flag_set(st, RRDSET_FLAG_DETAIL);
 
                     rrddim_add(st, "InCEPkts", "CEP", 1, 1, RRD_ALGORITHM_INCREMENTAL);
                     rrddim_add(st, "InNoECTPkts", "NoECTP", -1, 1, RRD_ALGORITHM_INCREMENTAL);
@@ -509,7 +509,7 @@ int do_macos_sysctl(int update_every, usec_t dt) {
                 if (unlikely(!st)) {
                     st = rrdset_create_localhost("ipv4", "udperrors", NULL, "udp", NULL, "IPv4 UDP Errors", "events/s"
                                                  , 2701, update_every, RRDSET_TYPE_LINE);
-                    st->isdetail = 1;
+                    rrdset_flag_set(st, RRDSET_FLAG_DETAIL);
 
                     rrddim_add(st, "RcvbufErrors", NULL, 1, 1, RRD_ALGORITHM_INCREMENTAL);
                     rrddim_add(st, "InErrors", NULL, 1, 1, RRD_ALGORITHM_INCREMENTAL);
@@ -649,7 +649,7 @@ int do_macos_sysctl(int update_every, usec_t dt) {
                 if (unlikely(!st)) {
                     st = rrdset_create_localhost("ipv4", "fragsout", NULL, "fragments", NULL, "IPv4 Fragments Sent"
                                                  , "packets/s", 3010, update_every, RRDSET_TYPE_LINE);
-                    st->isdetail = 1;
+                    rrdset_flag_set(st, RRDSET_FLAG_DETAIL);
 
                     rrddim_add(st, "FragOKs", "ok", 1, 1, RRD_ALGORITHM_INCREMENTAL);
                     rrddim_add(st, "FragFails", "failed", -1, 1, RRD_ALGORITHM_INCREMENTAL);
@@ -670,7 +670,7 @@ int do_macos_sysctl(int update_every, usec_t dt) {
                 if (unlikely(!st)) {
                     st = rrdset_create_localhost("ipv4", "fragsin", NULL, "fragments", NULL, "IPv4 Fragments Reassembly"
                                                  , "packets/s", 3011, update_every, RRDSET_TYPE_LINE);
-                    st->isdetail = 1;
+                    rrdset_flag_set(st, RRDSET_FLAG_DETAIL);
 
                     rrddim_add(st, "ReasmOKs", "ok", 1, 1, RRD_ALGORITHM_INCREMENTAL);
                     rrddim_add(st, "ReasmFails", "failed", -1, 1, RRD_ALGORITHM_INCREMENTAL);
@@ -691,7 +691,7 @@ int do_macos_sysctl(int update_every, usec_t dt) {
                 if (unlikely(!st)) {
                     st = rrdset_create_localhost("ipv4", "errors", NULL, "errors", NULL, "IPv4 Errors", "packets/s"
                                                  , 3002, update_every, RRDSET_TYPE_LINE);
-                    st->isdetail = 1;
+                    rrdset_flag_set(st, RRDSET_FLAG_DETAIL);
 
                     rrddim_add(st, "InDiscards", NULL, 1, 1, RRD_ALGORITHM_INCREMENTAL);
                     rrddim_add(st, "OutDiscards", NULL, -1, 1, RRD_ALGORITHM_INCREMENTAL);
@@ -761,7 +761,7 @@ int do_macos_sysctl(int update_every, usec_t dt) {
                 if (unlikely(!st)) {
                     st = rrdset_create_localhost("ipv6", "fragsout", NULL, "fragments", NULL, "IPv6 Fragments Sent"
                                                  , "packets/s", 3010, update_every, RRDSET_TYPE_LINE);
-                    st->isdetail = 1;
+                    rrdset_flag_set(st, RRDSET_FLAG_DETAIL);
 
                     rrddim_add(st, "ok", NULL, 1, 1, RRD_ALGORITHM_INCREMENTAL);
                     rrddim_add(st, "failed", NULL, -1, 1, RRD_ALGORITHM_INCREMENTAL);
@@ -785,7 +785,7 @@ int do_macos_sysctl(int update_every, usec_t dt) {
                 if (unlikely(!st)) {
                     st = rrdset_create_localhost("ipv6", "fragsin", NULL, "fragments", NULL, "IPv6 Fragments Reassembly"
                                                  , "packets/s", 3011, update_every, RRDSET_TYPE_LINE);
-                    st->isdetail = 1;
+                    rrdset_flag_set(st, RRDSET_FLAG_DETAIL);
 
                     rrddim_add(st, "ok", NULL, 1, 1, RRD_ALGORITHM_INCREMENTAL);
                     rrddim_add(st, "failed", NULL, -1, 1, RRD_ALGORITHM_INCREMENTAL);
@@ -818,7 +818,7 @@ int do_macos_sysctl(int update_every, usec_t dt) {
                 if (unlikely(!st)) {
                     st = rrdset_create_localhost("ipv6", "errors", NULL, "errors", NULL, "IPv6 Errors", "packets/s"
                                                  , 3002, update_every, RRDSET_TYPE_LINE);
-                    st->isdetail = 1;
+                    rrdset_flag_set(st, RRDSET_FLAG_DETAIL);
 
                     rrddim_add(st, "InDiscards", NULL, 1, 1, RRD_ALGORITHM_INCREMENTAL);
                     rrddim_add(st, "OutDiscards", NULL, -1, 1, RRD_ALGORITHM_INCREMENTAL);
index 1c91d8fc4f3ecafdaaa51f6e62bf72688c172d90..a4065089757158a5655ed83e46d56507cfa4caa7 100644 (file)
@@ -161,7 +161,7 @@ void *pluginsd_worker_thread(void *arg) {
                     break;
                 }
 
-                if(unlikely(st->debug)) debug(D_PLUGINSD, "PLUGINSD: '%s' is setting dimension %s/%s to %s", cd->fullfilename, st->id, dimension, value?value:"<nothing>");
+                if(unlikely(rrdset_flag_check(st, RRDSET_FLAG_DEBUG))) debug(D_PLUGINSD, "PLUGINSD: '%s' is setting dimension %s/%s to %s", cd->fullfilename, st->id, dimension, value?value:"<nothing>");
 
                 if(value) rrddim_set(st, dimension, strtoll(value, NULL, 0));
             }
@@ -199,7 +199,7 @@ void *pluginsd_worker_thread(void *arg) {
                     break;
                 }
 
-                if(unlikely(st->debug)) debug(D_PLUGINSD, "PLUGINSD: '%s' is requesting an END on chart %s", cd->fullfilename, st->id);
+                if(unlikely(rrdset_flag_check(st, RRDSET_FLAG_DEBUG))) debug(D_PLUGINSD, "PLUGINSD: '%s' is requesting an END on chart %s", cd->fullfilename, st->id);
 
                 rrdset_done(st);
                 st = NULL;
@@ -322,15 +322,16 @@ void *pluginsd_worker_thread(void *arg) {
 
                 if(unlikely(!algorithm || !*algorithm)) algorithm = "absolute";
 
-                if(unlikely(st->debug)) debug(D_PLUGINSD, "PLUGINSD: Creating dimension in chart %s, id='%s', name='%s', algorithm='%s', multiplier=%ld, divisor=%ld, hidden='%s'"
-                    , st->id
-                    , id
-                    , name?name:""
-                    , rrd_algorithm_name(rrd_algorithm_id(algorithm))
-                    , multiplier
-                    , divisor
-                    , options?options:""
-                    );
+                if(unlikely(rrdset_flag_check(st, RRDSET_FLAG_DEBUG)))
+                    debug(D_PLUGINSD, "PLUGINSD: Creating dimension in chart %s, id='%s', name='%s', algorithm='%s', multiplier=%ld, divisor=%ld, hidden='%s'"
+                        , st->id
+                        , id
+                        , name?name:""
+                        , rrd_algorithm_name(rrd_algorithm_id(algorithm))
+                        , multiplier
+                        , divisor
+                        , options?options:""
+                        );
 
                 RRDDIM *rd = rrddim_find(st, id);
                 if(unlikely(!rd)) {
@@ -342,7 +343,8 @@ void *pluginsd_worker_thread(void *arg) {
                         if(strstr(options, "nooverflow") != NULL) rrddim_flag_set(rd, RRDDIM_FLAG_DONT_DETECT_RESETS_OR_OVERFLOWS);
                     }
                 }
-                else if(unlikely(st->debug)) debug(D_PLUGINSD, "PLUGINSD: dimension %s/%s already exists. Not adding it again.", st->id, id);
+                else if(unlikely(rrdset_flag_check(st, RRDSET_FLAG_DEBUG)))
+                    debug(D_PLUGINSD, "PLUGINSD: dimension %s/%s already exists. Not adding it again.", st->id, id);
             }
             else if(unlikely(hash == DISABLE_HASH && !strcmp(s, "DISABLE"))) {
                 info("PLUGINSD: '%s' called DISABLE. Disabling it.", cd->fullfilename);
index ab26994c752acdeac329d10f304703c86d49f26d..feb0b57abd8625a673728f230fd37d2edca9852d 100644 (file)
@@ -441,7 +441,7 @@ int do_proc_diskstats(int update_every, usec_t dt) {
             if(unlikely(!st)) {
                 st = rrdset_create_localhost("disk_ops", disk, NULL, family, "disk.ops", "Disk Completed I/O Operations"
                                              , "operations/s", 2001, update_every, RRDSET_TYPE_LINE);
-                st->isdetail = 1;
+                rrdset_flag_set(st, RRDSET_FLAG_DETAIL);
 
                 rrddim_add(st, "reads", NULL, 1, 1, RRD_ALGORITHM_INCREMENTAL);
                 rrddim_add(st, "writes", NULL, -1, 1, RRD_ALGORITHM_INCREMENTAL);
@@ -462,7 +462,7 @@ int do_proc_diskstats(int update_every, usec_t dt) {
             if(unlikely(!st)) {
                 st = rrdset_create_localhost("disk_qops", disk, NULL, family, "disk.qops", "Disk Current I/O Operations"
                                              , "operations", 2002, update_every, RRDSET_TYPE_LINE);
-                st->isdetail = 1;
+                rrdset_flag_set(st, RRDSET_FLAG_DETAIL);
 
                 rrddim_add(st, "operations", NULL, 1, 1, RRD_ALGORITHM_ABSOLUTE);
             }
@@ -481,7 +481,7 @@ int do_proc_diskstats(int update_every, usec_t dt) {
             if(unlikely(!st)) {
                 st = rrdset_create_localhost("disk_backlog", disk, NULL, family, "disk.backlog", "Disk Backlog"
                                              , "backlog (ms)", 2003, update_every, RRDSET_TYPE_AREA);
-                st->isdetail = 1;
+                rrdset_flag_set(st, RRDSET_FLAG_DETAIL);
 
                 rrddim_add(st, "backlog", NULL, 1, 10, RRD_ALGORITHM_INCREMENTAL);
             }
@@ -500,7 +500,7 @@ int do_proc_diskstats(int update_every, usec_t dt) {
             if(unlikely(!st)) {
                 st = rrdset_create_localhost("disk_util", disk, NULL, family, "disk.util", "Disk Utilization Time"
                                              , "% of time working", 2004, update_every, RRDSET_TYPE_AREA);
-                st->isdetail = 1;
+                rrdset_flag_set(st, RRDSET_FLAG_DETAIL);
 
                 rrddim_add(st, "utilization", NULL, 1, 10, RRD_ALGORITHM_INCREMENTAL);
             }
@@ -519,7 +519,7 @@ int do_proc_diskstats(int update_every, usec_t dt) {
             if(unlikely(!st)) {
                 st = rrdset_create_localhost("disk_mops", disk, NULL, family, "disk.mops", "Disk Merged Operations"
                                              , "merged operations/s", 2021, update_every, RRDSET_TYPE_LINE);
-                st->isdetail = 1;
+                rrdset_flag_set(st, RRDSET_FLAG_DETAIL);
 
                 rrddim_add(st, "reads", NULL, 1, 1, RRD_ALGORITHM_INCREMENTAL);
                 rrddim_add(st, "writes", NULL, -1, 1, RRD_ALGORITHM_INCREMENTAL);
@@ -540,7 +540,7 @@ int do_proc_diskstats(int update_every, usec_t dt) {
             if(unlikely(!st)) {
                 st = rrdset_create_localhost("disk_iotime", disk, NULL, family, "disk.iotime", "Disk Total I/O Time"
                                              , "milliseconds/s", 2022, update_every, RRDSET_TYPE_LINE);
-                st->isdetail = 1;
+                rrdset_flag_set(st, RRDSET_FLAG_DETAIL);
 
                 rrddim_add(st, "reads", NULL, 1, 1, RRD_ALGORITHM_INCREMENTAL);
                 rrddim_add(st, "writes", NULL, -1, 1, RRD_ALGORITHM_INCREMENTAL);
@@ -564,7 +564,7 @@ int do_proc_diskstats(int update_every, usec_t dt) {
                     st = rrdset_create_localhost("disk_await", disk, NULL, family, "disk.await"
                                                  , "Average Completed I/O Operation Time", "ms per operation", 2005
                                                  , update_every, RRDSET_TYPE_LINE);
-                    st->isdetail = 1;
+                    rrdset_flag_set(st, RRDSET_FLAG_DETAIL);
 
                     rrddim_add(st, "reads", NULL, 1, 1, RRD_ALGORITHM_ABSOLUTE);
                     rrddim_add(st, "writes", NULL, -1, 1, RRD_ALGORITHM_ABSOLUTE);
@@ -583,7 +583,7 @@ int do_proc_diskstats(int update_every, usec_t dt) {
                     st = rrdset_create_localhost("disk_avgsz", disk, NULL, family, "disk.avgsz"
                                                  , "Average Completed I/O Operation Bandwidth"
                                                  , "kilobytes per operation", 2006, update_every, RRDSET_TYPE_AREA);
-                    st->isdetail = 1;
+                    rrdset_flag_set(st, RRDSET_FLAG_DETAIL);
 
                     rrddim_add(st, "reads", NULL, d->sector_size, 1024, RRD_ALGORITHM_ABSOLUTE);
                     rrddim_add(st, "writes", NULL, d->sector_size * -1, 1024, RRD_ALGORITHM_ABSOLUTE);
@@ -601,7 +601,7 @@ int do_proc_diskstats(int update_every, usec_t dt) {
                 if(unlikely(!st)) {
                     st = rrdset_create_localhost("disk_svctm", disk, NULL, family, "disk.svctm", "Average Service Time"
                                                  , "ms per operation", 2007, update_every, RRDSET_TYPE_LINE);
-                    st->isdetail = 1;
+                    rrdset_flag_set(st, RRDSET_FLAG_DETAIL);
 
                     rrddim_add(st, "svctm", NULL, 1, 1, RRD_ALGORITHM_ABSOLUTE);
                 }
index 11203e267bc8f8becde0b83fe11b3343e9365bd9..4f8af22dd3a92345d09218d0dd1e5eab4e5391f1 100644 (file)
@@ -170,7 +170,7 @@ int do_proc_meminfo(int update_every, usec_t dt) {
         if(!st) {
             st = rrdset_create_localhost("system", "swap", NULL, "swap", NULL, "System Swap", "MB", 201, update_every
                                          , RRDSET_TYPE_STACKED);
-            st->isdetail = 1;
+            rrdset_flag_set(st, RRDSET_FLAG_DETAIL);
 
             rrddim_add(st, "free",    NULL, 1, 1024, RRD_ALGORITHM_ABSOLUTE);
             rrddim_add(st, "used",    NULL, 1, 1024, RRD_ALGORITHM_ABSOLUTE);
@@ -191,7 +191,7 @@ int do_proc_meminfo(int update_every, usec_t dt) {
         if(!st) {
             st = rrdset_create_localhost("mem", "hwcorrupt", NULL, "ecc", NULL, "Hardware Corrupted ECC", "MB", 9000
                                          , update_every, RRDSET_TYPE_LINE);
-            st->isdetail = 1;
+            rrdset_flag_set(st, RRDSET_FLAG_DETAIL);
 
             rrddim_add(st, "HardwareCorrupted", NULL, 1, 1024, RRD_ALGORITHM_ABSOLUTE);
         }
@@ -208,7 +208,7 @@ int do_proc_meminfo(int update_every, usec_t dt) {
         if(!st) {
             st = rrdset_create_localhost("mem", "committed", NULL, "system", NULL, "Committed (Allocated) Memory", "MB"
                                          , 5000, update_every, RRDSET_TYPE_AREA);
-            st->isdetail = 1;
+            rrdset_flag_set(st, RRDSET_FLAG_DETAIL);
 
             rrddim_add(st, "Committed_AS", NULL, 1, 1024, RRD_ALGORITHM_ABSOLUTE);
         }
@@ -225,7 +225,7 @@ int do_proc_meminfo(int update_every, usec_t dt) {
         if(!st) {
             st = rrdset_create_localhost("mem", "writeback", NULL, "kernel", NULL, "Writeback Memory", "MB", 4000
                                          , update_every, RRDSET_TYPE_LINE);
-            st->isdetail = 1;
+            rrdset_flag_set(st, RRDSET_FLAG_DETAIL);
 
             rrddim_add(st, "Dirty", NULL, 1, 1024, RRD_ALGORITHM_ABSOLUTE);
             rrddim_add(st, "Writeback", NULL, 1, 1024, RRD_ALGORITHM_ABSOLUTE);
@@ -250,7 +250,7 @@ int do_proc_meminfo(int update_every, usec_t dt) {
         if(!st) {
             st = rrdset_create_localhost("mem", "kernel", NULL, "kernel", NULL, "Memory Used by Kernel", "MB", 6000
                                          , update_every, RRDSET_TYPE_STACKED);
-            st->isdetail = 1;
+            rrdset_flag_set(st, RRDSET_FLAG_DETAIL);
 
             rrddim_add(st, "Slab", NULL, 1, 1024, RRD_ALGORITHM_ABSOLUTE);
             rrddim_add(st, "KernelStack", NULL, 1, 1024, RRD_ALGORITHM_ABSOLUTE);
@@ -273,7 +273,7 @@ int do_proc_meminfo(int update_every, usec_t dt) {
         if(!st) {
             st = rrdset_create_localhost("mem", "slab", NULL, "slab", NULL, "Reclaimable Kernel Memory", "MB", 6500
                                          , update_every, RRDSET_TYPE_STACKED);
-            st->isdetail = 1;
+            rrdset_flag_set(st, RRDSET_FLAG_DETAIL);
 
             rrddim_add(st, "reclaimable", NULL, 1, 1024, RRD_ALGORITHM_ABSOLUTE);
             rrddim_add(st, "unreclaimable", NULL, 1, 1024, RRD_ALGORITHM_ABSOLUTE);
index 679edad67d1edfdf842693a8a79aa5da408c9e2d..43906d17bf0eaceedfd905c34d3f128419dcd7e7 100644 (file)
@@ -252,8 +252,7 @@ int do_proc_net_dev(int update_every, usec_t dt) {
                     d->st_packets = rrdset_create_localhost("net_packets", d->name, NULL, d->name, "net.packets"
                                                             , "Packets", "packets/s", 7001, update_every
                                                             , RRDSET_TYPE_LINE);
-
-                d->st_packets->isdetail = 1;
+                rrdset_flag_set(d->st_packets, RRDSET_FLAG_DETAIL);
 
                 d->rd_rpackets = rrddim_add(d->st_packets, "received", NULL, 1, 1, RRD_ALGORITHM_INCREMENTAL);
                 d->rd_tpackets = rrddim_add(d->st_packets, "sent", NULL, -1, 1, RRD_ALGORITHM_INCREMENTAL);
@@ -281,7 +280,7 @@ int do_proc_net_dev(int update_every, usec_t dt) {
                                                            , "Interface Errors", "errors/s", 7002, update_every
                                                            , RRDSET_TYPE_LINE);
 
-                d->st_errors->isdetail = 1;
+                rrdset_flag_set(d->st_errors, RRDSET_FLAG_DETAIL);
 
                 d->rd_rerrors = rrddim_add(d->st_errors, "inbound", NULL, 1, 1, RRD_ALGORITHM_INCREMENTAL);
                 d->rd_terrors = rrddim_add(d->st_errors, "outbound", NULL, -1, 1, RRD_ALGORITHM_INCREMENTAL);
@@ -307,7 +306,7 @@ int do_proc_net_dev(int update_every, usec_t dt) {
                                                           , "Interface Drops", "drops/s", 7003, update_every
                                                           , RRDSET_TYPE_LINE);
 
-                d->st_drops->isdetail = 1;
+                rrdset_flag_set(d->st_drops, RRDSET_FLAG_DETAIL);
 
                 d->rd_rdrops = rrddim_add(d->st_drops, "inbound", NULL, 1, 1, RRD_ALGORITHM_INCREMENTAL);
                 d->rd_tdrops = rrddim_add(d->st_drops, "outbound", NULL, -1, 1, RRD_ALGORITHM_INCREMENTAL);
@@ -333,7 +332,7 @@ int do_proc_net_dev(int update_every, usec_t dt) {
                                                          , "Interface FIFO Buffer Errors", "errors", 7004, update_every
                                                          , RRDSET_TYPE_LINE);
 
-                d->st_fifo->isdetail = 1;
+                rrdset_flag_set(d->st_fifo, RRDSET_FLAG_DETAIL);
 
                 d->rd_rfifo = rrddim_add(d->st_fifo, "receive", NULL, 1, 1, RRD_ALGORITHM_INCREMENTAL);
                 d->rd_tfifo = rrddim_add(d->st_fifo, "transmit", NULL, -1, 1, RRD_ALGORITHM_INCREMENTAL);
@@ -358,7 +357,7 @@ int do_proc_net_dev(int update_every, usec_t dt) {
                                                                , "net.compressed", "Compressed Packets", "packets/s"
                                                                , 7005, update_every, RRDSET_TYPE_LINE);
 
-                d->st_compressed->isdetail = 1;
+                rrdset_flag_set(d->st_compressed, RRDSET_FLAG_DETAIL);
 
                 d->rd_rcompressed = rrddim_add(d->st_compressed, "received", NULL, 1, 1, RRD_ALGORITHM_INCREMENTAL);
                 d->rd_tcompressed = rrddim_add(d->st_compressed, "sent", NULL, -1, 1, RRD_ALGORITHM_INCREMENTAL);
@@ -383,7 +382,7 @@ int do_proc_net_dev(int update_every, usec_t dt) {
                                                            , "Network Interface Events", "events/s", 7006, update_every
                                                            , RRDSET_TYPE_LINE);
 
-                d->st_events->isdetail = 1;
+                rrdset_flag_set(d->st_events, RRDSET_FLAG_DETAIL);
 
                 d->rd_rframe      = rrddim_add(d->st_events, "frames", NULL, 1, 1, RRD_ALGORITHM_INCREMENTAL);
                 d->rd_tcollisions = rrddim_add(d->st_events, "collisions", NULL, -1, 1, RRD_ALGORITHM_INCREMENTAL);
index 29bc8b322f9634918b054a5f0268ea5222268e51..b0772c0366359fbaae766f52c1c645e49dde4f76 100644 (file)
@@ -253,7 +253,7 @@ int do_proc_net_netstat(int update_every, usec_t dt) {
                 if(unlikely(!st)) {
                     st = rrdset_create_localhost("ipv4", "inerrors", NULL, "errors", NULL, "IPv4 Input Errors"
                                                  , "packets/s", 4000, update_every, RRDSET_TYPE_LINE);
-                    st->isdetail = 1;
+                    rrdset_flag_set(st, RRDSET_FLAG_DETAIL);
 
                     rrddim_add(st, "InNoRoutes", "noroutes", 1, 1, RRD_ALGORITHM_INCREMENTAL);
                     rrddim_add(st, "InTruncatedPkts", "truncated", 1, 1, RRD_ALGORITHM_INCREMENTAL);
@@ -275,7 +275,7 @@ int do_proc_net_netstat(int update_every, usec_t dt) {
                 if(unlikely(!st)) {
                     st = rrdset_create_localhost("ipv4", "mcast", NULL, "multicast", NULL, "IPv4 Multicast Bandwidth"
                                                  , "kilobits/s", 9000, update_every, RRDSET_TYPE_AREA);
-                    st->isdetail = 1;
+                    rrdset_flag_set(st, RRDSET_FLAG_DETAIL);
 
                     rrddim_add(st, "InMcastOctets", "received", 8, 1024, RRD_ALGORITHM_INCREMENTAL);
                     rrddim_add(st, "OutMcastOctets", "sent", -8, 1024, RRD_ALGORITHM_INCREMENTAL);
@@ -295,7 +295,7 @@ int do_proc_net_netstat(int update_every, usec_t dt) {
                 if(unlikely(!st)) {
                     st = rrdset_create_localhost("ipv4", "bcast", NULL, "broadcast", NULL, "IPv4 Broadcast Bandwidth"
                                                  , "kilobits/s", 8000, update_every, RRDSET_TYPE_AREA);
-                    st->isdetail = 1;
+                    rrdset_flag_set(st, RRDSET_FLAG_DETAIL);
 
                     rrddim_add(st, "InBcastOctets", "received", 8, 1024, RRD_ALGORITHM_INCREMENTAL);
                     rrddim_add(st, "OutBcastOctets", "sent", -8, 1024, RRD_ALGORITHM_INCREMENTAL);
@@ -315,7 +315,7 @@ int do_proc_net_netstat(int update_every, usec_t dt) {
                 if(unlikely(!st)) {
                     st = rrdset_create_localhost("ipv4", "mcastpkts", NULL, "multicast", NULL, "IPv4 Multicast Packets"
                                                  , "packets/s", 8600, update_every, RRDSET_TYPE_LINE);
-                    st->isdetail = 1;
+                    rrdset_flag_set(st, RRDSET_FLAG_DETAIL);
 
                     rrddim_add(st, "InMcastPkts", "received", 1, 1, RRD_ALGORITHM_INCREMENTAL);
                     rrddim_add(st, "OutMcastPkts", "sent", -1, 1, RRD_ALGORITHM_INCREMENTAL);
@@ -335,7 +335,7 @@ int do_proc_net_netstat(int update_every, usec_t dt) {
                 if(unlikely(!st)) {
                     st = rrdset_create_localhost("ipv4", "bcastpkts", NULL, "broadcast", NULL, "IPv4 Broadcast Packets"
                                                  , "packets/s", 8500, update_every, RRDSET_TYPE_LINE);
-                    st->isdetail = 1;
+                    rrdset_flag_set(st, RRDSET_FLAG_DETAIL);
 
                     rrddim_add(st, "InBcastPkts", "received", 1, 1, RRD_ALGORITHM_INCREMENTAL);
                     rrddim_add(st, "OutBcastPkts", "sent", -1, 1, RRD_ALGORITHM_INCREMENTAL);
@@ -355,7 +355,7 @@ int do_proc_net_netstat(int update_every, usec_t dt) {
                 if(unlikely(!st)) {
                     st = rrdset_create_localhost("ipv4", "ecnpkts", NULL, "ecn", NULL, "IPv4 ECN Statistics"
                                                  , "packets/s", 8700, update_every, RRDSET_TYPE_LINE);
-                    st->isdetail = 1;
+                    rrdset_flag_set(st, RRDSET_FLAG_DETAIL);
 
                     rrddim_add(st, "InCEPkts", "CEP", 1, 1, RRD_ALGORITHM_INCREMENTAL);
                     rrddim_add(st, "InNoECTPkts", "NoECTP", -1, 1, RRD_ALGORITHM_INCREMENTAL);
index 6fe938ac72147fff9dac8b43c24798fc1f83bda8..0df91963560d1b0a91c96801e92c21ffe19953e4 100644 (file)
@@ -273,7 +273,7 @@ int do_proc_net_rpc_nfs(int update_every, usec_t dt) {
         if(!st) {
             st = rrdset_create_localhost("nfs", "net", NULL, "network", NULL, "NFS Client Network", "operations/s", 5007
                                          , update_every, RRDSET_TYPE_STACKED);
-            st->isdetail = 1;
+            rrdset_flag_set(st, RRDSET_FLAG_DETAIL);
 
             rrddim_add(st, "udp", NULL, 1, 1, RRD_ALGORITHM_INCREMENTAL);
             rrddim_add(st, "tcp", NULL, 1, 1, RRD_ALGORITHM_INCREMENTAL);
@@ -296,7 +296,7 @@ int do_proc_net_rpc_nfs(int update_every, usec_t dt) {
         if(!st) {
             st = rrdset_create_localhost("nfs", "rpc", NULL, "rpc", NULL, "NFS Client Remote Procedure Calls Statistics"
                                          , "calls/s", 5008, update_every, RRDSET_TYPE_LINE);
-            st->isdetail = 1;
+            rrdset_flag_set(st, RRDSET_FLAG_DETAIL);
 
             rrddim_add(st, "calls", NULL, 1, 1, RRD_ALGORITHM_INCREMENTAL);
             rrddim_add(st, "retransmits", NULL, -1, 1, RRD_ALGORITHM_INCREMENTAL);
index 0cdf61ff0013c22c70a20d21758b144b706af88e..b0ed58d13615ed548b1d225af1dc6436e035e18f 100644 (file)
@@ -516,7 +516,7 @@ int do_proc_net_rpc_nfsd(int update_every, usec_t dt) {
         if(!st) {
             st = rrdset_create_localhost("nfsd", "filehandles", NULL, "filehandles", NULL, "NFS Server File Handles"
                                          , "handles/s", 5001, update_every, RRDSET_TYPE_LINE);
-            st->isdetail = 1;
+            rrdset_flag_set(st, RRDSET_FLAG_DETAIL);
 
             rrddim_add(st, "stale", NULL, 1, 1, RRD_ALGORITHM_ABSOLUTE);
             rrddim_add(st, "total_lookups", NULL, 1, 1, RRD_ALGORITHM_INCREMENTAL);
@@ -658,7 +658,7 @@ int do_proc_net_rpc_nfsd(int update_every, usec_t dt) {
         if(!st) {
             st = rrdset_create_localhost("nfsd", "net", NULL, "network", NULL, "NFS Server Network Statistics"
                                          , "packets/s", 5007, update_every, RRDSET_TYPE_STACKED);
-            st->isdetail = 1;
+            rrdset_flag_set(st, RRDSET_FLAG_DETAIL);
 
             rrddim_add(st, "udp", NULL, 1, 1, RRD_ALGORITHM_INCREMENTAL);
             rrddim_add(st, "tcp", NULL, 1, 1, RRD_ALGORITHM_INCREMENTAL);
@@ -682,7 +682,7 @@ int do_proc_net_rpc_nfsd(int update_every, usec_t dt) {
             st = rrdset_create_localhost("nfsd", "rpc", NULL, "rpc", NULL
                                          , "NFS Server Remote Procedure Calls Statistics", "calls/s", 5008, update_every
                                          , RRDSET_TYPE_LINE);
-            st->isdetail = 1;
+            rrdset_flag_set(st, RRDSET_FLAG_DETAIL);
 
             rrddim_add(st, "calls", NULL, 1, 1, RRD_ALGORITHM_INCREMENTAL);
             rrddim_add(st, "bad_format", NULL, -1, 1, RRD_ALGORITHM_INCREMENTAL);
index a4bf1c9bd13f6331db81ff4c8c9b98df8f01c200..ba7b4001314983a25c2ba53ecdb9ff918fcedb38 100644 (file)
@@ -419,7 +419,7 @@ int do_proc_net_snmp(int update_every, usec_t dt) {
                     st = rrdset_create_localhost(RRD_TYPE_NET_SNMP, "fragsout", NULL, "fragments", NULL
                                                  , "IPv4 Fragments Sent", "packets/s", 3010, update_every
                                                  , RRDSET_TYPE_LINE);
-                    st->isdetail = 1;
+                    rrdset_flag_set(st, RRDSET_FLAG_DETAIL);
 
                     rrddim_add(st, "FragOKs",     "ok",      1, 1, RRD_ALGORITHM_INCREMENTAL);
                     rrddim_add(st, "FragFails",   "failed", -1, 1, RRD_ALGORITHM_INCREMENTAL);
@@ -441,7 +441,7 @@ int do_proc_net_snmp(int update_every, usec_t dt) {
                     st = rrdset_create_localhost(RRD_TYPE_NET_SNMP, "fragsin", NULL, "fragments", NULL
                                                  , "IPv4 Fragments Reassembly", "packets/s", 3011, update_every
                                                  , RRDSET_TYPE_LINE);
-                    st->isdetail = 1;
+                    rrdset_flag_set(st, RRDSET_FLAG_DETAIL);
 
                     rrddim_add(st, "ReasmOKs",   "ok",      1, 1, RRD_ALGORITHM_INCREMENTAL);
                     rrddim_add(st, "ReasmFails", "failed", -1, 1, RRD_ALGORITHM_INCREMENTAL);
@@ -462,7 +462,7 @@ int do_proc_net_snmp(int update_every, usec_t dt) {
                 if(!st) {
                     st = rrdset_create_localhost(RRD_TYPE_NET_SNMP, "errors", NULL, "errors", NULL, "IPv4 Errors"
                                                  , "packets/s", 3002, update_every, RRDSET_TYPE_LINE);
-                    st->isdetail = 1;
+                    rrdset_flag_set(st, RRDSET_FLAG_DETAIL);
 
                     rrddim_add(st, "InDiscards",      NULL,  1, 1, RRD_ALGORITHM_INCREMENTAL);
                     rrddim_add(st, "OutDiscards",     NULL, -1, 1, RRD_ALGORITHM_INCREMENTAL);
@@ -626,7 +626,7 @@ int do_proc_net_snmp(int update_every, usec_t dt) {
                 if(!st) {
                     st = rrdset_create_localhost(RRD_TYPE_NET_SNMP, "tcperrors", NULL, "tcp", NULL, "IPv4 TCP Errors"
                                                  , "packets/s", 2700, update_every, RRDSET_TYPE_LINE);
-                    st->isdetail = 1;
+                    rrdset_flag_set(st, RRDSET_FLAG_DETAIL);
 
                     rrddim_add(st, "InErrs",       NULL,  1, 1, RRD_ALGORITHM_INCREMENTAL);
                     rrddim_add(st, "InCsumErrors", NULL,  1, 1, RRD_ALGORITHM_INCREMENTAL);
@@ -648,7 +648,7 @@ int do_proc_net_snmp(int update_every, usec_t dt) {
                     st = rrdset_create_localhost(RRD_TYPE_NET_SNMP, "tcphandshake", NULL, "tcp", NULL
                                                  , "IPv4 TCP Handshake Issues", "events/s", 2900, update_every
                                                  , RRDSET_TYPE_LINE);
-                    st->isdetail = 1;
+                    rrdset_flag_set(st, RRDSET_FLAG_DETAIL);
 
                     rrddim_add(st, "EstabResets",  NULL,  1, 1, RRD_ALGORITHM_INCREMENTAL);
                     rrddim_add(st, "OutRsts",      NULL, -1, 1, RRD_ALGORITHM_INCREMENTAL);
@@ -708,7 +708,7 @@ int do_proc_net_snmp(int update_every, usec_t dt) {
                 if(!st) {
                     st = rrdset_create_localhost(RRD_TYPE_NET_SNMP, "udperrors", NULL, "udp", NULL, "IPv4 UDP Errors"
                                                  , "events/s", 2701, update_every, RRDSET_TYPE_LINE);
-                    st->isdetail = 1;
+                    rrdset_flag_set(st, RRDSET_FLAG_DETAIL);
 
                     rrddim_add(st, "RcvbufErrors", NULL,  1, 1, RRD_ALGORITHM_INCREMENTAL);
                     rrddim_add(st, "SndbufErrors", NULL, -1, 1, RRD_ALGORITHM_INCREMENTAL);
index 06cc4b966a9f02035a5fbcfbed6872a819cbf990..46c21f242dbd9346fbc6bd1cc68201760700f327 100644 (file)
@@ -324,7 +324,7 @@ int do_proc_net_snmp6(int update_every, usec_t dt) {
         if(unlikely(!st)) {
             st = rrdset_create_localhost(RRD_TYPE_NET_SNMP6, "fragsout", NULL, "fragments", NULL, "IPv6 Fragments Sent"
                                          , "packets/s", 3010, update_every, RRDSET_TYPE_LINE);
-            st->isdetail = 1;
+            rrdset_flag_set(st, RRDSET_FLAG_DETAIL);
 
             rrddim_add(st, "ok", NULL, 1, 1, RRD_ALGORITHM_INCREMENTAL);
             rrddim_add(st, "failed", NULL, -1, 1, RRD_ALGORITHM_INCREMENTAL);
@@ -353,7 +353,7 @@ int do_proc_net_snmp6(int update_every, usec_t dt) {
             st = rrdset_create_localhost(RRD_TYPE_NET_SNMP6, "fragsin", NULL, "fragments", NULL
                                          , "IPv6 Fragments Reassembly", "packets/s", 3011, update_every
                                          , RRDSET_TYPE_LINE);
-            st->isdetail = 1;
+            rrdset_flag_set(st, RRDSET_FLAG_DETAIL);
 
             rrddim_add(st, "ok", NULL, 1, 1, RRD_ALGORITHM_INCREMENTAL);
             rrddim_add(st, "failed", NULL, -1, 1, RRD_ALGORITHM_INCREMENTAL);
@@ -387,7 +387,7 @@ int do_proc_net_snmp6(int update_every, usec_t dt) {
         if(unlikely(!st)) {
             st = rrdset_create_localhost(RRD_TYPE_NET_SNMP6, "errors", NULL, "errors", NULL, "IPv6 Errors", "packets/s"
                                          , 3002, update_every, RRDSET_TYPE_LINE);
-            st->isdetail = 1;
+            rrdset_flag_set(st, RRDSET_FLAG_DETAIL);
 
             rrddim_add(st, "InDiscards", NULL, 1, 1, RRD_ALGORITHM_INCREMENTAL);
             rrddim_add(st, "OutDiscards", NULL, -1, 1, RRD_ALGORITHM_INCREMENTAL);
@@ -452,7 +452,7 @@ int do_proc_net_snmp6(int update_every, usec_t dt) {
         if(unlikely(!st)) {
             st = rrdset_create_localhost(RRD_TYPE_NET_SNMP6, "udperrors", NULL, "udp", NULL, "IPv6 UDP Errors"
                                          , "events/s", 3701, update_every, RRDSET_TYPE_LINE);
-            st->isdetail = 1;
+            rrdset_flag_set(st, RRDSET_FLAG_DETAIL);
 
             rrddim_add(st, "RcvbufErrors", NULL, 1, 1, RRD_ALGORITHM_INCREMENTAL);
             rrddim_add(st, "SndbufErrors", NULL, -1, 1, RRD_ALGORITHM_INCREMENTAL);
@@ -507,7 +507,7 @@ int do_proc_net_snmp6(int update_every, usec_t dt) {
         if(unlikely(!st)) {
             st = rrdset_create_localhost(RRD_TYPE_NET_SNMP6, "udpliteerrors", NULL, "udplite", NULL
                                          , "IPv6 UDP Lite Errors", "events/s", 3701, update_every, RRDSET_TYPE_LINE);
-            st->isdetail = 1;
+            rrdset_flag_set(st, RRDSET_FLAG_DETAIL);
 
             rrddim_add(st, "RcvbufErrors", NULL, 1, 1, RRD_ALGORITHM_INCREMENTAL);
             rrddim_add(st, "SndbufErrors", NULL, -1, 1, RRD_ALGORITHM_INCREMENTAL);
@@ -534,7 +534,7 @@ int do_proc_net_snmp6(int update_every, usec_t dt) {
             st = rrdset_create_localhost(RRD_TYPE_NET_SNMP6, "mcast", NULL, "multicast", NULL
                                          , "IPv6 Multicast Bandwidth", "kilobits/s", 9000, update_every
                                          , RRDSET_TYPE_AREA);
-            st->isdetail = 1;
+            rrdset_flag_set(st, RRDSET_FLAG_DETAIL);
 
             rrddim_add(st, "received", NULL, 8, 1024, RRD_ALGORITHM_INCREMENTAL);
             rrddim_add(st, "sent", NULL, -8, 1024, RRD_ALGORITHM_INCREMENTAL);
@@ -555,7 +555,7 @@ int do_proc_net_snmp6(int update_every, usec_t dt) {
             st = rrdset_create_localhost(RRD_TYPE_NET_SNMP6, "bcast", NULL, "broadcast", NULL
                                          , "IPv6 Broadcast Bandwidth", "kilobits/s", 8000, update_every
                                          , RRDSET_TYPE_AREA);
-            st->isdetail = 1;
+            rrdset_flag_set(st, RRDSET_FLAG_DETAIL);
 
             rrddim_add(st, "received", NULL, 8, 1024, RRD_ALGORITHM_INCREMENTAL);
             rrddim_add(st, "sent", NULL, -8, 1024, RRD_ALGORITHM_INCREMENTAL);
@@ -575,7 +575,7 @@ int do_proc_net_snmp6(int update_every, usec_t dt) {
         if(unlikely(!st)) {
             st = rrdset_create_localhost(RRD_TYPE_NET_SNMP6, "mcastpkts", NULL, "multicast", NULL
                                          , "IPv6 Multicast Packets", "packets/s", 9500, update_every, RRDSET_TYPE_LINE);
-            st->isdetail = 1;
+            rrdset_flag_set(st, RRDSET_FLAG_DETAIL);
 
             rrddim_add(st, "received", NULL, 1, 1, RRD_ALGORITHM_INCREMENTAL);
             rrddim_add(st, "sent", NULL, -1, 1, RRD_ALGORITHM_INCREMENTAL);
index 2efb775310c96682f9c6e3673499b24e3c0583c0..e04b80a3eb3bbfabff17f1cec9537767c4709505 100644 (file)
@@ -173,7 +173,7 @@ int do_proc_net_stat_conntrack(int update_every, usec_t dt) {
             st = rrdset_create_localhost(RRD_TYPE_NET_STAT_NETFILTER, RRD_TYPE_NET_STAT_CONNTRACK "_changes", NULL
                                          , RRD_TYPE_NET_STAT_CONNTRACK, NULL, "Connection Tracker Changes", "changes/s"
                                          , 3002, update_every, RRDSET_TYPE_LINE);
-            st->isdetail = 1;
+            rrdset_flag_set(st, RRDSET_FLAG_DETAIL);
 
             rrddim_add(st, "inserted", NULL, 1, 1, RRD_ALGORITHM_INCREMENTAL);
             rrddim_add(st, "deleted", NULL, -1, 1, RRD_ALGORITHM_INCREMENTAL);
@@ -195,7 +195,7 @@ int do_proc_net_stat_conntrack(int update_every, usec_t dt) {
             st = rrdset_create_localhost(RRD_TYPE_NET_STAT_NETFILTER, RRD_TYPE_NET_STAT_CONNTRACK "_expect", NULL
                                          , RRD_TYPE_NET_STAT_CONNTRACK, NULL, "Connection Tracker Expectations"
                                          , "expectations/s", 3003, update_every, RRDSET_TYPE_LINE);
-            st->isdetail = 1;
+            rrdset_flag_set(st, RRDSET_FLAG_DETAIL);
 
             rrddim_add(st, "created", NULL, 1, 1, RRD_ALGORITHM_INCREMENTAL);
             rrddim_add(st, "deleted", NULL, -1, 1, RRD_ALGORITHM_INCREMENTAL);
@@ -217,7 +217,7 @@ int do_proc_net_stat_conntrack(int update_every, usec_t dt) {
             st = rrdset_create_localhost(RRD_TYPE_NET_STAT_NETFILTER, RRD_TYPE_NET_STAT_CONNTRACK "_search", NULL
                                          , RRD_TYPE_NET_STAT_CONNTRACK, NULL, "Connection Tracker Searches"
                                          , "searches/s", 3010, update_every, RRDSET_TYPE_LINE);
-            st->isdetail = 1;
+            rrdset_flag_set(st, RRDSET_FLAG_DETAIL);
 
             rrddim_add(st, "searched", NULL, 1, 1, RRD_ALGORITHM_INCREMENTAL);
             rrddim_add(st, "restarted", NULL, -1, 1, RRD_ALGORITHM_INCREMENTAL);
@@ -239,7 +239,7 @@ int do_proc_net_stat_conntrack(int update_every, usec_t dt) {
             st = rrdset_create_localhost(RRD_TYPE_NET_STAT_NETFILTER, RRD_TYPE_NET_STAT_CONNTRACK "_errors", NULL
                                          , RRD_TYPE_NET_STAT_CONNTRACK, NULL, "Connection Tracker Errors", "events/s"
                                          , 3005, update_every, RRDSET_TYPE_LINE);
-            st->isdetail = 1;
+            rrdset_flag_set(st, RRDSET_FLAG_DETAIL);
 
             rrddim_add(st, "icmp_error", NULL, 1, 1, RRD_ALGORITHM_INCREMENTAL);
             rrddim_add(st, "insert_failed", NULL, -1, 1, RRD_ALGORITHM_INCREMENTAL);
index 5615fc1b4a5b29ac33642857d924ef6f4b733407..04f0896cd20266f1ae120350334744e4afb3122d 100644 (file)
@@ -137,7 +137,7 @@ int do_proc_stat(int update_every, usec_t dt) {
                 if(unlikely(!st)) {
                     st = rrdset_create_localhost("system", "intr", NULL, "interrupts", NULL, "CPU Interrupts"
                                                  , "interrupts/s", 900, update_every, RRDSET_TYPE_LINE);
-                    st->isdetail = 1;
+                    rrdset_flag_set(st, RRDSET_FLAG_DETAIL);
 
                     rrddim_add(st, "interrupts", NULL, 1, 1, RRD_ALGORITHM_INCREMENTAL);
                 }
@@ -184,7 +184,7 @@ int do_proc_stat(int update_every, usec_t dt) {
         if(unlikely(!st)) {
             st = rrdset_create_localhost("system", "forks", NULL, "processes", NULL, "Started Processes", "processes/s"
                                          , 700, update_every, RRDSET_TYPE_LINE);
-            st->isdetail = 1;
+            rrdset_flag_set(st, RRDSET_FLAG_DETAIL);
 
             rrddim_add(st, "started", NULL, 1, 1, RRD_ALGORITHM_INCREMENTAL);
         }
index 5872732076589b661eaa12b5c417757101c51b80..8a04cd34836e7a25cdba050a77d6c820efbe1ac1 100644 (file)
@@ -130,7 +130,7 @@ int do_proc_vmstat(int update_every, usec_t dt) {
         if(unlikely(!st_pgfaults)) {
             st_pgfaults = rrdset_create_localhost("mem", "pgfaults", NULL, "system", NULL, "Memory Page Faults"
                                                   , "page faults/s", 500, update_every, RRDSET_TYPE_LINE);
-            st_pgfaults->isdetail = 1;
+            rrdset_flag_set(st_pgfaults, RRDSET_FLAG_DETAIL);
 
             rrddim_add(st_pgfaults, "minor",  NULL,  1, 1, RRD_ALGORITHM_INCREMENTAL);
             rrddim_add(st_pgfaults, "major", NULL, -1, 1, RRD_ALGORITHM_INCREMENTAL);
@@ -159,7 +159,7 @@ int do_proc_vmstat(int update_every, usec_t dt) {
         if(unlikely(!st_numa)) {
             st_numa = rrdset_create_localhost("mem", "numa", NULL, "numa", NULL, "NUMA events", "events/s", 800
                                               , update_every, RRDSET_TYPE_LINE);
-            st_numa->isdetail = 1;
+            rrdset_flag_set(st_numa, RRDSET_FLAG_DETAIL);
 
             // These depend on CONFIG_NUMA in the kernel.
             rrddim_add(st_numa, "local", NULL, 1, 1, RRD_ALGORITHM_INCREMENTAL);
index 4965b660f0db48047e64e3f4d19b8f7705e6d17d..0b91bf2fc0fedae6b9aebcee88376ce20825268c 100644 (file)
--- a/src/rrd.h
+++ b/src/rrd.h
@@ -188,6 +188,17 @@ typedef struct rrddim RRDDIM;
 // ----------------------------------------------------------------------------
 // RRDSET - this is a chart
 
+typedef enum rrdset_flags {
+    RRDSET_FLAG_ENABLED = 1 << 0, // enables or disables a chart
+    RRDSET_FLAG_DETAIL  = 1 << 1, // if set, the data set should be considered as a detail of another
+                                  // (the master data set should be the one that has the same family and is not detail)
+    RRDSET_FLAG_DEBUG   = 1 << 2  // enables or disables debugging for a chart
+} RRDSET_FLAGS;
+
+#define rrdset_flag_check(st, flag) ((st)->flags & flag)
+#define rrdset_flag_set(st, flag)   (st)->flags |= flag
+#define rrdset_flag_clear(st, flag) (st)->flags &= ~flag
+
 struct rrdset {
     // ------------------------------------------------------------------------
     // binary indexing structures
@@ -222,23 +233,19 @@ struct rrdset {
     long current_entry;                             // the entry that is currently being updated
                                                     // it goes around in a round-robin fashion
 
-    int enabled;
+    uint32_t flags;
 
     int gap_when_lost_iterations_above;             // after how many lost iterations a gap should be stored
                                                     // netdata will interpolate values for gaps lower than this
 
     long priority;
 
-    int isdetail;                                   // if set, the data set should be considered as a detail of another
-                                                    // (the master data set should be the one that has the same family and is not detail)
 
     // ------------------------------------------------------------------------
     // members for temporary data we need for calculations
 
     RRD_MEMORY_MODE rrd_memory_mode;                // if set to 1, this is memory mapped
 
-    int debug;
-
     char *cache_dir;                                // the directory to store dimensions
     char cache_filename[FILENAME_MAX+1];            // the filename to store this set
 
index 1bf0bce285938efbbdf3432518fc3c737df647e9..26163aa0a12f8c7d7807b2fc956d86f4168f2f50 100644 (file)
@@ -29,7 +29,7 @@ void rrd_stats_api_v1_chart_with_data(RRDSET *st, BUFFER *wb, size_t *dimensions
         , st->context
         , st->title
         , st->priority
-        , st->enabled?"true":"false"
+        , rrdset_flag_check(st, RRDSET_FLAG_ENABLED)?"true":"false"
         , st->units
         , st->name
         , rrdset_type_name(st->chart_type)
@@ -99,7 +99,7 @@ void rrd_stats_api_v1_charts(RRDHOST *host, BUFFER *wb)
 
     pthread_rwlock_rdlock(&host->rrdset_root_rwlock);
     for(st = host->rrdset_root, c = 0; st ; st = st->next) {
-        if(st->enabled && st->dimensions) {
+        if(rrdset_flag_check(st, RRDSET_FLAG_ENABLED) && st->dimensions) {
             if(c) buffer_strcat(wb, ",");
             buffer_strcat(wb, "\n\t\t\"");
             buffer_strcat(wb, st->id);
@@ -162,7 +162,7 @@ void rrd_stats_api_v1_charts_allmetrics_prometheus(RRDHOST *host, BUFFER *wb) {
         prometheus_name_copy(chart, st->id, PROMETHEUS_ELEMENT_MAX);
 
         buffer_strcat(wb, "\n");
-        if(st->enabled && st->dimensions) {
+        if(rrdset_flag_check(st, RRDSET_FLAG_ENABLED) && st->dimensions) {
             pthread_rwlock_rdlock(&st->rwlock);
 
             // for each dimension
@@ -234,7 +234,7 @@ void rrd_stats_api_v1_charts_allmetrics_shell(RRDHOST *host, BUFFER *wb) {
         shell_name_copy(chart, st->id, SHELL_ELEMENT_MAX);
 
         buffer_sprintf(wb, "\n# chart: %s (name: %s)\n", st->id, st->name);
-        if(st->enabled && st->dimensions) {
+        if(rrdset_flag_check(st, RRDSET_FLAG_ENABLED) && st->dimensions) {
             pthread_rwlock_rdlock(&st->rwlock);
 
             // for each dimension
@@ -330,7 +330,7 @@ unsigned long rrd_stats_one_json(RRDSET *st, char *options, BUFFER *wb)
         , st->context
         , st->title
         , st->priority
-        , st->enabled
+        , rrdset_flag_check(st, RRDSET_FLAG_ENABLED)?1:0
         , st->units
         , st->name, options?options:""
         , rrdset_type_name(st->chart_type)
@@ -341,7 +341,7 @@ unsigned long rrd_stats_one_json(RRDSET *st, char *options, BUFFER *wb)
         , rrdset_last_entry_t(st)
         , (now < rrdset_last_entry_t(st)) ? (time_t)0 : now - rrdset_last_entry_t(st)
         , st->update_every
-        , st->isdetail
+        , rrdset_flag_check(st, RRDSET_FLAG_DETAIL)?1:0
         , st->usec_since_last_update
         , st->collected_total
         , st->last_collected_total
@@ -418,7 +418,7 @@ void rrd_stats_all_json(RRDHOST *host, BUFFER *wb)
 
     pthread_rwlock_rdlock(&host->rrdset_root_rwlock);
     for(st = host->rrdset_root, c = 0; st ; st = st->next) {
-        if(st->enabled && st->dimensions) {
+        if(rrdset_flag_check(st, RRDSET_FLAG_ENABLED) && st->dimensions) {
             if(c) buffer_strcat(wb, ",\n");
             memory += rrd_stats_one_json(st, NULL, wb);
             c++;
@@ -1421,7 +1421,7 @@ static RRDR *rrdr_create(RRDSET *st, long n)
 
 RRDR *rrd2rrdr(RRDSET *st, long points, long long after, long long before, int group_method, int aligned)
 {
-    int debug = st->debug;
+    int debug = rrdset_flag_check(st, RRDSET_FLAG_DEBUG)?1:0;
     int absolute_period_requested = -1;
 
     time_t first_entry_t = rrdset_first_entry_t(st);
@@ -2056,7 +2056,7 @@ time_t rrd_stats_json(int type, RRDSET *st, BUFFER *wb, long points, long group,
     // -------------------------------------------------------------------------
     // checks for debugging
 
-    if(st->debug) {
+    if(rrdset_flag_check(st, RRDSET_FLAG_DEBUG)) {
         debug(D_RRD_STATS, "%s first_entry_t = %ld, last_entry_t = %ld, duration = %ld, after = %ld, before = %ld, duration = %ld, entries_to_show = %ld, group = %ld"
             , st->id
             , rrdset_first_entry_t(st)
@@ -2149,7 +2149,8 @@ time_t rrd_stats_json(int type, RRDSET *st, BUFFER *wb, long points, long group,
         long count = 0, printed = 0, group_count = 0;
         last_timestamp = 0;
 
-        if(st->debug) debug(D_RRD_STATS, "%s: REQUEST after:%u before:%u, points:%ld, group:%ld, CHART cur:%ld first: %u last:%u, CALC start_t:%ld, stop_t:%ld"
+        if(unlikely(rrdset_flag_check(st, RRDSET_FLAG_DEBUG)))
+            debug(D_RRD_STATS, "%s: REQUEST after:%u before:%u, points:%ld, group:%ld, CHART cur:%ld first: %u last:%u, CALC start_t:%ld, stop_t:%ld"
                     , st->id
                     , (uint32_t)after
                     , (uint32_t)before
@@ -2169,7 +2170,8 @@ time_t rrd_stats_json(int type, RRDSET *st, BUFFER *wb, long points, long group,
 
             int print_this = 0;
 
-            if(st->debug) debug(D_RRD_STATS, "%s t = %ld, count = %ld, group_count = %ld, printed = %ld, now = %ld, %s %s"
+            if(unlikely(rrdset_flag_check(st, RRDSET_FLAG_DEBUG)))
+                debug(D_RRD_STATS, "%s t = %ld, count = %ld, group_count = %ld, printed = %ld, now = %ld, %s %s"
                     , st->id
                     , t
                     , count + 1
index d28cea3ec75841015e0d301b52b806e5799e2d12..20f7223363136c2782e6b5a1f254ffc13a4d340a 100644 (file)
@@ -237,7 +237,7 @@ void rrdhost_save(RRDHOST *host) {
     RRDSET *st;
     RRDDIM *rd;
 
-    // we get an write lock
+    // we get a write lock
     // to ensure only one thread is saving the database
     rrdhost_rwlock(host);
 
index cfd3b9db2c5888dab59f3b29446660216368fd14..3d6b2f8028718c588fa93e693837a9efa4cceee7 100644 (file)
@@ -329,10 +329,13 @@ RRDSET *rrdset_create(RRDHOST *host, const char *type, const char *id, const cha
     st->hash_context = simple_hash(st->context);
 
     st->priority = config_get_number(st->id, "priority", priority);
-    st->enabled = enabled;
+    if(enabled)
+        rrdset_flag_set(st, RRDSET_FLAG_ENABLED);
+    else
+        rrdset_flag_clear(st, RRDSET_FLAG_ENABLED);
 
-    st->isdetail = 0;
-    st->debug = 0;
+    rrdset_flag_clear(st, RRDSET_FLAG_DETAIL);
+    rrdset_flag_clear(st, RRDSET_FLAG_DEBUG);
 
     // if(!strcmp(st->id, "disk_util.dm-0")) {
     //     st->debug = 1;
@@ -446,7 +449,9 @@ void rrdset_next_usec(RRDSET *st, usec_t microseconds)
     }
     debug(D_RRD_CALLS, "rrdset_next_usec() for chart %s with microseconds %llu", st->name, microseconds);
 
-    if(unlikely(st->debug)) debug(D_RRD_STATS, "%s: NEXT: %llu microseconds", st->name, microseconds);
+    if(unlikely(rrdset_flag_check(st, RRDSET_FLAG_DEBUG)))
+        debug(D_RRD_STATS, "%s: NEXT: %llu microseconds", st->name, microseconds);
+
     st->usec_since_last_update = microseconds;
 }
 
@@ -497,7 +502,9 @@ usec_t rrdset_done(RRDSET *st) {
         st->usec_since_last_update = update_every_ut;
         first_entry = 1;
     }
-    if(unlikely(st->debug)) debug(D_RRD_STATS, "%s: microseconds since last update: %llu", st->name, st->usec_since_last_update);
+
+    if(unlikely(rrdset_flag_check(st, RRDSET_FLAG_DEBUG)))
+        debug(D_RRD_STATS, "%s: microseconds since last update: %llu", st->name, st->usec_since_last_update);
 
     // set last_collected_time
     if(unlikely(!st->last_collected_time.tv_sec)) {
@@ -512,7 +519,8 @@ usec_t rrdset_done(RRDSET *st) {
         store_this_entry = 0;
         first_entry = 1;
 
-        if(unlikely(st->debug)) debug(D_RRD_STATS, "%s: has not set last_collected_time. Setting it now. Will not store the next entry.", st->name);
+        if(unlikely(rrdset_flag_check(st, RRDSET_FLAG_DEBUG)))
+            debug(D_RRD_STATS, "%s: has not set last_collected_time. Setting it now. Will not store the next entry.", st->name);
     }
     else {
         // it is not the first entry
@@ -536,7 +544,8 @@ usec_t rrdset_done(RRDSET *st) {
         store_this_entry = 0;
         first_entry = 1;
 
-        if(unlikely(st->debug)) debug(D_RRD_STATS, "%s: initializing last_updated to now - %llu microseconds (%0.3Lf). Will not store the next entry.", st->name, st->usec_since_last_update, (long double)ut/1000000.0);
+        if(unlikely(rrdset_flag_check(st, RRDSET_FLAG_DEBUG)))
+            debug(D_RRD_STATS, "%s: initializing last_updated to now - %llu microseconds (%0.3Lf). Will not store the next entry.", st->name, st->usec_since_last_update, (long double)ut/1000000.0);
     }
 
     // check if we will re-write the entire data set
@@ -566,7 +575,7 @@ usec_t rrdset_done(RRDSET *st) {
     now_collect_ut = st->last_collected_time.tv_sec * USEC_PER_SEC + st->last_collected_time.tv_usec;
     next_store_ut  = (st->last_updated.tv_sec + st->update_every) * USEC_PER_SEC;
 
-    if(unlikely(st->debug)) {
+    if(unlikely(rrdset_flag_check(st, RRDSET_FLAG_DEBUG))) {
         debug(D_RRD_STATS, "%s: last_collect_ut = %0.3Lf (last collection time)", st->name, (long double)last_collect_ut/1000000.0);
         debug(D_RRD_STATS, "%s: now_collect_ut  = %0.3Lf (current collection time)", st->name, (long double)now_collect_ut/1000000.0);
         debug(D_RRD_STATS, "%s: last_stored_ut  = %0.3Lf (last updated time)", st->name, (long double)last_stored_ut/1000000.0);
@@ -575,7 +584,8 @@ usec_t rrdset_done(RRDSET *st) {
 
     if(unlikely(!st->counter_done)) {
         store_this_entry = 0;
-        if(unlikely(st->debug)) debug(D_RRD_STATS, "%s: Will not store the next entry.", st->name);
+        if(unlikely(rrdset_flag_check(st, RRDSET_FLAG_DEBUG)))
+            debug(D_RRD_STATS, "%s: Will not store the next entry.", st->name);
     }
     st->counter_done++;
 
@@ -598,7 +608,8 @@ usec_t rrdset_done(RRDSET *st) {
             continue;
         }
 
-        if(unlikely(st->debug)) debug(D_RRD_STATS, "%s/%s: START "
+        if(unlikely(rrdset_flag_check(st, RRDSET_FLAG_DEBUG)))
+            debug(D_RRD_STATS, "%s/%s: START "
                     " last_collected_value = " COLLECTED_NUMBER_FORMAT
                     " collected_value = " COLLECTED_NUMBER_FORMAT
                     " last_calculated_value = " CALCULATED_NUMBER_FORMAT
@@ -616,7 +627,7 @@ usec_t rrdset_done(RRDSET *st) {
                                        * (calculated_number)rd->multiplier
                                        / (calculated_number)rd->divisor;
 
-                if(unlikely(st->debug))
+                if(unlikely(rrdset_flag_check(st, RRDSET_FLAG_DEBUG)))
                     debug(D_RRD_STATS, "%s/%s: CALC ABS/ABS-NO-IN "
                             CALCULATED_NUMBER_FORMAT " = "
                             COLLECTED_NUMBER_FORMAT
@@ -641,7 +652,7 @@ usec_t rrdset_done(RRDSET *st) {
                             * (calculated_number)rd->collected_value
                             / (calculated_number)st->collected_total;
 
-                if(unlikely(st->debug))
+                if(unlikely(rrdset_flag_check(st, RRDSET_FLAG_DEBUG)))
                     debug(D_RRD_STATS, "%s/%s: CALC PCENT-ROW "
                             CALCULATED_NUMBER_FORMAT " = 100"
                                     " * " COLLECTED_NUMBER_FORMAT
@@ -678,7 +689,7 @@ usec_t rrdset_done(RRDSET *st) {
                         * (calculated_number)rd->multiplier
                         / (calculated_number)rd->divisor;
 
-                if(unlikely(st->debug))
+                if(unlikely(rrdset_flag_check(st, RRDSET_FLAG_DEBUG)))
                     debug(D_RRD_STATS, "%s/%s: CALC INC PRE "
                             CALCULATED_NUMBER_FORMAT " = ("
                             COLLECTED_NUMBER_FORMAT " - " COLLECTED_NUMBER_FORMAT
@@ -723,7 +734,7 @@ usec_t rrdset_done(RRDSET *st) {
                             * (calculated_number)(rd->collected_value - rd->last_collected_value)
                             / (calculated_number)(st->collected_total - st->last_collected_total);
 
-                if(unlikely(st->debug))
+                if(unlikely(rrdset_flag_check(st, RRDSET_FLAG_DEBUG)))
                     debug(D_RRD_STATS, "%s/%s: CALC PCENT-DIFF "
                             CALCULATED_NUMBER_FORMAT " = 100"
                                     " * (" COLLECTED_NUMBER_FORMAT " - " COLLECTED_NUMBER_FORMAT ")"
@@ -740,7 +751,7 @@ usec_t rrdset_done(RRDSET *st) {
                 // it gets noticed when we add new types
                 rd->calculated_value = 0;
 
-                if(unlikely(st->debug))
+                if(unlikely(rrdset_flag_check(st, RRDSET_FLAG_DEBUG)))
                     debug(D_RRD_STATS, "%s/%s: CALC "
                             CALCULATED_NUMBER_FORMAT " = 0"
                           , st->id, rd->name
@@ -749,7 +760,8 @@ usec_t rrdset_done(RRDSET *st) {
                 break;
         }
 
-        if(unlikely(st->debug)) debug(D_RRD_STATS, "%s/%s: PHASE2 "
+        if(unlikely(rrdset_flag_check(st, RRDSET_FLAG_DEBUG)))
+            debug(D_RRD_STATS, "%s/%s: PHASE2 "
                     " last_collected_value = " COLLECTED_NUMBER_FORMAT
                     " collected_value = " COLLECTED_NUMBER_FORMAT
                     " last_calculated_value = " CALCULATED_NUMBER_FORMAT
@@ -768,7 +780,10 @@ usec_t rrdset_done(RRDSET *st) {
 
     if(unlikely(now_collect_ut < next_store_ut)) {
         // this is collected in the same interpolation point
-        if(unlikely(st->debug)) debug(D_RRD_STATS, "%s: THIS IS IN THE SAME INTERPOLATION POINT", st->name);
+
+        if(unlikely(rrdset_flag_check(st, RRDSET_FLAG_DEBUG)))
+            debug(D_RRD_STATS, "%s: THIS IS IN THE SAME INTERPOLATION POINT", st->name);
+
 #ifdef NETDATA_INTERNAL_CHECKS
         info("%s is collected in the same interpolation point: short by %llu microseconds", st->name, next_store_ut - now_collect_ut);
 #endif
@@ -783,7 +798,7 @@ usec_t rrdset_done(RRDSET *st) {
         if(iterations < 0) { error("%s: iterations calculation wrapped! first_ut = %llu, last_stored_ut = %llu, next_store_ut = %llu, now_collect_ut = %llu", st->name, first_ut, last_stored_ut, next_store_ut, now_collect_ut); }
 #endif
 
-        if(unlikely(st->debug)) {
+        if(unlikely(rrdset_flag_check(st, RRDSET_FLAG_DEBUG))) {
             debug(D_RRD_STATS, "%s: last_stored_ut = %0.3Lf (last updated time)", st->name, (long double)last_stored_ut/1000000.0);
             debug(D_RRD_STATS, "%s: next_store_ut  = %0.3Lf (next interpolation point)", st->name, (long double)next_store_ut/1000000.0);
         }
@@ -802,7 +817,7 @@ usec_t rrdset_done(RRDSET *st) {
                                    / (calculated_number)(now_collect_ut - last_collect_ut)
                             );
 
-                    if(unlikely(st->debug))
+                    if(unlikely(rrdset_flag_check(st, RRDSET_FLAG_DEBUG)))
                         debug(D_RRD_STATS, "%s/%s: CALC2 INC "
                                 CALCULATED_NUMBER_FORMAT " = "
                                 CALCULATED_NUMBER_FORMAT
@@ -821,7 +836,7 @@ usec_t rrdset_done(RRDSET *st) {
                     new_value /= (calculated_number)st->update_every;
 
                     if(unlikely(next_store_ut - last_stored_ut < update_every_ut)) {
-                        if(unlikely(st->debug))
+                        if(unlikely(rrdset_flag_check(st, RRDSET_FLAG_DEBUG)))
                             debug(D_RRD_STATS, "%s/%s: COLLECTION POINT IS SHORT " CALCULATED_NUMBER_FORMAT " - EXTRAPOLATING",
                                     st->id, rd->name
                                   , (calculated_number)(next_store_ut - last_stored_ut)
@@ -853,7 +868,7 @@ usec_t rrdset_done(RRDSET *st) {
                                     +  rd->last_calculated_value
                                 );
 
-                        if(unlikely(st->debug))
+                        if(unlikely(rrdset_flag_check(st, RRDSET_FLAG_DEBUG)))
                             debug(D_RRD_STATS, "%s/%s: CALC2 DEF "
                                     CALCULATED_NUMBER_FORMAT " = ((("
                                             "(" CALCULATED_NUMBER_FORMAT " - " CALCULATED_NUMBER_FORMAT ")"
@@ -878,7 +893,7 @@ usec_t rrdset_done(RRDSET *st) {
                 rd->values[st->current_entry] = pack_storage_number(new_value, storage_flags );
                 rd->last_stored_value = new_value;
 
-                if(unlikely(st->debug))
+                if(unlikely(rrdset_flag_check(st, RRDSET_FLAG_DEBUG)))
                     debug(D_RRD_STATS, "%s/%s: STORE[%ld] "
                             CALCULATED_NUMBER_FORMAT " = " CALCULATED_NUMBER_FORMAT
                           , st->id, rd->name
@@ -887,9 +902,10 @@ usec_t rrdset_done(RRDSET *st) {
                     );
             }
             else {
-                if(unlikely(st->debug)) debug(D_RRD_STATS, "%s/%s: STORE[%ld] = NON EXISTING "
-                                              , st->id, rd->name
-                                              , st->current_entry
+                if(unlikely(rrdset_flag_check(st, RRDSET_FLAG_DEBUG)))
+                    debug(D_RRD_STATS, "%s/%s: STORE[%ld] = NON EXISTING "
+                          , st->id, rd->name
+                          , st->current_entry
                     );
                 rd->values[st->current_entry] = pack_storage_number(0, SN_NOT_EXISTS);
                 rd->last_stored_value = NAN;
@@ -897,7 +913,7 @@ usec_t rrdset_done(RRDSET *st) {
 
             stored_entries++;
 
-            if(unlikely(st->debug)) {
+            if(unlikely(rrdset_flag_check(st, RRDSET_FLAG_DEBUG))) {
                 calculated_number t1 = new_value * (calculated_number)rd->multiplier / (calculated_number)rd->divisor;
                 calculated_number t2 = unpack_storage_number(rd->values[st->current_entry]);
                 calculated_number accuracy = accuracy_loss(t1, t2);
@@ -939,24 +955,29 @@ usec_t rrdset_done(RRDSET *st) {
         if(unlikely(!rrddim_flag_check(rd, RRDDIM_FLAG_UPDATED)))
             continue;
 
-        if(unlikely(st->debug)) debug(D_RRD_STATS, "%s/%s: setting last_collected_value (old: " COLLECTED_NUMBER_FORMAT ") to last_collected_value (new: " COLLECTED_NUMBER_FORMAT ")", st->id, rd->name, rd->last_collected_value, rd->collected_value);
+        if(unlikely(rrdset_flag_check(st, RRDSET_FLAG_DEBUG)))
+            debug(D_RRD_STATS, "%s/%s: setting last_collected_value (old: " COLLECTED_NUMBER_FORMAT ") to last_collected_value (new: " COLLECTED_NUMBER_FORMAT ")", st->id, rd->name, rd->last_collected_value, rd->collected_value);
+
         rd->last_collected_value = rd->collected_value;
 
         switch(rd->algorithm) {
             case RRD_ALGORITHM_INCREMENTAL:
                 if(unlikely(!first_entry)) {
-                    if(unlikely(st->debug)) debug(D_RRD_STATS, "%s/%s: setting last_calculated_value (old: " CALCULATED_NUMBER_FORMAT ") to last_calculated_value (new: " CALCULATED_NUMBER_FORMAT ")", st->id, rd->name, rd->last_calculated_value + rd->calculated_value, rd->calculated_value);
+                    if(unlikely(rrdset_flag_check(st, RRDSET_FLAG_DEBUG)))
+                        debug(D_RRD_STATS, "%s/%s: setting last_calculated_value (old: " CALCULATED_NUMBER_FORMAT ") to last_calculated_value (new: " CALCULATED_NUMBER_FORMAT ")", st->id, rd->name, rd->last_calculated_value + rd->calculated_value, rd->calculated_value);
                     rd->last_calculated_value += rd->calculated_value;
                 }
                 else {
-                    if(unlikely(st->debug)) debug(D_RRD_STATS, "%s: THIS IS THE FIRST POINT", st->name);
+                    if(unlikely(rrdset_flag_check(st, RRDSET_FLAG_DEBUG)))
+                        debug(D_RRD_STATS, "%s: THIS IS THE FIRST POINT", st->name);
                 }
                 break;
 
             case RRD_ALGORITHM_ABSOLUTE:
             case RRD_ALGORITHM_PCENT_OVER_ROW_TOTAL:
             case RRD_ALGORITHM_PCENT_OVER_DIFF_TOTAL:
-                if(unlikely(st->debug)) debug(D_RRD_STATS, "%s/%s: setting last_calculated_value (old: " CALCULATED_NUMBER_FORMAT ") to last_calculated_value (new: " CALCULATED_NUMBER_FORMAT ")", st->id, rd->name, rd->last_calculated_value, rd->calculated_value);
+                if(unlikely(rrdset_flag_check(st, RRDSET_FLAG_DEBUG)))
+                    debug(D_RRD_STATS, "%s/%s: setting last_calculated_value (old: " CALCULATED_NUMBER_FORMAT ") to last_calculated_value (new: " CALCULATED_NUMBER_FORMAT ")", st->id, rd->name, rd->last_calculated_value, rd->calculated_value);
                 rd->last_calculated_value = rd->calculated_value;
                 break;
         }
@@ -965,7 +986,8 @@ usec_t rrdset_done(RRDSET *st) {
         rd->collected_value = 0;
         rrddim_flag_clear(rd, RRDDIM_FLAG_UPDATED);
 
-        if(unlikely(st->debug)) debug(D_RRD_STATS, "%s/%s: END "
+        if(unlikely(rrdset_flag_check(st, RRDSET_FLAG_DEBUG)))
+            debug(D_RRD_STATS, "%s/%s: END "
                     " last_collected_value = " COLLECTED_NUMBER_FORMAT
                     " collected_value = " COLLECTED_NUMBER_FORMAT
                     " last_calculated_value = " CALCULATED_NUMBER_FORMAT
index bf3dc6079f46215e78a612b251115dd4e4ad0a79..341fc4b89ace57f3db31fd7c7f3056aacb68efb0 100644 (file)
@@ -94,7 +94,7 @@ int do_proc_sys_devices_system_node(int update_every, usec_t dt) {
                 if(unlikely(!st)) {
                     st = rrdset_create_localhost("mem", m->name, NULL, "numa", NULL, "NUMA events", "events/s", 1000
                                                  , update_every, RRDSET_TYPE_LINE);
-                    st->isdetail = 1;
+                    rrdset_flag_set(st, RRDSET_FLAG_DETAIL);
 
                     rrddim_add(st, "local_node", "local", 1, 1, RRD_ALGORITHM_INCREMENTAL);
                     rrddim_add(st, "numa_foreign", "foreign", 1, 1, RRD_ALGORITHM_INCREMENTAL);
index dc6606678dde98b9688af32cafc93bae9230d905..412df8740cd94514f6d44d93ba8dc6475c07955f 100644 (file)
@@ -899,7 +899,7 @@ int run_test(struct test *test)
     if(test->feed2)
         rd2 = rrddim_add(st, "dim2", NULL, test->multiplier, test->divisor, test->algorithm);
 
-    st->debug = 1;
+    rrdset_flag_set(st, RRDSET_FLAG_DEBUG);
 
     // feed it with the test data
     time_t time_now = 0, time_start = now_realtime_sec();
@@ -1101,7 +1101,7 @@ int unit_test(long delay, long shift)
 
     RRDSET *st = rrdset_create_localhost("netdata", name, name, "netdata", NULL, "Unit Testing", "a value", 1, 1
                                          , RRDSET_TYPE_LINE);
-    st->debug = 1;
+    rrdset_flag_set(st, RRDSET_FLAG_DEBUG);
 
     RRDDIM *rdabs = NULL;
     RRDDIM *rdinc = NULL;
index 7b2286bb9bb95cb5057b2814d25a4d09d505735b..a72843cdcd2821d8e7676f470fef83ac7573dca5 100644 (file)
@@ -2250,10 +2250,15 @@ void web_client_process(struct web_client *w) {
                         else {
                             code = 200;
                             debug_flags |= D_RRD_STATS;
-                            st->debug = !st->debug;
-                            buffer_sprintf(w->response.data, "Chart has now debug %s: ", st->debug?"enabled":"disabled");
+
+                            if(rrdset_flag_check(st, RRDSET_FLAG_DEBUG))
+                                rrdset_flag_clear(st, RRDSET_FLAG_DEBUG);
+                            else
+                                rrdset_flag_set(st, RRDSET_FLAG_DEBUG);
+
+                            buffer_sprintf(w->response.data, "Chart has now debug %s: ", rrdset_flag_check(st, RRDSET_FLAG_DEBUG)?"enabled":"disabled");
                             buffer_strcat_htmlescape(w->response.data, tok);
-                            debug(D_WEB_CLIENT_ACCESS, "%llu: debug for %s is %s.", w->id, tok, st->debug?"enabled":"disabled");
+                            debug(D_WEB_CLIENT_ACCESS, "%llu: debug for %s is %s.", w->id, tok, rrdset_flag_check(st, RRDSET_FLAG_DEBUG)?"enabled":"disabled");
                         }
                     }
                     else {