projects
/
collectd.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'collectd-5.5' into collectd-5.6
[collectd.git]
/
src
/
zone.c
diff --git
a/src/zone.c
b/src/zone.c
index
21a9497
..
d9e46f5
100644
(file)
--- a/
src/zone.c
+++ b/
src/zone.c
@@
-17,23
+17,30
@@
*
* Authors:
* Mathijs Mohlmann
*
* Authors:
* Mathijs Mohlmann
+ * Dagobert Michelsen (forward-porting)
**/
**/
-#define _BSD_SOURCE
+#if HAVE_CONFIG_H
+# include "config.h"
+# undef HAVE_CONFIG_H
+#endif
+/* avoid procfs.h error "Cannot use procfs in the large file compilation environment" */
+#if !defined(_LP64) && _FILE_OFFSET_BITS == 64
+# undef _FILE_OFFSET_BITS
+# undef _LARGEFILE64_SOURCE
+#endif
#include "collectd.h"
#include "collectd.h"
+
#include "common.h"
#include "plugin.h"
#include "common.h"
#include "plugin.h"
-#include <sys/types.h>
-#include <sys/vm_usage.h>
#include <procfs.h>
#include <zone.h>
#include "utils_avltree.h"
#define MAX_PROCFS_PATH 40
#include <procfs.h>
#include <zone.h>
#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 {
@@
-41,35
+48,35
@@
typedef struct zone_stats {
ushort_t pctmem;
} zone_stats_t;
ushort_t pctmem;
} zone_stats_t;
-static long pagesize;
-
static int
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);
return(0);
- if (*
a < *
b)
+ if (*
(const zoneid_t *)a < *(const zoneid_t *)
b)
return(-1);
return(1);
}
static int
return(-1);
return(1);
}
static int
-zone_read_procfile(char
*pidstr, char *fil
e, void *buf, size_t bufsize)
+zone_read_procfile(char
const *pidstr, char const *nam
e, void *buf, size_t bufsize)
{
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, 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 (1);
}
+
close(fd);
return (0);
}
close(fd);
return (0);
}
@@
-86,7
+93,7
@@
zone_submit_value(char *zone, gauge_t value)
vl.values_len = 1; /*STATIC_ARRAY_SIZE (values);*/
sstrncpy (vl.host, hostname_g, sizeof (vl.host));
sstrncpy (vl.plugin, "zone", sizeof (vl.plugin));
vl.values_len = 1; /*STATIC_ARRAY_SIZE (values);*/
sstrncpy (vl.host, hostname_g, sizeof (vl.host));
sstrncpy (vl.plugin, "zone", sizeof (vl.plugin));
- sstrncpy (vl.type, "
zone_cpu
", sizeof (vl.type));
+ sstrncpy (vl.type, "
percent
", sizeof (vl.type));
sstrncpy (vl.type_instance, zone, sizeof (vl.type_instance));
return(plugin_dispatch_values (&vl));
sstrncpy (vl.type_instance, zone, sizeof (vl.type_instance));
return(plugin_dispatch_values (&vl));
@@
-99,17
+106,18
@@
zone_find_stats(c_avl_tree_t *tree, zoneid_t zoneid)
zoneid_t *key = NULL;
if (c_avl_get(tree, (void **)&zoneid, (void **)&ret)) {
zoneid_t *key = NULL;
if (c_avl_get(tree, (void **)&zoneid, (void **)&ret)) {
- if (!(ret = malloc(sizeof(
zone_stats_
t)))) {
- WARNING("no memory");
+ if (!(ret = malloc(sizeof(
*re
t)))) {
+ WARNING("
zone plugin:
no memory");
return(NULL);
}
return(NULL);
}
- if (!(key = malloc(sizeof(zoneid_t)))) {
- WARNING("no memory");
+ if (!(key = malloc(sizeof(*key)))) {
+ WARNING("zone plugin: no memory");
+ free(ret);
return(NULL);
}
*key = zoneid;
if (c_avl_insert(tree, key, ret)) {
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);
}
}
return(NULL);
}
}
@@
-119,14
+127,17
@@
zone_find_stats(c_avl_tree_t *tree, zoneid_t zoneid)
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 retrieving zonename");
+ } else {
+ zone_submit_value(zonename, (gauge_t)FRC2PCT(stats->pctcpu));
+ }
free(stats);
free(zoneid);
}
free(stats);
free(zoneid);
}
@@
-136,51
+147,54
@@
zone_submit_values(c_avl_tree_t *tree)
static c_avl_tree_t *
zone_scandir(DIR *procdir)
{
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;
pid_t pid;
dirent_t *direntp;
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((int (*)
- (const void *, const void *))zone_compare))) {
- WARNING("Failed to create tree");
+ if (!(tree=c_avl_create(zone_compare))) {
+ WARNING("zone plugin: Failed to create tree");
return(NULL);
}
return(NULL);
}
- for (rewinddir(procdir); (direntp = readdir(procdir)); ) {
- pidstr = direntp->d_name;
+ rewinddir(procdir);
+ while ((direntp = readdir(procdir))) {
+ char const *pidstr = direntp->d_name;
if (pidstr[0] == '.') /* skip "." and ".." */
continue;
if (pidstr[0] == '.') /* skip "." and ".." */
continue;
+
pid = atoi(pidstr);
if (pid == 0 || pid == 2 || pid == 3)
continue; /* skip sched, pageout and fsflush */
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;
continue;
+
stats = zone_find_stats(tree, psinfo.pr_zoneid);
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);
}
-
static int zone_read (void)
{
DIR *procdir;
c_avl_tree_t *tree;
static int zone_read (void)
{
DIR *procdir;
c_avl_tree_t *tree;
- pagesize = sysconf(_SC_PAGESIZE);
if ((procdir = opendir("/proc")) == NULL) {
if ((procdir = opendir("/proc")) == NULL) {
- ERROR("cannot open /proc directory\n");
-
exit(
1);
+ ERROR("
zone plugin:
cannot open /proc directory\n");
+
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);
}
zone_submit_values(tree); /* this also frees tree */
return (0);
}