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 #1454 from rubenk/libi2c-dev-mark-as-linux-only
[collectd.git]
/
src
/
zone.c
diff --git
a/src/zone.c
b/src/zone.c
index
52dd977
..
15eae6a
100644
(file)
--- a/
src/zone.c
+++ b/
src/zone.c
@@
-17,9
+17,18
@@
*
* 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 "common.h"
#include "collectd.h"
#include "common.h"
@@
-59,22
+68,24
@@
zone_compare(const zoneid_t *a, const zoneid_t *b)
}
static int
}
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);
}
@@
-144,7
+155,6
@@
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;
pid_t pid;
dirent_t *direntp;
psinfo_t psinfo;
@@
-156,16
+166,19
@@
zone_scandir(DIR *procdir)
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);
if( stats ) {
stats->pctcpu += psinfo.pr_pctcpu;
stats = zone_find_stats(tree, psinfo.pr_zoneid);
if( stats ) {
stats->pctcpu += psinfo.pr_pctcpu;
@@
-175,7
+188,6
@@
zone_scandir(DIR *procdir)
return(tree);
}
return(tree);
}
-
static int zone_read (void)
{
DIR *procdir;
static int zone_read (void)
{
DIR *procdir;
@@
-188,6
+200,9
@@
static int zone_read (void)
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);
}