tc works on qdiscs too, merged #1427

[netdata.git] / src / proc_net_stat_conntrack.c

diff --git a/src/proc_net_stat_conntrack.c b/src/proc_net_stat_conntrack.c
index dd3f8ec9e38358af932add35e4dd3c927762eeeb..b9c724983833bf45093372db1e0914a7d71e0adb 100644 (file)
--- a/src/proc_net_stat_conntrack.c
+++ b/src/proc_net_stat_conntrack.c
@@ -3,10 +3,10 @@
 #define RRD_TYPE_NET_STAT_NETFILTER     "netfilter"
 #define RRD_TYPE_NET_STAT_CONNTRACK     "conntrack"
 
-int do_proc_net_stat_conntrack(int update_every, unsigned long long dt) {
+int do_proc_net_stat_conntrack(int update_every, usec_t dt) {
     static procfile *ff = NULL;
     static int do_sockets = -1, do_new = -1, do_changes = -1, do_expect = -1, do_search = -1, do_errors = -1;
-    static unsigned long long get_max_every = 10 * 1000000ULL, usec_since_last_max = 0;
+    static usec_t get_max_every = 10 * USEC_PER_SEC, usec_since_last_max = 0;
     static int read_full = 1;
     static char *nf_conntrack_filename, *nf_conntrack_count_filename, *nf_conntrack_max_filename;
     static RRDVAR *rrdvar_max = NULL;
@@ -21,7 +21,7 @@ int do_proc_net_stat_conntrack(int update_every, unsigned long long dt) {
 
         snprintfz(filename, FILENAME_MAX, "%s%s", global_host_prefix, "/proc/sys/net/netfilter/nf_conntrack_max");
         nf_conntrack_max_filename = config_get("plugin:proc:/proc/sys/net/netfilter/nf_conntrack_max", "filename to monitor", filename);
-        get_max_every = config_get_number("plugin:proc:/proc/sys/net/netfilter/nf_conntrack_max", "read every seconds", 10) * 1000000ULL;
+        usec_since_last_max = get_max_every = config_get_number("plugin:proc:/proc/sys/net/netfilter/nf_conntrack_max", "read every seconds", 10) * USEC_PER_SEC;
 
         read_full = 1;
         ff = procfile_open(nf_conntrack_filename, " \t:", PROCFILE_FLAG_DEFAULT);
@@ -61,12 +61,12 @@ int do_proc_net_stat_conntrack(int update_every, unsigned long long dt) {
         if(unlikely(!ff))
             return 0; // we return 0, so that we will retry to open it next time
 
-        uint32_t lines = procfile_lines(ff), l;
+        size_t lines = procfile_lines(ff), l;
 
         for(l = 1; l < lines ;l++) {
-            uint32_t words = procfile_linewords(ff, l);
+            size_t words = procfile_linewords(ff, l);
             if(unlikely(words < 17)) {
-                if(unlikely(words)) error("Cannot read /proc/net/stat/nf_conntrack line. Expected 17 params, read %u.", words);
+                if(unlikely(words)) error("Cannot read /proc/net/stat/nf_conntrack line. Expected 17 params, read %zu.", words);
                 continue;
             }
 
@@ -117,7 +117,7 @@ int do_proc_net_stat_conntrack(int update_every, unsigned long long dt) {
     }
 
     usec_since_last_max += dt;
-    if(unlikely(rrdvar_max && usec_since_last_max > get_max_every)) {
+    if(unlikely(rrdvar_max && usec_since_last_max >= get_max_every)) {
         usec_since_last_max = 0;
 
         unsigned long long max;