-#endif /* HAVE_LIBKSTAT */
+/* #endif HAVE_LIBKSTAT */
+
+#elif HAVE_LIBSTATGRAB
+/* no global variables */
+/* endif HAVE_LIBSTATGRAB */
+
+#else
+# error "No applicable input method."
+#endif
port_host = mach_host_self ();
host_page_size (port_host, &pagesize);
port_host = mach_host_self ();
host_page_size (port_host, &pagesize);
- strcpy (vl.host, hostname_g);
- strcpy (vl.plugin, "memory");
+ sstrncpy (vl.host, hostname_g, sizeof (vl.host));
+ sstrncpy (vl.plugin, "memory", sizeof (vl.plugin));
strncpy (vl.type_instance, type_instance, sizeof (vl.type_instance));
vl.type_instance[sizeof (vl.type_instance) - 1] = '\0';
strncpy (vl.type_instance, type_instance, sizeof (vl.type_instance));
vl.type_instance[sizeof (vl.type_instance) - 1] = '\0';
memory_submit ("active", active);
memory_submit ("inactive", inactive);
memory_submit ("free", free);
memory_submit ("active", active);
memory_submit ("inactive", inactive);
memory_submit ("free", free);
sysctl_vals[i] *= sysctl_vals[0];
memory_submit ("free", sysctl_vals[2]);
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]);
{
mem_used -= mem_free + mem_buffered + mem_cached;
memory_submit ("used", mem_used);
{
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);
memory_submit ("used", mem_used);
memory_submit ("free", mem_free);
memory_submit ("used", mem_used);
memory_submit ("free", mem_free);
- memory_submit ("locked", mem_locked);
-/* #endif defined(HAVE_LIBKSTAT) */
+ memory_submit ("locked", mem_lock);
+/* #endif HAVE_LIBKSTAT */
sg_mem_stats *ios;
if ((ios = sg_get_mem_stats ()) != NULL)
{
memory_submit ("used", ios->used);
sg_mem_stats *ios;
if ((ios = sg_get_mem_stats ()) != NULL)
{
memory_submit ("used", ios->used);
memory_submit ("free", ios->free);
}
#endif /* HAVE_LIBSTATGRAB */
return (0);
}
memory_submit ("free", ios->free);
}
#endif /* HAVE_LIBSTATGRAB */
return (0);
}
plugin_register_init ("memory", memory_init);
plugin_register_read ("memory", memory_read);
plugin_register_init ("memory", memory_init);
plugin_register_read ("memory", memory_read);