diff --git a/src/zone.c b/src/zone.c
index 1781775ff90b68a5a4abba5af4792ea086175b40..cb3869d69829ff04e8f908711faecf435a26602e 100644 (file)
--- a/src/zone.c
+++ b/src/zone.c
*
* Authors:
* Mathijs Mohlmann
*
* Authors:
* Mathijs Mohlmann
+ * Dagobert Michelsen (forward-porting)
**/
#define _BSD_SOURCE
**/
#define _BSD_SOURCE
#include "utils_avltree.h"
#define MAX_PROCFS_PATH 40
#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 {
#define FRC2PCT(pp)(((float)(pp))/0x8000*100)
typedef struct zone_stats {
static long pagesize;
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)
{
static int
zone_compare(const zoneid_t *a, const zoneid_t *b)
{
int fd;
char procfile[MAX_PROCFS_PATH];
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) {
}
if (pread(fd, buf, bufsize, 0) != bufsize) {
static void
zone_submit_values(c_avl_tree_t *tree)
{
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)
{
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);
}
free(stats);
free(zoneid);
}
psinfo_t psinfo;
c_avl_tree_t *tree;
zone_stats_t *stats;
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");
return(NULL);
}
if (!(tree=c_avl_create((void *) zone_compare))) {
WARNING("zone plugin: Failed to create tree");
return(NULL);
}
- for (rewinddir(procdir); (direntp = readdir(procdir)); ) {
+ rewinddir(procdir);
+ while ((direntp = readdir(procdir))) {
pidstr = direntp->d_name;
if (pidstr[0] == '.') /* skip "." and ".." */
continue;
pidstr = direntp->d_name;
if (pidstr[0] == '.') /* skip "." and ".." */
continue;
sizeof(psinfo_t)) != 0)
continue;
stats = zone_find_stats(tree, psinfo.pr_zoneid);
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);
}
}
return(tree);
}
DIR *procdir;
c_avl_tree_t *tree;
DIR *procdir;
c_avl_tree_t *tree;
- pagesize = sysconf(_SC_PAGESIZE);
if ((procdir = opendir("/proc")) == NULL) {
ERROR("zone plugin: cannot open /proc directory\n");
if ((procdir = opendir("/proc")) == NULL) {
ERROR("zone plugin: cannot open /proc directory\n");
- exit(1);
+ return (-1);
}
tree=zone_scandir(procdir);
closedir(procdir);
}
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)
{
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 */
plugin_register_read ("zone", zone_read);
} /* void module_register */