projects
/
collectd.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
src/utils_complain: Changed c_release() into a macro.
[collectd.git]
/
src
/
swap.c
diff --git
a/src/swap.c
b/src/swap.c
index
3018cb9
..
4f0a0ba
100644
(file)
--- a/
src/swap.c
+++ b/
src/swap.c
@@
-36,16
+36,13
@@
# include <kvm.h>
#endif
# include <kvm.h>
#endif
-#if KERNEL_LINUX || HAVE_LIBKSTAT || defined(VM_SWAPUSAGE) || HAVE_LIBKVM || HAVE_LIBSTATGRAB
-# define SWAP_HAVE_READ 1
-#else
-# define SWAP_HAVE_READ 0
+#if HAVE_STATGRAB_H
+# include <statgrab.h>
#endif
#undef MAX
#define MAX(x,y) ((x) > (y) ? (x) : (y))
#endif
#undef MAX
#define MAX(x,y) ((x) > (y) ? (x) : (y))
-#if SWAP_HAVE_READ
#if KERNEL_LINUX
/* No global variables */
/* #endif KERNEL_LINUX */
#if KERNEL_LINUX
/* No global variables */
/* #endif KERNEL_LINUX */
@@
-66,6
+63,10
@@
int kvm_pagesize;
#elif HAVE_LIBSTATGRAB
/* No global variables */
#elif HAVE_LIBSTATGRAB
/* No global variables */
+/* #endif HAVE_LIBSTATGRAB */
+
+#else
+# error "No applicable input method."
#endif /* HAVE_LIBSTATGRAB */
static int swap_init (void)
#endif /* HAVE_LIBSTATGRAB */
static int swap_init (void)
@@
-125,9
+126,10
@@
static void swap_submit (const char *type_instance, double value)
vl.time = time (NULL);
strcpy (vl.host, hostname_g);
strcpy (vl.plugin, "swap");
vl.time = time (NULL);
strcpy (vl.host, hostname_g);
strcpy (vl.plugin, "swap");
- strncpy (vl.type_instance, type_instance, sizeof (vl.type_instance));
+ strcpy (vl.type, "swap");
+ sstrncpy (vl.type_instance, type_instance, sizeof (vl.type_instance));
- plugin_dispatch_values (
"swap",
&vl);
+ plugin_dispatch_values (&vl);
} /* void swap_submit */
static int swap_read (void)
} /* void swap_submit */
static int swap_read (void)
@@
-235,7
+237,7
@@
static int swap_read (void)
swap_submit ("used", swap_alloc);
swap_submit ("free", swap_avail);
swap_submit ("used", swap_alloc);
swap_submit ("free", swap_avail);
- swap_submit ("reserved", swap_resv
- swap_alloc
);
+ swap_submit ("reserved", swap_resv);
/* #endif HAVE_LIBKSTAT */
#elif defined(VM_SWAPUSAGE)
/* #endif HAVE_LIBKSTAT */
#elif defined(VM_SWAPUSAGE)
@@
-300,12
+302,9
@@
static int swap_read (void)
return (0);
} /* int swap_read */
return (0);
} /* int swap_read */
-#endif /* SWAP_HAVE_READ */
void module_register (void)
{
void module_register (void)
{
-#if SWAP_HAVE_READ
plugin_register_init ("swap", swap_init);
plugin_register_read ("swap", swap_read);
plugin_register_init ("swap", swap_init);
plugin_register_read ("swap", swap_read);
-#endif /* SWAP_HAVE_READ */
} /* void module_register */
} /* void module_register */