Merge pull request #1208 from jy2wong/master

[collectd.git] / src / zone.c

diff --git a/src/zone.c b/src/zone.c
index e550303..52dc553 100644 (file)
--- a/src/zone.c
+++ b/src/zone.c
@@ -17,9 +17,18 @@
  *
  * Authors:
  *   Mathijs Mohlmann
+ *   Dagobert Michelsen (forward-porting)
  **/
 
-#define _BSD_SOURCE
+#if HAVE_CONFIG_H
+# include "config.h"
+# undef HAVE_CONFIG_H
+#endif
+/* avoid procfs.h error "Cannot use procfs in the large file compilation environment" */
+#if !defined(_LP64) && _FILE_OFFSET_BITS == 64
+#  undef _FILE_OFFSET_BITS
+#  undef _LARGEFILE64_SOURCE
+#endif
 
 #include "collectd.h"
 #include "common.h"
@@ -33,7 +42,6 @@
 #include "utils_avltree.h"
 
 #define        MAX_PROCFS_PATH 40
-#define MAX_ZONE_NAME 20
 #define FRC2PCT(pp)(((float)(pp))/0x8000*100)
 
 typedef struct zone_stats {
@@ -43,6 +51,12 @@ typedef struct zone_stats {
 
 static long pagesize;
 
+static int zone_init (void)
+{
+       pagesize = sysconf(_SC_PAGESIZE);
+       return (0);
+}
+
 static int
 zone_compare(const zoneid_t *a, const zoneid_t *b)
 {
@@ -54,22 +68,24 @@ zone_compare(const zoneid_t *a, const zoneid_t *b)
 }
 
 static int
-zone_read_procfile(char *pidstr, char *file, void *buf, size_t bufsize)
+zone_read_procfile(char const *pidstr, char const *name, void *buf, size_t bufsize)
 {
        int fd;
 
        char procfile[MAX_PROCFS_PATH];
-       (void)snprintf(procfile, MAX_PROCFS_PATH, "/proc/%s/%s", pidstr, file);
-       while ((fd = open(procfile, O_RDONLY)) == -1) {
-               if ((errno != EMFILE) || (errno != ENFILE)) {
-                       return(1);
-               }
+       (void)snprintf(procfile, sizeof(procfile), "/proc/%s/%s", pidstr, name);
+       if ((fd = open(procfile, O_RDONLY)) == -1) {
+               return (1);
        }
 
-       if (pread(fd, buf, bufsize, 0) != bufsize) {
+       if (sread(fd, buf, bufsize) != 0) {
+               char errbuf[1024];
+               ERROR ("zone plugin: Reading \"%s\" failed: %s", procfile,
+                               sstrerror (errno, errbuf, sizeof (errbuf)));
                close(fd);
                return (1);
        }
+
        close(fd);
        return (0);
 }
@@ -99,17 +115,17 @@ zone_find_stats(c_avl_tree_t *tree, zoneid_t zoneid)
        zoneid_t     *key = NULL;
 
        if (c_avl_get(tree, (void **)&zoneid, (void **)&ret)) {
-               if (!(ret = malloc(sizeof(zone_stats_t)))) {
-                       WARNING("no memory");
+               if (!(ret = malloc(sizeof(*ret)))) {
+                       WARNING("zone plugin: no memory");
                        return(NULL);
                }
-               if (!(key = malloc(sizeof(zoneid_t)))) {
-                       WARNING("no memory");
+               if (!(key = malloc(sizeof(*key)))) {
+                       WARNING("zone plugin: no memory");
                        return(NULL);
                }
                *key = zoneid;
                if (c_avl_insert(tree, key, ret)) {
-                       WARNING("error inserting into tree");
+                       WARNING("zone plugin: error inserting into tree");
                        return(NULL);
                }
        }
@@ -119,14 +135,17 @@ zone_find_stats(c_avl_tree_t *tree, zoneid_t zoneid)
 static void
 zone_submit_values(c_avl_tree_t *tree)
 {
-       char          zonename[MAX_ZONE_NAME];
+       char          zonename[ZONENAME_MAX];
        zoneid_t     *zoneid = NULL;
        zone_stats_t *stats  = NULL;
 
        while (c_avl_pick (tree, (void **)&zoneid, (void **)&stats) == 0)
        {
-               getzonenamebyid(*zoneid, zonename, MAX_ZONE_NAME-1);
-               zone_submit_value(zonename, (gauge_t)FRC2PCT(stats->pctcpu));
+               if (getzonenamebyid(*zoneid, zonename, sizeof( zonename )) == -1) {
+                       WARNING("zone plugin: error retreiving zonename");
+               } else {
+                       zone_submit_value(zonename, (gauge_t)FRC2PCT(stats->pctcpu));
+               }
                free(stats);
                free(zoneid);
        }
@@ -136,56 +155,60 @@ zone_submit_values(c_avl_tree_t *tree)
 static c_avl_tree_t *
 zone_scandir(DIR *procdir)
 {
-       char         *pidstr;
        pid_t         pid;
        dirent_t     *direntp;
        psinfo_t      psinfo;
        c_avl_tree_t *tree;
        zone_stats_t *stats;
-/*     size_t    physmem = sysconf(_SC_PHYS_PAGES) * pagesize;*/
 
-       if (!(tree=c_avl_create((int (*)
-                                (const void *, const void *))zone_compare))) {
-               WARNING("Failed to create tree");
+       if (!(tree=c_avl_create((void *) zone_compare))) {
+               WARNING("zone plugin: Failed to create tree");
                return(NULL);
        }
 
-       for (rewinddir(procdir); (direntp = readdir(procdir)); ) {
-               pidstr = direntp->d_name;
+       rewinddir(procdir);
+       while ((direntp = readdir(procdir))) {
+               char const *pidstr = direntp->d_name;
                if (pidstr[0] == '.')   /* skip "." and ".."  */
                        continue;
+
                pid = atoi(pidstr);
                if (pid == 0 || pid == 2 || pid == 3)
                        continue;       /* skip sched, pageout and fsflush */
-               if (zone_read_procfile(pidstr, "psinfo", &psinfo, 
-                                 sizeof(psinfo_t)) != 0)
+
+               if (zone_read_procfile(pidstr, "psinfo", &psinfo, sizeof(psinfo_t)) != 0)
                        continue;
+
                stats = zone_find_stats(tree, psinfo.pr_zoneid);
-               stats->pctcpu += psinfo.pr_pctcpu;
-               stats->pctmem += psinfo.pr_pctmem;
+               if( stats ) {
+                       stats->pctcpu += psinfo.pr_pctcpu;
+                       stats->pctmem += psinfo.pr_pctmem;
+               }
        }
        return(tree);
 }
 
-
 static int zone_read (void)
 {
        DIR          *procdir;
        c_avl_tree_t *tree;
 
-       pagesize = sysconf(_SC_PAGESIZE);
        if ((procdir = opendir("/proc")) == NULL) {
-               ERROR("cannot open /proc directory\n");
-               exit(1);
+               ERROR("zone plugin: cannot open /proc directory\n");
+               return (-1);
        }
 
        tree=zone_scandir(procdir);
        closedir(procdir);
+       if (tree == NULL) {
+               return (-1);
+       }
        zone_submit_values(tree); /* this also frees tree */
        return (0);
 }
 
 void module_register (void)
 {
+       plugin_register_init ("zone", zone_init);
        plugin_register_read ("zone", zone_read);
 } /* void module_register */