collectd-5.0.1-mine.patch some processes.c fixes for FreeBSD

I welcome from rainy Ingermanland!

Our thoughts are now occupied by Putin and vodka, however...

I have paid attention to a little incorrect data which is given out by
a processes plugin on my beautifull FreeBSD system.
I have corrected them and in process have made absolutely slightly
have improved accuracy and productivity of a processes plugin for
FreeBSD systems.

- Fix strange plural call of getpagesize(). Has entered a global
variable and initialization procedure for FreeBSD
- Data was summarized on all processes including threads. It led to
absolutely uncertain result. Fix based on codebase of FreeBSD top
programm. KERN_PROC_ALL attribute keep for future purposes.
- Gets command argument failed for some processes as system and some
other. It led to error messages to console. Fix based on codebase of
FreeBSD top programm.
- System and user CPU times turned out from the sum of miliseconds
and... Oh! microseconds in one glass with overflow possibility. Fixed.

My girlfriend has left me for such Christmas vacation, but I am
assured that have made good business.

Patch in mail attachment.

--
Non nobis Domine non nobis sed Nomini Tuo da gloriam
Phil Kulin

Change-Id: Ib88faadf5a0fd335b426e9024b0a2e438ddbaf1f
Signed-off-by: Florian Forster <octo@collectd.org>

diff --git a/src/processes.c b/src/processes.c
index 8f4eb88fc168f3c1b36835c5ed294c95dd31ed08..f149f043b3a887371343675d55c223d1809dad88 100644 (file)
--- a/src/processes.c
+++ b/src/processes.c
@@ -200,7 +200,7 @@ static long pagesize_g;
 /* #endif KERNEL_LINUX */
 
 #elif HAVE_LIBKVM_GETPROCS && HAVE_STRUCT_KINFO_PROC_FREEBSD
-/* no global variables */
+static int pagesize;
 /* #endif HAVE_LIBKVM_GETPROCS && HAVE_STRUCT_KINFO_PROC_FREEBSD */
 
 #elif HAVE_PROCINFO_H
@@ -609,7 +609,7 @@ static int ps_init (void)
 /* #endif KERNEL_LINUX */
 
 #elif HAVE_LIBKVM_GETPROCS && HAVE_STRUCT_KINFO_PROC_FREEBSD
-/* no initialization */
+       pagesize = getpagesize();
 /* #endif HAVE_LIBKVM_GETPROCS && HAVE_STRUCT_KINFO_PROC_FREEBSD */
 
 #elif HAVE_PROCINFO_H
@@ -790,7 +790,7 @@ static procstat_t *ps_read_vmem (int pid, procstat_t *ps)
                tmp = strtoll (fields[1], &endptr, /* base = */ 10);
                if ((errno == 0) && (endptr != fields[1]))
                {
-                       if (strncmp (buffer, "VmData", 6) == 0) 
+                       if (strncmp (buffer, "VmData", 6) == 0)
                        {
                                data = tmp;
                        }
@@ -1586,6 +1586,8 @@ static int ps_read (void)
        int count;                         /* returns number of processes */
        int i;
 
+       struct kinfo_proc *prev_pp = NULL;
+
        procstat_t *ps_ptr;
        procstat_entry_t pse;
 
@@ -1599,7 +1601,6 @@ static int ps_read (void)
                                errbuf);
                return (0);
        }
-
        /* Get the list of processes. */
        procs = kvm_getprocs(kd, KERN_PROC_ALL, 0, &count);
        if (procs == NULL)
