Merge branch 'collectd-3.11' into collectd-4.0

[collectd.git] / src / processes.c

diff --git a/src/processes.c b/src/processes.c
index 5a29236d8970bdac405775e939b1ca5bf41b4bf4..954cd0df9d4a4b901a46a11bc8273bbd5ef0cc64 100644 (file)
--- a/src/processes.c
+++ b/src/processes.c
@@ -521,11 +521,14 @@ static int *ps_read_tasks (int pid)
 
        closedir (dh);
 
+       if (list_len == 0)
+               return (NULL);
+
        assert (list_len < list_size);
        assert (list[list_len] == 0);
 
        return (list);
-}
+} /* int *ps_read_tasks */
 
 int ps_read_process (int pid, procstat_t *ps, char *state)
 {
@@ -584,17 +587,21 @@ int ps_read_process (int pid, procstat_t *ps, char *state)
 
        ppid = atoi (fields[3]);
 
-       if ((tasks = ps_read_tasks (pid)) == NULL)
+       *state = fields[2][0];
+
+       if (*state == 'Z')
        {
-               /* This happends for zombied, e.g. */
-               DEBUG ("ps_read_tasks (%i) failed.", pid);
-               *state = 'Z';
                ps->num_lwp  = 0;
                ps->num_proc = 0;
        }
+       else if ((tasks = ps_read_tasks (pid)) == NULL)
+       {
+               /* Kernel 2.4 or so */
+               ps->num_lwp  = 1;
+               ps->num_proc = 1;
+       }
        else
        {
-               *state = '\0';
                ps->num_lwp  = 0;
                ps->num_proc = 1;
                for (i = 0; tasks[i] != 0; i++)
@@ -604,10 +611,10 @@ int ps_read_process (int pid, procstat_t *ps, char *state)
                tasks = NULL;
        }
 
-       /* Leave the rest at zero if this is only an LWP */
+       /* Leave the rest at zero if this is only a zombi */
        if (ps->num_proc == 0)
        {
-               DEBUG ("This is only an LWP: pid = %i; name = %s;",
+               DEBUG ("This is only a zombi: pid = %i; name = %s;",
                                pid, ps->name);
                return (0);
        }
@@ -627,8 +634,6 @@ int ps_read_process (int pid, procstat_t *ps, char *state)
        ps->cpu_system_counter = (unsigned long) cpu_system_counter;
        ps->vmem_rss = (unsigned long) vmem_rss;
 
-       *state = fields[2][0];
-
        /* success */
        return (0);
 } /* int ps_read_process (...) */