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-4.5'
[collectd.git]
/
src
/
swap.c
diff --git
a/src/swap.c
b/src/swap.c
index
f9debc1
..
8c09e35
100644
(file)
--- a/
src/swap.c
+++ b/
src/swap.c
@@
-56,10
+56,10
@@
static kstat_t *ksp;
/* No global variables */
/* #endif defined(VM_SWAPUSAGE) */
/* No global variables */
/* #endif defined(VM_SWAPUSAGE) */
-#elif HAVE_LIBKVM
+#elif HAVE_LIBKVM
_GETSWAPINFO
static kvm_t *kvm_obj = NULL;
int kvm_pagesize;
static kvm_t *kvm_obj = NULL;
int kvm_pagesize;
-/* #endif HAVE_LIBKVM */
+/* #endif HAVE_LIBKVM
_GETSWAPINFO
*/
#elif HAVE_LIBSTATGRAB
/* No global variables */
#elif HAVE_LIBSTATGRAB
/* No global variables */
@@
-86,7
+86,7
@@
static int swap_init (void)
/* No init stuff */
/* #endif defined(VM_SWAPUSAGE) */
/* No init stuff */
/* #endif defined(VM_SWAPUSAGE) */
-#elif HAVE_LIBKVM
+#elif HAVE_LIBKVM
_GETSWAPINFO
if (kvm_obj != NULL)
{
kvm_close (kvm_obj);
if (kvm_obj != NULL)
{
kvm_close (kvm_obj);
@@
-105,7
+105,7
@@
static int swap_init (void)
ERROR ("swap plugin: kvm_open failed.");
return (-1);
}
ERROR ("swap plugin: kvm_open failed.");
return (-1);
}
-/* #endif HAVE_LIBKVM */
+/* #endif HAVE_LIBKVM
_GETSWAPINFO
*/
#elif HAVE_LIBSTATGRAB
/* No init stuff */
#elif HAVE_LIBSTATGRAB
/* No init stuff */
@@
-260,7
+260,7
@@
static int swap_read (void)
swap_submit ("free", sw_usage.xsu_avail);
/* #endif VM_SWAPUSAGE */
swap_submit ("free", sw_usage.xsu_avail);
/* #endif VM_SWAPUSAGE */
-#elif HAVE_LIBKVM
+#elif HAVE_LIBKVM
_GETSWAPINFO
struct kvm_swap data_s;
int status;
struct kvm_swap data_s;
int status;
@@
-286,7
+286,7
@@
static int swap_read (void)
swap_submit ("used", used);
swap_submit ("free", free);
swap_submit ("used", used);
swap_submit ("free", free);
-/* #endif HAVE_LIBKVM */
+/* #endif HAVE_LIBKVM
_GETSWAPINFO
*/
#elif HAVE_LIBSTATGRAB
sg_swap_stats *swap;
#elif HAVE_LIBSTATGRAB
sg_swap_stats *swap;