#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 {
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);
}
}
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);
}
zone_stats_t *stats;
/* size_t physmem = sysconf(_SC_PHYS_PAGES) * pagesize;*/
- if (!(tree=c_avl_create((int (*)
- (const void *, const void *))zone_compare))) {
- WARNING("Failed to create tree");
+ if (!(tree=c_avl_create((void *) zone_compare))) {
+ WARNING("zone plugin: Failed to create tree");
return(NULL);
}
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);
}
pagesize = sysconf(_SC_PAGESIZE);
if ((procdir = opendir("/proc")) == NULL) {
- ERROR("cannot open /proc directory\n");
+ ERROR("zone plugin: cannot open /proc directory\n");
exit(1);
}