X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=src%2Fzone.c;h=d9e46f5ad1ea690ca022b2732c09a3918046f558;hb=4d370741101aeb037ae52f3529a4a0869e0dc08a;hp=188fbe3db3dc89108eb9ef45431d7aabb9108d58;hpb=edb3002086ef96755804b2d155728cb9a0428935;p=collectd.git

diff --git a/src/zone.c b/src/zone.c
index 188fbe3d..d9e46f5a 100644
--- a/src/zone.c
+++ b/src/zone.c
@@ -31,11 +31,10 @@
 #endif
 
 #include "collectd.h"
+
 #include "common.h"
 #include "plugin.h"
 
-#include <sys/types.h>
-#include <sys/vm_usage.h>
 #include <procfs.h>
 #include <zone.h>
 
@@ -49,39 +48,35 @@ typedef struct zone_stats {
 	ushort_t      pctmem;
 } zone_stats_t;
 
-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)
+zone_compare(const void *a, const void *b)
 {
-	if (*a == *b)
+	if (*(const zoneid_t *)a == *(const zoneid_t *)b)
 		return(0);
-	if (*a < *b)
+	if (*(const zoneid_t *)a < *(const zoneid_t *)b)
 		return(-1);
 	return(1);
 }
 
 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, sizeof(procfile), "/proc/%s/%s", pidstr, file);
+	(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);
 }
@@ -111,12 +106,13 @@ 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)))) {
+		if (!(ret = malloc(sizeof(*ret)))) {
 			WARNING("zone plugin: no memory");
 			return(NULL);
 		}
-		if (!(key = malloc(sizeof(zoneid_t)))) {
+		if (!(key = malloc(sizeof(*key)))) {
 			WARNING("zone plugin: no memory");
+			free(ret);
 			return(NULL);
 		}
 		*key = zoneid;
@@ -138,7 +134,7 @@ zone_submit_values(c_avl_tree_t *tree)
 	while (c_avl_pick (tree, (void **)&zoneid, (void **)&stats) == 0)
 	{
 		if (getzonenamebyid(*zoneid, zonename, sizeof( zonename )) == -1) {
-			WARNING("zone plugin: error retreiving zonename");
+			WARNING("zone plugin: error retrieving zonename");
 		} else {
 			zone_submit_value(zonename, (gauge_t)FRC2PCT(stats->pctcpu));
 		}
@@ -151,29 +147,30 @@ 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;
 
-	if (!(tree=c_avl_create((void *) zone_compare))) {
+	if (!(tree=c_avl_create(zone_compare))) {
 		WARNING("zone plugin: Failed to create tree");
 		return(NULL);
 	}
 
 	rewinddir(procdir);
 	while ((direntp = readdir(procdir))) {
-		pidstr = direntp->d_name;
+		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);
 		if( stats ) {
 			stats->pctcpu += psinfo.pr_pctcpu;
@@ -183,7 +180,6 @@ zone_scandir(DIR *procdir)
 	return(tree);
 }
 
-
 static int zone_read (void)
 {
 	DIR          *procdir;
@@ -205,6 +201,5 @@ static int zone_read (void)
 
 void module_register (void)
 {
-	plugin_register_init ("zone", zone_init);
 	plugin_register_read ("zone", zone_read);
 } /* void module_register */