X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Fmemory.c;h=d92ecf30550dd56097c41f9d0108f3b3b18193d6;hb=f34da8f00133da85d1538f8bc7dd118f30f853ea;hp=b1a62475161b059626902ee1c22db0d840804f05;hpb=4d25c0e068f0691bba31fa279a1fcf5e263fbb01;p=collectd.git diff --git a/src/memory.c b/src/memory.c index b1a62475..d92ecf30 100644 --- a/src/memory.c +++ b/src/memory.c @@ -1,11 +1,10 @@ /** * collectd - src/memory.c - * Copyright (C) 2005 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,38 +22,47 @@ #include "collectd.h" #include "common.h" #include "plugin.h" +#include "utils_debug.h" + +#ifdef HAVE_SYS_SYSCTL_H +# include +#endif -/* TODO #include */ #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) || defined(KERNEL_LINUX) || defined(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) @@ -62,22 +70,31 @@ static mach_port_t port_host; static vm_size_t pagesize; /* #endif HOST_VM_INFO */ -#elif defined(KERNEL_LINUX) +#elif HAVE_SYSCTLBYNAME +/* no global variables */ +/* #endif HAVE_SYSCTLBYNAME */ + +#elif KERNEL_LINUX /* no global variables */ /* #endif KERNEL_LINUX */ -#elif defined(HAVE_LIBKSTAT) +#elif HAVE_LIBKSTAT 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); + 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 */ @@ -89,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; @@ -126,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, @@ -134,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); } /* @@ -160,11 +176,62 @@ static void memory_read (void) wired = vm_data.wire_count * pagesize; active = vm_data.active_count * pagesize; inactive = vm_data.inactive_count * pagesize; - free = vm_stat.free_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 (-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; char buffer[1024]; @@ -180,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) @@ -222,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 */ @@ -247,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 */ +}