X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=src%2Fmemory.c;h=b8b7229f6de74db7f6a2161370c58f08934ff28b;hb=fae34a369b1001291ca7e1b51f364c42946698d4;hp=6ae35cbbd3aa7f533d2ac66bbc67c5e929dce32e;hpb=73681054cbff428d352d8ed707d24fab1bf67b24;p=collectd.git diff --git a/src/memory.c b/src/memory.c index 6ae35cbb..b8b7229f 100644 --- a/src/memory.c +++ b/src/memory.c @@ -1,6 +1,6 @@ /** * collectd - src/memory.c - * Copyright (C) 2005 Florian octo Forster + * Copyright (C) 2005,2006 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 @@ -23,8 +23,29 @@ #include "collectd.h" #include "common.h" #include "plugin.h" +#include "utils_debug.h" -#if defined(KERNEL_LINUX) || defined(HAVE_LIBKSTAT) +#ifdef HAVE_SYS_SYSCTL_H +# include +#endif + +#ifdef HAVE_MACH_KERN_RETURN_H +# include +#endif +#ifdef HAVE_MACH_MACH_INIT_H +# include +#endif +#ifdef HAVE_MACH_MACH_HOST_H +# include +#endif +#ifdef HAVE_MACH_HOST_PRIV_H +# include +#endif +#ifdef HAVE_MACH_VM_STATISTICS_H +# include +#endif + +#if defined (HOST_VM_INFO) || HAVE_SYSCTLBYNAME || KERNEL_LINUX || HAVE_LIBKSTAT # define MEMORY_HAVE_READ 1 #else # define MEMORY_HAVE_READ 0 @@ -37,22 +58,49 @@ static char *memory_file = "memory.rrd"; /* 9223372036854775807 == LLONG_MAX */ static char *ds_def[] = { - "DS:used:GAUGE:25:0:9223372036854775807", - "DS:free:GAUGE:25:0:9223372036854775807", - "DS:buffers:GAUGE:25:0:9223372036854775807", - "DS:cached:GAUGE:25:0:9223372036854775807", + "DS:used:GAUGE:"COLLECTD_HEARTBEAT":0:9223372036854775807", + "DS:free:GAUGE:"COLLECTD_HEARTBEAT":0:9223372036854775807", + "DS:buffers:GAUGE:"COLLECTD_HEARTBEAT":0:9223372036854775807", + "DS:cached:GAUGE:"COLLECTD_HEARTBEAT":0:9223372036854775807", NULL }; static int ds_num = 4; -#ifdef HAVE_LIBKSTAT +/* vm_statistics_data_t */ +#if defined(HOST_VM_INFO) +static mach_port_t port_host; +static vm_size_t pagesize; +/* #endif HOST_VM_INFO */ + +#elif HAVE_SYSCTLBYNAME +/* no global variables */ +/* #endif HAVE_SYSCTLBYNAME */ + +#elif KERNEL_LINUX +/* no global variables */ +/* #endif KERNEL_LINUX */ + +#elif HAVE_LIBKSTAT static int pagesize; static kstat_t *ksp; #endif /* HAVE_LIBKSTAT */ -void memory_init (void) +static void memory_init (void) { -#ifdef HAVE_LIBKSTAT +#if defined(HOST_VM_INFO) + port_host = mach_host_self (); + host_page_size (port_host, &pagesize); +/* #endif HOST_VM_INFO */ + +#elif HAVE_SYSCTLBYNAME +/* no init stuff */ +/* #endif HAVE_SYSCTLBYNAME */ + +#elif defined(KERNEL_LINUX) +/* no init stuff */ +/* #endif KERNEL_LINUX */ + +#elif defined(HAVE_LIBKSTAT) /* getpagesize(3C) tells me this does not fail.. */ pagesize = getpagesize (); if (get_kstat (&ksp, "unix", 0, "system_pages")) @@ -62,13 +110,14 @@ void memory_init (void) return; } -void memory_write (char *host, char *inst, char *val) +static void memory_write (char *host, char *inst, char *val) { rrd_update_file (host, memory_file, val, ds_def, ds_num); } +#if MEMORY_HAVE_READ #define BUFSIZE 512 -void memory_submit (long long mem_used, long long mem_buffered, +static void memory_submit (long long mem_used, long long mem_buffered, long long mem_cached, long long mem_free) { char buf[BUFSIZE]; @@ -82,10 +131,110 @@ void memory_submit (long long mem_used, long long mem_buffered, } #undef BUFSIZE -#if MEMORY_HAVE_READ -void memory_read (void) +static void memory_read (void) { -#ifdef KERNEL_LINUX +#if defined(HOST_VM_INFO) + kern_return_t status; + vm_statistics_data_t vm_data; + mach_msg_type_number_t vm_data_len; + + long long wired; + long long active; + long long inactive; + long long free; + + if (!port_host || !pagesize) + return; + + vm_data_len = sizeof (vm_data) / sizeof (natural_t); + if ((status = host_statistics (port_host, HOST_VM_INFO, + (host_info_t) &vm_data, + &vm_data_len)) != KERN_SUCCESS) + { + syslog (LOG_ERR, "memory-plugin: host_statistics failed and returned the value %i", (int) status); + return; + } + + /* + * From : + * + * Wired memory + * This information can't be cached to disk, so it must stay in RAM. + * The amount depends on what applications you are using. + * + * Active memory + * This information is currently in RAM and actively being used. + * + * Inactive memory + * This information is no longer being used and has been cached to + * disk, but it will remain in RAM until another application needs + * the space. Leaving this information in RAM is to your advantage if + * you (or a client of your computer) come back to it later. + * + * Free memory + * This memory is not being used. + */ + + wired = vm_data.wire_count * pagesize; + active = vm_data.active_count * pagesize; + inactive = vm_data.inactive_count * pagesize; + free = vm_data.free_count * pagesize; + + memory_submit (wired + active, -1, inactive, free); +/* #endif HOST_VM_INFO */ + +#elif HAVE_SYSCTLBYNAME + /* + * vm.stats.vm.v_page_size: 4096 + * vm.stats.vm.v_page_count: 246178 + * vm.stats.vm.v_free_count: 28760 + * vm.stats.vm.v_wire_count: 37526 + * vm.stats.vm.v_active_count: 55239 + * vm.stats.vm.v_inactive_count: 113730 + * vm.stats.vm.v_cache_count: 10809 + */ + char *sysctl_keys[8] = + { + "vm.stats.vm.v_page_size", + "vm.stats.vm.v_page_count", + "vm.stats.vm.v_free_count", + "vm.stats.vm.v_wire_count", + "vm.stats.vm.v_active_count", + "vm.stats.vm.v_inactive_count", + "vm.stats.vm.v_cache_count", + NULL + }; + int sysctl_vals[8] = { -1, -1, -1, -1, -1, -1, -1, -1 }; + + size_t len; + int i; + int status; + + for (i = 0; sysctl_keys[i] != NULL; i++) + { + len = sizeof (int); + if ((status = sysctlbyname (sysctl_keys[i], + (void *) &sysctl_vals[i], &len, + NULL, 0)) < 0) + { + syslog (LOG_ERR, "memory plugin: sysctlbyname (%s): %s", + sysctl_keys[i], strerror (errno)); + return; + } + DBG ("%26s: %6i", sysctl_keys[i], sysctl_vals[i]); + } /* for i */ + + /* multiply all all page counts with the pagesize */ + for (i = 1; sysctl_keys[i] != NULL; i++) + sysctl_vals[i] = sysctl_vals[i] * sysctl_vals[0]; + + memory_submit (sysctl_vals[3] + sysctl_vals[4], /* wired + active */ + sysctl_vals[6], /* cache */ + sysctl_vals[5], /* inactive */ + sysctl_vals[2]); /* free */ +/* #endif HAVE_SYSCTLBYNAME */ + +#elif defined(KERNEL_LINUX) FILE *fh; char buffer[1024]; @@ -168,17 +317,13 @@ void memory_read (void) memory_submit (ios->used, 0LL, ios->cache, ios->free); #endif /* HAVE_LIBSTATGRAB */ } +#else +# define memory_read NULL #endif /* MEMORY_HAVE_READ */ void module_register (void) { - plugin_register (MODULE_NAME, memory_init, -#if MEMORY_HAVE_READ - memory_read, -#else - NULL, -#endif - memory_write); + plugin_register (MODULE_NAME, memory_init, memory_read, memory_write); } #undef MODULE_NAME