Merge branch 'ms/aix'

[collectd.git] / src / processes.c

diff --git a/src/processes.c b/src/processes.c
index bda096a..576a5b1 100644 (file)
--- a/src/processes.c
+++ b/src/processes.c
@@ -266,7 +266,7 @@ static void ps_list_register (const char *name, const char *regexp)
                return;
        }
 #endif
-       
+
        for (ptr = list_head_g; ptr != NULL; ptr = ptr->next)
        {
                if (strcmp (ptr->name, name) == 0)
@@ -342,13 +342,13 @@ static void ps_list_add (const char *name, const char *cmdline, procstat_entry_t
                if ((pse == NULL) || (pse->id != entry->id))
                {
                        procstat_entry_t *new;
-                       
+
                        new = (procstat_entry_t *) malloc (sizeof (procstat_entry_t));
                        if (new == NULL)
                                return;
                        memset (new, 0, sizeof (procstat_entry_t));
                        new->id = entry->id;
-                       
+
                        if (pse == NULL)
                                ps->instances = new;
                        else
@@ -400,7 +400,7 @@ static void ps_list_add (const char *name, const char *cmdline, procstat_entry_t
                                pse->vmem_minflt = entry->vmem_minflt_counter - pse->vmem_minflt_counter;
                        }
                        pse->vmem_minflt_counter = entry->vmem_minflt_counter;
-                       
+
                        if (entry->vmem_majflt_counter < pse->vmem_majflt_counter)
                        {
                                pse->vmem_majflt = entry->vmem_majflt_counter
@@ -437,7 +437,7 @@ static void ps_list_add (const char *name, const char *cmdline, procstat_entry_t
                                pse->cpu_user = entry->cpu_user_counter - pse->cpu_user_counter;
                        }
                        pse->cpu_user_counter = entry->cpu_user_counter;
-                       
+
                        if (entry->cpu_system_counter < pse->cpu_system_counter)
                        {
                                pse->cpu_system = entry->cpu_system_counter
@@ -1572,6 +1572,7 @@ static int ps_read (void)
 /* #endif HAVE_LIBKVM_GETPROCS && HAVE_STRUCT_KINFO_PROC_FREEBSD */
 
 #elif HAVE_PROCINFO_H
+       /* AIX */
        int running  = 0;
        int sleeping = 0;
        int zombies  = 0;
@@ -1580,24 +1581,26 @@ static int ps_read (void)
        int blocked  = 0;
 
        pid_t pindex = 0;
-       tid64_t thindex;
-       int i;
-       int j;
-       int n;
        int nprocs;
-       int nthreads;
 
        procstat_t *ps;
        procstat_entry_t pse;
-       char arglist[MAXARGLN+1];
-       char *cmdline;
-       char *cargs;
 
        ps_list_reset ();
-       while ((nprocs = getprocs64(procentry, sizeof(struct procentry64), NULL, sizeof(struct fdsinfo64), &pindex, MAXPROCENTRY)) > 0 )
+       while ((nprocs = getprocs64 (procentry, sizeof(struct procentry64),
+                                       /* fdsinfo = */ NULL, sizeof(struct fdsinfo64),
+                                       &pindex, MAXPROCENTRY)) > 0)
        {
-               for ( i=0; i< nprocs; i++)
+               int i;
+
+               for (i = 0; i < nprocs; i++)
                {
+                       tid64_t thindex;
+                       int nthreads;
+                       char arglist[MAXARGLN+1];
+                       char *cargs;
+                       char *cmdline;
+
                        if (procentry[i].pi_state == SNONE) continue;
                        /* if (procentry[i].pi_state == SZOMB)  FIXME */
 
@@ -1613,6 +1616,8 @@ static int ps_read (void)
                        {
                                if (getargs(&procentry[i], sizeof(struct procentry64), arglist, MAXARGLN) >= 0)
                                {
+                                       int n;
+
                                        n = -1;
                                        while (++n < MAXARGLN)
                                        {
@@ -1633,8 +1638,12 @@ static int ps_read (void)
                        pse.num_proc = 1;
 
                        thindex=0;
-                       while ((nthreads = getthrds64(procentry[i].pi_pid, thrdentry, sizeof(struct thrdentry64), &thindex, MAXTHRDENTRY)) > 0)
+                       while ((nthreads = getthrds64(procentry[i].pi_pid,
+                                                       thrdentry, sizeof(struct thrdentry64),
+                                                       &thindex, MAXTHRDENTRY)) > 0)
                        {
+                               int j;
+
                                for (j=0; j< nthreads; j++)
                                {
                                        switch (thrdentry[j].ti_state)
@@ -1672,10 +1681,11 @@ static int ps_read (void)
                        pse.stack_size =  0;
 
                        ps_list_add (cmdline, cargs, &pse);
-               }
+               } /* for (i = 0 .. nprocs) */
+
                if (nprocs < MAXPROCENTRY)
                        break;
-       }
+       } /* while (getprocs64() > 0) */
        ps_submit_state ("running",  running);
        ps_submit_state ("sleeping", sleeping);
        ps_submit_state ("zombies",  zombies);