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 #1842 from rubenk/declare-loop-variable-in-for-loop-controlling...
[collectd.git]
/
src
/
df.c
diff --git
a/src/df.c
b/src/df.c
index
3f9eabd
..
83be176
100644
(file)
--- a/
src/df.c
+++ b/
src/df.c
@@
-17,11
+17,12
@@
* 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*
* Authors:
* 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*
* Authors:
- * Florian octo Forster <octo at
verplant
.org>
+ * Florian octo Forster <octo at
collectd
.org>
* Paul Sadauskas <psadauskas at gmail.com>
**/
#include "collectd.h"
* Paul Sadauskas <psadauskas at gmail.com>
**/
#include "collectd.h"
+
#include "common.h"
#include "plugin.h"
#include "configfile.h"
#include "common.h"
#include "plugin.h"
#include "configfile.h"
@@
-53,7
+54,6
@@
static const char *config_keys[] =
"FSType",
"IgnoreSelected",
"ReportByDevice",
"FSType",
"IgnoreSelected",
"ReportByDevice",
- "ReportReserved",
"ReportInodes",
"ValuesAbsolute",
"ValuesPercentage"
"ReportInodes",
"ValuesAbsolute",
"ValuesPercentage"
@@
-191,7
+191,6
@@
static int df_read (void)
#endif
/* struct STATANYFS statbuf; */
cu_mount_t *mnt_list;
#endif
/* struct STATANYFS statbuf; */
cu_mount_t *mnt_list;
- cu_mount_t *mnt_ptr;
mnt_list = NULL;
if (cu_mount_getlist (&mnt_list) == NULL)
mnt_list = NULL;
if (cu_mount_getlist (&mnt_list) == NULL)
@@
-200,11
+199,11
@@
static int df_read (void)
return (-1);
}
return (-1);
}
- for (mnt_ptr = mnt_list; mnt_ptr != NULL; mnt_ptr = mnt_ptr->next)
+ for (
cu_mount_t *
mnt_ptr = mnt_list; mnt_ptr != NULL; mnt_ptr = mnt_ptr->next)
{
unsigned long long blocksize;
char disk_name[256];
{
unsigned long long blocksize;
char disk_name[256];
-
cu_mount_t *mnt_
dup_ptr;
+
cu_mount_t *
dup_ptr;
uint64_t blk_free;
uint64_t blk_reserved;
uint64_t blk_used;
uint64_t blk_free;
uint64_t blk_reserved;
uint64_t blk_used;
@@
-220,20
+219,27
@@
static int df_read (void)
if (ignorelist_match (il_fstype, mnt_ptr->type))
continue;
if (ignorelist_match (il_fstype, mnt_ptr->type))
continue;
- /*
ignore duplicates
*/
- for (
mnt_dup_ptr = mnt_ptr; mnt_dup_ptr != NULL; mnt_dup_ptr = mnt_
dup_ptr->next)
+ /*
search for duplicates *in front of* the current mnt_ptr.
*/
+ for (
dup_ptr = mnt_list; dup_ptr != NULL; dup_ptr =
dup_ptr->next)
{
{
- if (by_device) {
- if (strcmp (mnt_ptr->spec_device, mnt_dup_ptr->spec_device) == 0)
- continue;
- }
- else
+ /* No duplicate found: mnt_ptr is the first of its kind. */
+ if (dup_ptr == mnt_ptr)
{
{
- if (strcmp (mnt_ptr->dir, mnt_dup_ptr->dir) == 0)
-
continue
;
+ dup_ptr = NULL;
+
break
;
}
}
+
+ /* Duplicate found: leave non-NULL dup_ptr. */
+ if (by_device && (strcmp (mnt_ptr->spec_device, dup_ptr->spec_device) == 0))
+ break;
+ else if (!by_device && (strcmp (mnt_ptr->dir, dup_ptr->dir) == 0))
+ break;
}
}
+ /* ignore duplicates */
+ if (dup_ptr != NULL)
+ continue;
+
if (STATANYFS (mnt_ptr->dir, &statbuf) < 0)
{
char errbuf[1024];
if (STATANYFS (mnt_ptr->dir, &statbuf) < 0)
{
char errbuf[1024];
@@
-264,19
+270,15
@@
static int df_read (void)
else
{
if (strcmp (mnt_ptr->dir, "/") == 0)
else
{
if (strcmp (mnt_ptr->dir, "/") == 0)
- {
- if (strcmp (mnt_ptr->type, "rootfs") == 0)
- continue;
sstrncpy (disk_name, "root", sizeof (disk_name));
sstrncpy (disk_name, "root", sizeof (disk_name));
- }
else
{
else
{
- int
i,
len;
+ int len;
sstrncpy (disk_name, mnt_ptr->dir + 1, sizeof (disk_name));
len = strlen (disk_name);
sstrncpy (disk_name, mnt_ptr->dir + 1, sizeof (disk_name));
len = strlen (disk_name);
- for (i = 0; i < len; i++)
+ for (i
nt i
= 0; i < len; i++)
if (disk_name[i] == '/')
disk_name[i] = '-';
}
if (disk_name[i] == '/')
disk_name[i] = '-';
}