/**
* collectd - src/memory.c
- * Copyright (C) 2005-2007 Florian octo Forster
+ * Copyright (C) 2005-2008 Florian octo Forster
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
# include <mach/vm_statistics.h>
#endif
+#if HAVE_STATGRAB_H
+# include <statgrab.h>
+#endif
+
/* vm_statistics_data_t */
-#if defined(HOST_VM_INFO)
+#if HAVE_HOST_STATISTICS
static mach_port_t port_host;
static vm_size_t pagesize;
-/* #endif HOST_VM_INFO */
+/* #endif HAVE_HOST_STATISTICS */
#elif HAVE_SYSCTLBYNAME
/* no global variables */
static kstat_t *ksp;
/* #endif HAVE_LIBKSTAT */
+#elif HAVE_LIBSTATGRAB
+/* no global variables */
+/* endif HAVE_LIBSTATGRAB */
+
#else
# error "No applicable input method."
#endif
static int memory_init (void)
{
-#if defined(HOST_VM_INFO)
+#if HAVE_HOST_STATISTICS
port_host = mach_host_self ();
host_page_size (port_host, &pagesize);
-/* #endif HOST_VM_INFO */
+/* #endif HAVE_HOST_STATISTICS */
#elif HAVE_SYSCTLBYNAME
/* no init stuff */
#elif defined(HAVE_LIBKSTAT)
/* getpagesize(3C) tells me this does not fail.. */
pagesize = getpagesize ();
- if (get_kstat (&ksp, "unix", 0, "system_pages"))
+ if (get_kstat (&ksp, "unix", 0, "system_pages") != 0)
+ {
ksp = NULL;
+ return (-1);
+ }
#endif /* HAVE_LIBKSTAT */
return (0);
vl.values = values;
vl.values_len = 1;
- vl.time = time (NULL);
- strcpy (vl.host, hostname_g);
- strcpy (vl.plugin, "memory");
- strncpy (vl.type_instance, type_instance, sizeof (vl.type_instance));
- vl.type_instance[sizeof (vl.type_instance) - 1] = '\0';
+ sstrncpy (vl.host, hostname_g, sizeof (vl.host));
+ sstrncpy (vl.plugin, "memory", sizeof (vl.plugin));
+ sstrncpy (vl.type, "memory", sizeof (vl.type));
+ sstrncpy (vl.type_instance, type_instance, sizeof (vl.type_instance));
- plugin_dispatch_values ("memory", &vl);
+ plugin_dispatch_values (&vl);
}
static int memory_read (void)
{
-#if defined(HOST_VM_INFO)
+#if HAVE_HOST_STATISTICS
kern_return_t status;
vm_statistics_data_t vm_data;
mach_msg_type_number_t vm_data_len;
memory_submit ("active", active);
memory_submit ("inactive", inactive);
memory_submit ("free", free);
-/* #endif HOST_VM_INFO */
+/* #endif HAVE_HOST_STATISTICS */
#elif HAVE_SYSCTLBYNAME
/*
NULL, 0) == 0)
{
sysctl_vals[i] = value;
- DEBUG ("memory plugin: %26s: %6i", sysctl_keys[i], sysctl_vals[i]);
+ DEBUG ("memory plugin: %26s: %g", sysctl_keys[i], sysctl_vals[i]);
}
else
{
memory_submit ("cache", sysctl_vals[6]);
/* #endif HAVE_SYSCTLBYNAME */
-#elif defined(KERNEL_LINUX)
+#elif KERNEL_LINUX
FILE *fh;
char buffer[1024];
memory_submit ("cached", mem_cached);
memory_submit ("free", mem_free);
}
-/* #endif defined(KERNEL_LINUX) */
+/* #endif KERNEL_LINUX */
-#elif defined(HAVE_LIBKSTAT)
+#elif HAVE_LIBKSTAT
long long mem_used;
long long mem_free;
long long mem_lock;
memory_submit ("used", mem_used);
memory_submit ("free", mem_free);
memory_submit ("locked", mem_lock);
-/* #endif defined(HAVE_LIBKSTAT) */
+/* #endif HAVE_LIBKSTAT */
-#elif defined(HAVE_LIBSTATGRAB)
+#elif HAVE_LIBSTATGRAB
sg_mem_stats *ios;
if ((ios = sg_get_mem_stats ()) != NULL)
{
memory_submit ("used", ios->used);
- memory_submit ("cached", ios->cached);
+ memory_submit ("cached", ios->cache);
memory_submit ("free", ios->free);
}
#endif /* HAVE_LIBSTATGRAB */