X-Git-Url: https://git.octo.it/?p=collectd.git;a=blobdiff_plain;f=src%2Fzone.c;h=e4aad81513bb2b9858139d3990e31de924f6b73f;hp=c5eacefd17da7e9aa49a2da28ef76b6c3c759969;hb=1d2d244077bd02f5ab7b53aef27f8d6e343f8a4a;hpb=5a7b3083a24416a12f59734209ebec47298c4d8b

diff --git a/src/zone.c b/src/zone.c
index c5eacefd..e4aad815 100644
--- a/src/zone.c
+++ b/src/zone.c
@@ -42,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)
 {
@@ -144,7 +150,6 @@ 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("zone plugin: Failed to create tree");
@@ -176,19 +181,22 @@ static int zone_read (void)
 	DIR          *procdir;
 	c_avl_tree_t *tree;
 
-	pagesize = sysconf(_SC_PAGESIZE);
 	if ((procdir = opendir("/proc")) == NULL) {
 		ERROR("zone plugin: cannot open /proc directory\n");
-		exit(1);
+		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 */