projects
/
collectd.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge pull request #1876 from octo/issue/1819
[collectd.git]
/
src
/
zone.c
diff --git
a/src/zone.c
b/src/zone.c
index
6a01b29
..
3751bfd
100644
(file)
--- a/
src/zone.c
+++ b/
src/zone.c
@@
-17,16
+17,24
@@
*
* 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 <procfs.h>
#include <zone.h>
@@
-40,41
+48,35
@@
typedef struct zone_stats {
ushort_t pctmem;
} zone_stats_t;
ushort_t pctmem;
} zone_stats_t;
-static long pagesize;
-
-static int zone_init (void)
-{
- pagesize = sysconf(_SC_PAGESIZE);
- return (0);
-}
-
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);
}
@@
-104,12
+106,13
@@
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)))) {
+ if (!(ret = malloc(sizeof(
*re
t)))) {
WARNING("zone plugin: no memory");
return(NULL);
}
WARNING("zone plugin: no memory");
return(NULL);
}
- if (!(key = malloc(sizeof(
zoneid_t
)))) {
+ if (!(key = malloc(sizeof(
*key
)))) {
WARNING("zone plugin: no memory");
WARNING("zone plugin: no memory");
+ free(ret);
return(NULL);
}
*key = zoneid;
return(NULL);
}
*key = zoneid;
@@
-144,28
+147,30
@@
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;
- if (!(tree=c_avl_create(
(void *)
zone_compare))) {
+ if (!(tree=c_avl_create(zone_compare))) {
WARNING("zone plugin: Failed to create tree");
return(NULL);
}
WARNING("zone plugin: Failed to create tree");
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);
if( stats ) {
stats->pctcpu += psinfo.pr_pctcpu;
stats = zone_find_stats(tree, psinfo.pr_zoneid);
if( stats ) {
stats->pctcpu += psinfo.pr_pctcpu;
@@
-175,7
+180,6
@@
zone_scandir(DIR *procdir)
return(tree);
}
return(tree);
}
-
static int zone_read (void)
{
DIR *procdir;
static int zone_read (void)
{
DIR *procdir;
@@
-183,17
+187,19
@@
static int zone_read (void)
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 */