@@ -1613,64 +1614,84 @@ static int ps_read (void)
        /* Iterate through the processes in kinfo_proc */
        for (i = 0; i < count; i++)
        {
-               /* retrieve the arguments */
-               cmdline[0] = 0;
-               cmdline_ptr = NULL;
-
-               argv = kvm_getargv (kd, (const struct kinfo_proc *) &(procs[i]), 0);
-               if (argv != NULL)
+               if (prev_pp == NULL || prev_pp->ki_pid != procs[i].ki_pid)
                {
-                       int status;
-                       int argc;
+                       /* store previos structure */
+                       prev_pp = &(procs[i]);
+                       /* retrieve the arguments */
+                       cmdline[0] = 0;
+                       cmdline_ptr = NULL;
+                       /* not probe system processes and processes without arguments*/
+                       if ( !(procs[i].ki_flag & P_SYSTEM) && procs[i].ki_args != NULL )
+                       {
+                               argv = kvm_getargv (kd, (const struct kinfo_proc *) &(procs[i]), 0);
+                               if ( argv != NULL && *argv)
+                               {
+                                       int status;
+                                       int argc;
 
-                       argc = 0;
-                       while (argv[argc] != NULL)
-                               argc++;
+                                       argc = 0;
+                                       while (argv[argc] != NULL)
+                                               argc++;
 
-                       status = strjoin (cmdline, sizeof (cmdline),
-                                       argv, argc, " ");
+                                       status = strjoin (cmdline, sizeof (cmdline),
+                                                       argv, argc, " ");
 
-                       if (status < 0)
-                       {
-                               WARNING ("processes plugin: Command line did "
-                                               "not fit into buffer.");
-                       }
-                       else
-                       {
-                               cmdline_ptr = &cmdline[0];
+                                       if (status < 0)
+                                       {
+                                               WARNING ("processes plugin: Command line did "
+                                                               "not fit into buffer.");
+                                       }
+                                       else
+                                       {
+                                               cmdline_ptr = &cmdline[0];
+                                       }
+                               }
                        }
-               }
 
-               pse.id       = procs[i].ki_pid;
-               pse.age      = 0;
+                       pse.id       = procs[i].ki_pid;
+                       pse.age      = 0;
+
+                       pse.num_proc = 1;
+                       pse.num_lwp  = procs[i].ki_numthreads;
 
-               pse.num_proc = 1;
-               pse.num_lwp  = procs[i].ki_numthreads;
+                       pse.vmem_size = procs[i].ki_size;
+                       pse.vmem_rss = procs[i].ki_rssize * pagesize;
+                       pse.vmem_data = procs[i].ki_dsize * pagesize;
+                       pse.vmem_code = procs[i].ki_tsize * pagesize;
+                       pse.stack_size = procs[i].ki_ssize * pagesize;
+                       pse.vmem_minflt = 0;
+                       pse.vmem_minflt_counter = procs[i].ki_rusage.ru_minflt;
+                       pse.vmem_majflt = 0;
+                       pse.vmem_majflt_counter = procs[i].ki_rusage.ru_majflt;
 
-               pse.vmem_size = procs[i].ki_size;
-               pse.vmem_rss = procs[i].ki_rssize * getpagesize();
-               pse.vmem_data = procs[i].ki_dsize * getpagesize();
-               pse.vmem_code = procs[i].ki_tsize * getpagesize();
-               pse.stack_size = procs[i].ki_ssize * getpagesize();
-               pse.vmem_minflt = 0;
-               pse.vmem_minflt_counter = procs[i].ki_rusage.ru_minflt;
-               pse.vmem_majflt = 0;
-               pse.vmem_majflt_counter = procs[i].ki_rusage.ru_majflt;
+                       pse.cpu_user = 0;
+                       pse.cpu_system = 0;
+                       /*
+                        * The u-area might be swapped out, and we can't get
+                        * at it because we have a crashdump and no swap.
+                        * If it's here fill in these fields, otherwise, just
+                        * leave them 0.
+                        */
+                       if (procs[i].ki_flag & P_INMEM)
+                       {
+                               pse.cpu_user_counter = 1000000lu
+                                       * procs[i].ki_rusage.ru_utime.tv_sec
+                                       + procs[i].ki_rusage.ru_utime.tv_usec;
+                               pse.cpu_system_counter = 1000000lu
+                                       * procs[i].ki_rusage.ru_stime.tv_sec
+                                       + procs[i].ki_rusage.ru_stime.tv_usec;
+                       }
 
-               pse.cpu_user = 0;
-               pse.cpu_user_counter = procs[i].ki_rusage.ru_utime.tv_sec
-                       * 1000
-                       + procs[i].ki_rusage.ru_utime.tv_usec;
-               pse.cpu_system = 0;
-               pse.cpu_system_counter = procs[i].ki_rusage.ru_stime.tv_sec
-                       * 1000
-                       + procs[i].ki_rusage.ru_stime.tv_usec;
+                       /* no io data */
+                       pse.io_rchar = -1;
+                       pse.io_wchar = -1;
+                       pse.io_syscr = -1;
+                       pse.io_syscw = -1;
 
-               /* no io data */
-               pse.io_rchar = -1;
-               pse.io_wchar = -1;
-               pse.io_syscr = -1;
-               pse.io_syscw = -1;
+                       ps_list_add (procs[i].ki_comm, cmdline_ptr, &pse);
+
+               }
 
                switch (procs[i].ki_stat)
                {
@@ -1683,11 +1704,9 @@ static int ps_read (void)
                        case SZOMB:     zombies++;      break;
                }
 
-               ps_list_add (procs[i].ki_comm, cmdline_ptr, &pse);
        }
 
        kvm_close(kd);
-
        ps_submit_state ("running",  running);
        ps_submit_state ("sleeping", sleeping);
        ps_submit_state ("zombies",  zombies);
@@ -1695,7 +1714,6 @@ static int ps_read (void)
        ps_submit_state ("blocked",  blocked);
        ps_submit_state ("idle",     idle);
        ps_submit_state ("wait",     wait);
-
        for (ps_ptr = list_head_g; ps_ptr != NULL; ps_ptr = ps_ptr->next)
                ps_submit_proc_list (ps_ptr);
 /* #endif HAVE_LIBKVM_GETPROCS && HAVE_STRUCT_KINFO_PROC_FREEBSD */