# include <mach/vm_statistics.h>
#endif
-#if defined (HOST_VM_INFO) || HAVE_SYSCTLBYNAME || KERNEL_LINUX || HAVE_LIBKSTAT
-# define MEMORY_HAVE_READ 1
-#else
-# define MEMORY_HAVE_READ 0
-#endif
-
-/* 2^48 = 281474976710656 */
-static data_source_t dsrc[4] =
-{
- {"value", DS_TYPE_GAUGE, 0, 281474976710656.0}
-};
-
-static data_set_t ds =
-{
- "memory", 1, dsrc
-};
-
/* vm_statistics_data_t */
#if defined(HOST_VM_INFO)
static mach_port_t port_host;
#elif HAVE_LIBKSTAT
static int pagesize;
static kstat_t *ksp;
-#endif /* HAVE_LIBKSTAT */
+/* #endif HAVE_LIBKSTAT */
+
+#else
+# error "No applicable input method."
+#endif
-#if MEMORY_HAVE_READ
static int memory_init (void)
{
#if defined(HOST_VM_INFO)
values[0].gauge = value;
vl.values = values;
- vl.values_len = 4;
+ vl.values_len = 1;
vl.time = time (NULL);
strcpy (vl.host, hostname_g);
strcpy (vl.plugin, "memory");
};
double sysctl_vals[8];
- size_t len;
int i;
for (i = 0; sysctl_keys[i] != NULL; i++)
sysctl_vals[i] *= sysctl_vals[0];
memory_submit ("free", sysctl_vals[2]);
- memory_submit ("wired", sysctl_vals[2]);
- memory_submit ("active", sysctl_vals[2]);
- memory_submit ("inactive", sysctl_vals[2]);
- memory_submit ("cache", sysctl_vals[2]);
+ memory_submit ("wired", sysctl_vals[3]);
+ memory_submit ("active", sysctl_vals[4]);
+ memory_submit ("inactive", sysctl_vals[5]);
+ memory_submit ("cache", sysctl_vals[6]);
/* #endif HAVE_SYSCTLBYNAME */
#elif defined(KERNEL_LINUX)
{
mem_used -= mem_free + mem_buffered + mem_cached;
memory_submit ("used", mem_used);
- memory_submit ("buffered", mem_used);
- memory_submit ("cached", mem_used);
- memory_submit ("free", mem_used);
-
+ memory_submit ("buffered", mem_buffered);
+ memory_submit ("cached", mem_cached);
+ memory_submit ("free", mem_free);
}
/* #endif defined(KERNEL_LINUX) */
memory_submit ("used", mem_used);
memory_submit ("free", mem_free);
- memory_submit ("locked", mem_locked);
+ memory_submit ("locked", mem_lock);
/* #endif defined(HAVE_LIBKSTAT) */
#elif defined(HAVE_LIBSTATGRAB)
return (0);
}
-#endif /* MEMORY_HAVE_READ */
-void module_register (modreg_e load)
+void module_register (void)
{
- if (load & MR_DATASETS)
- plugin_register_data_set (&ds);
-
-#if MEMORY_HAVE_READ
- if (load & MR_READ)
- {
- plugin_register_init ("memory", memory_init);
- plugin_register_read ("memory", memory_read);
- }
-#endif /* MEMORY_HAVE_READ */
+ plugin_register_init ("memory", memory_init);
+ plugin_register_read ("memory", memory_read);
} /* void module_register */