X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=src%2Fmemory.c;h=d92ecf30550dd56097c41f9d0108f3b3b18193d6;hb=f8c6d793143453b064c68f92cb17e88302b8bbb9;hp=db7662fba5ff7972efb266461bb5e6c4fa5828ad;hpb=b8248eb10ab5ddcc4cab8b923d483fbe58d8a3e1;p=collectd.git diff --git a/src/memory.c b/src/memory.c index db7662fb..d92ecf30 100644 --- a/src/memory.c +++ b/src/memory.c @@ -1,11 +1,10 @@ /** * collectd - src/memory.c - * Copyright (C) 2005,2006 Florian octo Forster + * Copyright (C) 2005-2007 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 - * Free Software Foundation; either version 2 of the License, or (at your - * option) any later version. + * Free Software Foundation; only version 2 of the License is applicable. * * This program is distributed in the hope that it will be useful, but * WITHOUT ANY WARRANTY; without even the implied warranty of @@ -23,6 +22,7 @@ #include "collectd.h" #include "common.h" #include "plugin.h" +#include "utils_debug.h" #ifdef HAVE_SYS_SYSCTL_H # include @@ -40,34 +40,29 @@ #ifdef HAVE_MACH_HOST_PRIV_H # include #endif -#ifdef MACH_VM_STATISTICS_H +#ifdef HAVE_MACH_VM_STATISTICS_H # include #endif -#if !defined(VM_TOTAL) && defined(VM_METER) -# define VM_TOTAL VM_METER -#endif - -#if defined (HOST_VM_INFO) || defined(VM_TOTAL) || KERNEL_LINUX || HAVE_LIBKSTAT +#if defined (HOST_VM_INFO) || HAVE_SYSCTLBYNAME || KERNEL_LINUX || HAVE_LIBKSTAT # define MEMORY_HAVE_READ 1 #else # define MEMORY_HAVE_READ 0 #endif -#define MODULE_NAME "memory" - -static char *memory_file = "memory.rrd"; +/* 2^48 = 281474976710656 */ +static data_source_t dsrc[4] = +{ + {"used", DS_TYPE_GAUGE, 0, 281474976710656.0}, + {"free", DS_TYPE_GAUGE, 0, 281474976710656.0}, + {"buffers", DS_TYPE_GAUGE, 0, 281474976710656.0}, + {"cached", DS_TYPE_GAUGE, 0, 281474976710656.0} +}; -/* 9223372036854775807 == LLONG_MAX */ -static char *ds_def[] = +static data_set_t ds = { - "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 + "memory", 4, dsrc }; -static int ds_num = 4; /* vm_statistics_data_t */ #if defined(HOST_VM_INFO) @@ -75,9 +70,9 @@ static mach_port_t port_host; static vm_size_t pagesize; /* #endif HOST_VM_INFO */ -#elif defined(VM_TOTAL) +#elif HAVE_SYSCTLBYNAME /* no global variables */ -/* #endif VM_METER */ +/* #endif HAVE_SYSCTLBYNAME */ #elif KERNEL_LINUX /* no global variables */ @@ -88,16 +83,17 @@ static int pagesize; static kstat_t *ksp; #endif /* HAVE_LIBKSTAT */ -static void memory_init (void) +#if MEMORY_HAVE_READ +static int memory_init (void) { #if defined(HOST_VM_INFO) port_host = mach_host_self (); host_page_size (port_host, &pagesize); /* #endif HOST_VM_INFO */ -#elif defined(VM_TOTAL) +#elif HAVE_SYSCTLBYNAME /* no init stuff */ -/* #endif VM_TOTAL */ +/* #endif HAVE_SYSCTLBYNAME */ #elif defined(KERNEL_LINUX) /* no init stuff */ @@ -110,31 +106,30 @@ static void memory_init (void) ksp = NULL; #endif /* HAVE_LIBKSTAT */ - return; -} + return (0); +} /* int memory_init */ -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 static void memory_submit (long long mem_used, long long mem_buffered, long long mem_cached, long long mem_free) { - char buf[BUFSIZE]; + value_t values[4]; + value_list_t vl = VALUE_LIST_INIT; + + values[0].gauge = mem_used; + values[1].gauge = mem_free; + values[2].gauge = mem_buffered; + values[3].gauge = mem_cached; - if (snprintf (buf, BUFSIZE, "%u:%lli:%lli:%lli:%lli", - (unsigned int) curtime, mem_used, mem_free, - mem_buffered, mem_cached) >= BUFSIZE) - return; + vl.values = values; + vl.values_len = 4; + vl.time = time (NULL); + strcpy (vl.host, hostname); + strcpy (vl.plugin, "memory"); - plugin_submit (MODULE_NAME, "-", buf); + plugin_dispatch_values ("memory", &vl); } -#undef BUFSIZE -static void memory_read (void) +static int memory_read (void) { #if defined(HOST_VM_INFO) kern_return_t status; @@ -147,7 +142,7 @@ static void memory_read (void) long long free; if (!port_host || !pagesize) - return; + return (-1); vm_data_len = sizeof (vm_data) / sizeof (natural_t); if ((status = host_statistics (port_host, HOST_VM_INFO, @@ -155,7 +150,7 @@ static void memory_read (void) &vm_data_len)) != KERN_SUCCESS) { syslog (LOG_ERR, "memory-plugin: host_statistics failed and returned the value %i", (int) status); - return; + return (-1); } /* @@ -186,7 +181,7 @@ static void memory_read (void) memory_submit (wired + active, -1, inactive, free); /* #endif HOST_VM_INFO */ -#elif defined(VM_TOTAL) +#elif HAVE_SYSCTLBYNAME /* * vm.stats.vm.v_page_size: 4096 * vm.stats.vm.v_page_count: 246178 @@ -196,47 +191,46 @@ static void memory_read (void) * vm.stats.vm.v_inactive_count: 113730 * vm.stats.vm.v_cache_count: 10809 */ - int page_size; - int page_count; - int free_count; - int wire_count; - int active_count; - int inactive_count; - int cache_count; - size_t data_len; - - int status; - - data_len = sizeof (page_size); - if ((status = sysctlbyname ("vm.stats.vm.v_page_size", - (void *) &page_size, data_len, - NULL, 0)) < 0) - { - syslog (LOG_ERR, "memory plugin: sysctlbyname failed: %s", - strerror (status)); - return; - } - - ... - - status = sysctl (mib, sizeof (mib), - (void *) &data, &data_len, - NULL, 0); /* new value pointer */ - if (status < 0) + char *sysctl_keys[8] = { - DBG ("sysctl failed: %s", strerror (errno)); - return; - } - - if (data_len != sizeof (data)) + "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++) { - DBG ("data_len = %u; sizeof (data) = %u;", - (unsigned int) data_len, - (unsigned int) sizeof (data)); - return; - } - -/* #endif VM_TOTAL */ + 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 (-1); + } + 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; @@ -253,7 +247,7 @@ static void memory_read (void) if ((fh = fopen ("/proc/meminfo", "r")) == NULL) { syslog (LOG_WARNING, "memory: fopen: %s", strerror (errno)); - return; + return (-1); } while (fgets (buffer, 1024, fh) != NULL) @@ -295,16 +289,16 @@ static void memory_read (void) long long mem_lock; if (ksp == NULL) - return; + return (-1); mem_used = get_kstat_value (ksp, "pagestotal"); mem_free = get_kstat_value (ksp, "pagesfree"); mem_lock = get_kstat_value (ksp, "pageslocked"); if ((mem_used < 0LL) || (mem_free < 0LL) || (mem_lock < 0LL)) - return; + return (-1); if (mem_used < (mem_free + mem_lock)) - return; + return (-1); mem_used -= mem_free + mem_lock; mem_used *= pagesize; /* If this overflows you have some serious */ @@ -320,14 +314,17 @@ static void memory_read (void) if ((ios = sg_get_mem_stats ()) != NULL) memory_submit (ios->used, 0LL, ios->cache, ios->free); #endif /* HAVE_LIBSTATGRAB */ + + return (0); } -#else -# define memory_read NULL #endif /* MEMORY_HAVE_READ */ void module_register (void) { - plugin_register (MODULE_NAME, memory_init, memory_read, memory_write); -} + plugin_register_data_set (&ds); -#undef MODULE_NAME +#if MEMORY_HAVE_READ + plugin_register_init ("memory", memory_init); + plugin_register_read ("memory", memory_read); +#endif /* MEMORY_HAVE_READ */ +}