No busy looping around open()

[collectd.git] / src / zone.c

diff --git a/src/zone.c b/src/zone.c
index 325d556..78e91ef 100644 (file)
--- 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)
 {
@@ -58,11 +64,9 @@ zone_read_procfile(char *pidstr, char *file, 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, file);
+       if ((fd = open(procfile, O_RDONLY)) == -1) {
+               return (1);
        }
 
        if (pread(fd, buf, bufsize, 0) != bufsize) {
@@ -144,7 +148,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");
@@ -162,8 +165,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);
 }
@@ -174,19 +179,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 */