Return -1 in zone_read on error

[collectd.git] / src / zone.c

diff --git a/src/zone.c b/src/zone.c
index 185a57e..52dd977 100644 (file)
--- a/src/zone.c
+++ b/src/zone.c
@@ -33,7 +33,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 +42,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)
 {
@@ -100,16 +105,16 @@ zone_find_stats(c_avl_tree_t *tree, zoneid_t zoneid)
 
        if (c_avl_get(tree, (void **)&zoneid, (void **)&ret)) {
                if (!(ret = malloc(sizeof(zone_stats_t)))) {
-                       WARNING("no memory");
+                       WARNING("zone plugin: no memory");
                        return(NULL);
                }
                if (!(key = malloc(sizeof(zoneid_t)))) {
-                       WARNING("no memory");
+                       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 +124,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);
        }
@@ -142,10 +150,9 @@ zone_scandir(DIR *procdir)
        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((void *) zone_compare))) {
-               WARNING("Failed to create tree");
+               WARNING("zone plugin: Failed to create tree");
                return(NULL);
        }
 
@@ -160,8 +167,10 @@ zone_scandir(DIR *procdir)
                                  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);
 }
@@ -172,10 +181,9 @@ 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);
@@ -186,5 +194,6 @@ static int zone_read (void)
 
 void module_register (void)
 {
+       plugin_register_init ("zone", zone_init);
        plugin_register_read ("zone", zone_read);
 } /* void module_register */