Merging upstream version 1.36.0.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

2 files changed, 12 insertions, 10 deletions

diff --git a/collectors/apps.plugin/apps_groups.conf b/collectors/apps.plugin/apps_groups.conf
index 1d1af4b70..89db6c4e8 100644
--- a/collectors/apps.plugin/apps_groups.conf
+++ b/collectors/apps.plugin/apps_groups.conf
@@ -121,7 +121,7 @@ columndb: clickhouse-server*
 # -----------------------------------------------------------------------------
 # email servers
 
-email: dovecot imapd pop3d amavis* zmstat* zmmailboxdmgr saslauthd opendkim postfwd2 smtp* lmtp* sendmail postfix master pickup qmgr showq tlsmgr postscreen oqmgr
+email: dovecot imapd pop3d amavis* zmstat-* zmdiaglog zmmailboxdmgr saslauthd opendkim postfwd2 smtp* lmtp* sendmail postfix master pickup qmgr showq tlsmgr postscreen oqmgr
 
 # -----------------------------------------------------------------------------
 # network, routing, VPN
@@ -227,7 +227,7 @@ dnsdist: dnsdist
 # installation / compilation / debugging
 
 build: cc1 cc1plus as gcc* cppcheck ld make cmake automake autoconf autoreconf
-build: git gdb valgrind*
+build: cargo rustc bazel buck git gdb valgrind*
 
 # -----------------------------------------------------------------------------
 # antivirus
diff --git a/collectors/apps.plugin/apps_plugin.c b/collectors/apps.plugin/apps_plugin.c
index 8a115d061..8521e078e 100644
--- a/collectors/apps.plugin/apps_plugin.c
+++ b/collectors/apps.plugin/apps_plugin.c
@@ -173,7 +173,8 @@ static kernel_uint_t
         global_gtime = 0;
 
 // the normalization ratios, as calculated by normalize_utilization()
-double  utime_fix_ratio = 1.0,
+NETDATA_DOUBLE
+        utime_fix_ratio = 1.0,
         stime_fix_ratio = 1.0,
         gtime_fix_ratio = 1.0,
         minflt_fix_ratio = 1.0,
@@ -501,7 +502,8 @@ struct file_descriptor {
 static int
         all_files_len = 0,
         all_files_size = 0;
-        long double currentmaxfds = 0;
+
+long currentmaxfds = 0;
 
 // ----------------------------------------------------------------------------
 // read users and groups from files
@@ -3021,7 +3023,7 @@ static inline void aggregate_pid_fds_on_targets(struct pid_stat *p) {
     reallocate_target_fds(u);
     reallocate_target_fds(g);
 
-    long double currentfds = 0;
+    long currentfds = 0;
     size_t c, size = p->fds_size;
     struct pid_fd *fds = p->fds;
     for(c = 0; c < size ;c++) {
@@ -3373,7 +3375,7 @@ static void normalize_utilization(struct target *root) {
             gtime_fix_ratio  =
             cutime_fix_ratio =
             cstime_fix_ratio =
-            cgtime_fix_ratio = 1.0; //(double)(global_utime + global_stime) / (double)(utime + cutime + stime + cstime);
+            cgtime_fix_ratio = 1.0; //(NETDATA_DOUBLE)(global_utime + global_stime) / (NETDATA_DOUBLE)(utime + cutime + stime + cstime);
         }
         else if((global_utime + global_stime > utime + stime) && (cutime || cstime)) {
             // children resources are too high
@@ -3383,7 +3385,7 @@ static void normalize_utilization(struct target *root) {
             gtime_fix_ratio  = 1.0;
             cutime_fix_ratio =
             cstime_fix_ratio =
-            cgtime_fix_ratio = (double)((global_utime + global_stime) - (utime + stime)) / (double)(cutime + cstime);
+            cgtime_fix_ratio = (NETDATA_DOUBLE)((global_utime + global_stime) - (utime + stime)) / (NETDATA_DOUBLE)(cutime + cstime);
         }
         else if(utime || stime) {
             // even running processes are unrealistic
@@ -3391,7 +3393,7 @@ static void normalize_utilization(struct target *root) {
             // lower the running processes resources
             utime_fix_ratio  =
             stime_fix_ratio  =
-            gtime_fix_ratio  = (double)(global_utime + global_stime) / (double)(utime + stime);
+            gtime_fix_ratio  = (NETDATA_DOUBLE)(global_utime + global_stime) / (NETDATA_DOUBLE)(utime + stime);
             cutime_fix_ratio =
             cstime_fix_ratio =
             cgtime_fix_ratio = 0.0;
@@ -3439,14 +3441,14 @@ static void normalize_utilization(struct target *root) {
 
     if(utime || stime || gtime)
         majflt_fix_ratio =
-        minflt_fix_ratio = (double)(utime * utime_fix_ratio + stime * stime_fix_ratio + gtime * gtime_fix_ratio) / (double)(utime + stime + gtime);
+        minflt_fix_ratio = (NETDATA_DOUBLE)(utime * utime_fix_ratio + stime * stime_fix_ratio + gtime * gtime_fix_ratio) / (NETDATA_DOUBLE)(utime + stime + gtime);
     else
         minflt_fix_ratio =
         majflt_fix_ratio = 1.0;
 
     if(cutime || cstime || cgtime)
         cmajflt_fix_ratio =
-        cminflt_fix_ratio = (double)(cutime * cutime_fix_ratio + cstime * cstime_fix_ratio + cgtime * cgtime_fix_ratio) / (double)(cutime + cstime + cgtime);
+        cminflt_fix_ratio = (NETDATA_DOUBLE)(cutime * cutime_fix_ratio + cstime * cstime_fix_ratio + cgtime * cgtime_fix_ratio) / (NETDATA_DOUBLE)(cutime + cstime + cgtime);
     else
         cminflt_fix_ratio =
         cmajflt_fix_ratio = 1.0;