X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Fmemory.c;h=ea16ce315f102126d7ca0f497ea8d153fb6c2339;hb=73de67494a4f5d9a698f2a5ab93f85e19bccb90a;hp=a4b21dab18104935c137d1c53f70e012775cd143;hpb=bf67ab648e6d835dd53f81791cfb6b651a2ba814;p=collectd.git diff --git a/src/memory.c b/src/memory.c index a4b21dab..ea16ce31 100644 --- a/src/memory.c +++ b/src/memory.c @@ -18,7 +18,7 @@ * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA * * Authors: - * Florian octo Forster + * Florian octo Forster * Simon Kuhnle * Manuel Sanmartin **/ @@ -30,6 +30,9 @@ #ifdef HAVE_SYS_SYSCTL_H # include #endif +#ifdef HAVE_SYS_VMMETER_H +# include +#endif #ifdef HAVE_MACH_KERN_RETURN_H # include @@ -73,6 +76,7 @@ static vm_size_t pagesize; #elif HAVE_LIBKSTAT static int pagesize; static kstat_t *ksp; +static kstat_t *ksz; /* #endif HAVE_LIBKSTAT */ #elif HAVE_SYSCTL @@ -134,6 +138,12 @@ static int memory_init (void) ksp = NULL; return (-1); } + if (get_kstat (&ksz, "zfs", 0, "arcstats") != 0) + { + ksz = NULL; + return (-1); + } + /* #endif HAVE_LIBKSTAT */ #elif HAVE_SYSCTL @@ -155,32 +165,14 @@ static int memory_init (void) return (0); } /* int memory_init */ -static void memory_submit (const char *type_instance, gauge_t value, gauge_t total) -{ - value_t values[1]; - value_list_t vl = VALUE_LIST_INIT; - - vl.values = values; - vl.values_len = 1; - sstrncpy (vl.host, hostname_g, sizeof (vl.host)); - sstrncpy (vl.plugin, "memory", sizeof (vl.plugin)); - sstrncpy (vl.type_instance, type_instance, sizeof (vl.type_instance)); +#define MEMORY_SUBMIT(...) do { \ + if (values_absolute) \ + plugin_dispatch_multivalue (vl, 0, DS_TYPE_GAUGE, __VA_ARGS__, NULL); \ + if (values_percentage) \ + plugin_dispatch_multivalue (vl, 1, DS_TYPE_GAUGE, __VA_ARGS__, NULL); \ +} while (0) - if (values_absolute) - { - values[0].gauge = value; - sstrncpy (vl.type, "memory", sizeof (vl.type)); - plugin_dispatch_values (&vl); - } - if (values_percentage) - { - values[0].gauge = 100.0 * value / total; - sstrncpy (vl.type, "percent", sizeof (vl.type)); - plugin_dispatch_values (&vl); - } -} - -static int memory_read (void) +static int memory_read_internal (value_list_t *vl) { #if HAVE_HOST_STATISTICS kern_return_t status; @@ -191,7 +183,6 @@ static int memory_read (void) gauge_t active; gauge_t inactive; gauge_t free; - gauge_t total; if (!port_host || !pagesize) return (-1); @@ -229,12 +220,11 @@ static int memory_read (void) active = (gauge_t) (((uint64_t) vm_data.active_count) * ((uint64_t) pagesize)); inactive = (gauge_t) (((uint64_t) vm_data.inactive_count) * ((uint64_t) pagesize)); free = (gauge_t) (((uint64_t) vm_data.free_count) * ((uint64_t) pagesize)); - total = wired + active + inactive + free; - memory_submit ("wired", wired, total); - memory_submit ("active", active, total); - memory_submit ("inactive", inactive, total); - memory_submit ("free", free, total); + MEMORY_SUBMIT ("wired", wired, + "active", active, + "inactive", inactive, + "free", free); /* #endif HAVE_HOST_STATISTICS */ #elif HAVE_SYSCTLBYNAME @@ -259,7 +249,6 @@ static int memory_read (void) NULL }; double sysctl_vals[8]; - gauge_t total; int i; @@ -285,12 +274,11 @@ static int memory_read (void) if (!isnan (sysctl_vals[i])) sysctl_vals[i] *= sysctl_vals[0]; - total = sysctl_vals[2] + sysctl_vals[3] + sysctl_vals[4] + sysctl_vals[5] + sysctl_vals[6]; - memory_submit ("free", sysctl_vals[2], total); - memory_submit ("wired", sysctl_vals[3], total); - memory_submit ("active", sysctl_vals[4], total); - memory_submit ("inactive", sysctl_vals[5], total); - memory_submit ("cache", sysctl_vals[6], total); + MEMORY_SUBMIT ("free", (gauge_t) sysctl_vals[2], + "wired", (gauge_t) sysctl_vals[3], + "active", (gauge_t) sysctl_vals[4], + "inactive", (gauge_t) sysctl_vals[5], + "cache", (gauge_t) sysctl_vals[6]); /* #endif HAVE_SYSCTLBYNAME */ #elif KERNEL_LINUX @@ -300,11 +288,16 @@ static int memory_read (void) char *fields[8]; int numfields; - long long mem_total = 0; - long long mem_used = 0; - long long mem_buffered = 0; - long long mem_cached = 0; - long long mem_free = 0; + _Bool detailed_slab_info = 0; + + gauge_t mem_total = 0; + gauge_t mem_used = 0; + gauge_t mem_buffered = 0; + gauge_t mem_cached = 0; + gauge_t mem_free = 0; + gauge_t mem_slab_total = 0; + gauge_t mem_slab_reclaimable = 0; + gauge_t mem_slab_unreclaimable = 0; if ((fh = fopen ("/proc/meminfo", "r")) == NULL) { @@ -314,9 +307,9 @@ static int memory_read (void) return (-1); } - while (fgets (buffer, 1024, fh) != NULL) + while (fgets (buffer, sizeof (buffer), fh) != NULL) { - long long *val = NULL; + gauge_t *val = NULL; if (strncasecmp (buffer, "MemTotal:", 9) == 0) val = &mem_total; @@ -326,15 +319,24 @@ static int memory_read (void) val = &mem_buffered; else if (strncasecmp (buffer, "Cached:", 7) == 0) val = &mem_cached; + else if (strncasecmp (buffer, "Slab:", 5) == 0) + val = &mem_slab_total; + else if (strncasecmp (buffer, "SReclaimable:", 13) == 0) { + val = &mem_slab_reclaimable; + detailed_slab_info = 1; + } + else if (strncasecmp (buffer, "SUnreclaim:", 11) == 0) { + val = &mem_slab_unreclaimable; + detailed_slab_info = 1; + } else continue; - numfields = strsplit (buffer, fields, 8); - + numfields = strsplit (buffer, fields, STATIC_ARRAY_SIZE (fields)); if (numfields < 2) continue; - *val = atoll (fields[1]) * 1024LL; + *val = 1024.0 * atof (fields[1]); } if (fclose (fh)) @@ -344,25 +346,40 @@ static int memory_read (void) sstrerror (errno, errbuf, sizeof (errbuf))); } - if (mem_total < (mem_free + mem_buffered + mem_cached)) - return (0); + if (mem_total < (mem_free + mem_buffered + mem_cached + mem_slab_total)) + return (-1); - mem_used = mem_total - (mem_free + mem_buffered + mem_cached); - memory_submit ("used", (gauge_t) mem_used, (gauge_t) mem_total); - memory_submit ("buffered", (gauge_t) mem_buffered, (gauge_t) mem_total); - memory_submit ("cached", (gauge_t) mem_cached, (gauge_t) mem_total); - memory_submit ("free", (gauge_t) mem_free, (gauge_t) mem_total); + mem_used = mem_total - (mem_free + mem_buffered + mem_cached + mem_slab_total); + + /* SReclaimable and SUnreclaim were introduced in kernel 2.6.19 + * They sum up to the value of Slab, which is available on older & newer + * kernels. So SReclaimable/SUnreclaim are submitted if available, and Slab + * if not. */ + if (detailed_slab_info) + MEMORY_SUBMIT ("used", mem_used, + "buffered", mem_buffered, + "cached", mem_cached, + "free", mem_free, + "slab_unrecl", mem_slab_unreclaimable, + "slab_recl", mem_slab_reclaimable); + else + MEMORY_SUBMIT ("used", mem_used, + "buffered", mem_buffered, + "cached", mem_cached, + "free", mem_free, + "slab", mem_slab_total); /* #endif KERNEL_LINUX */ #elif HAVE_LIBKSTAT - /* Most of the additions here were taken as-is from the k9toolkit from - * Brendan Gregg and are subject to change I guess */ + /* Most of the additions here were taken as-is from the k9toolkit from + * Brendan Gregg and are subject to change I guess */ long long mem_used; long long mem_free; long long mem_lock; long long mem_kern; long long mem_unus; - long long mem_total; + long long arcsize; + long long pp_kernel; long long physmem; @@ -370,17 +387,20 @@ static int memory_read (void) if (ksp == NULL) return (-1); + if (ksz == NULL) + return (-1); mem_used = get_kstat_value (ksp, "pagestotal"); mem_free = get_kstat_value (ksp, "pagesfree"); mem_lock = get_kstat_value (ksp, "pageslocked"); - mem_kern = 0; - mem_unus = 0; - + arcsize = get_kstat_value (ksz, "size"); pp_kernel = get_kstat_value (ksp, "pp_kernel"); physmem = get_kstat_value (ksp, "physmem"); availrmem = get_kstat_value (ksp, "availrmem"); + mem_kern = 0; + mem_unus = 0; + if ((mem_used < 0LL) || (mem_free < 0LL) || (mem_lock < 0LL)) { WARNING ("memory plugin: one of used, free or locked is negative."); @@ -423,13 +443,15 @@ static int memory_read (void) mem_lock *= pagesize; /* some? ;) */ mem_kern *= pagesize; /* it's 2011 RAM is cheap */ mem_unus *= pagesize; - mem_total = mem_used + mem_free + mem_lock + mem_kern + mem_unus; + mem_kern -= arcsize; + - memory_submit ("used", (gauge_t) mem_used, (gauge_t) mem_total); - memory_submit ("free", (gauge_t) mem_free, (gauge_t) mem_total); - memory_submit ("locked", (gauge_t) mem_lock, (gauge_t) mem_total); - memory_submit ("kernel", (gauge_t) mem_kern, (gauge_t) mem_total); - memory_submit ("unusable", (gauge_t) mem_unus, (gauge_t) mem_total); + MEMORY_SUBMIT ("used", (gauge_t) mem_used, + "free", (gauge_t) mem_free, + "locked", (gauge_t) mem_lock, + "kernel", (gauge_t) mem_kern, + "arc", (gauge_t) arcsize, + "unusable", (gauge_t) mem_unus); /* #endif HAVE_LIBKSTAT */ #elif HAVE_SYSCTL @@ -438,7 +460,6 @@ static int memory_read (void) gauge_t mem_active; gauge_t mem_inactive; gauge_t mem_free; - gauge_t mem_total; size_t size; memset (&vmtotal, 0, sizeof (vmtotal)); @@ -455,25 +476,22 @@ static int memory_read (void) mem_active = (gauge_t) (vmtotal.t_arm * pagesize); mem_inactive = (gauge_t) ((vmtotal.t_rm - vmtotal.t_arm) * pagesize); mem_free = (gauge_t) (vmtotal.t_free * pagesize); - mem_total = mem_active + mem_inactive + mem_free; - memory_submit ("active", mem_active, mem_total); - memory_submit ("inactive", mem_inactive, mem_total); - memory_submit ("free", mem_free, mem_total); + MEMORY_SUBMIT ("active", mem_active, + "inactive", mem_inactive, + "free", mem_free); /* #endif HAVE_SYSCTL */ #elif HAVE_LIBSTATGRAB sg_mem_stats *ios; - gauge_t total; ios = sg_get_mem_stats (); if (ios == NULL) return (-1); - total = (gauge_t) (ios->used + ios->cache + ios->free); - memory_submit ("used", (gauge_t) ios->used, total); - memory_submit ("cached", (gauge_t) ios->cache, total); - memory_submit ("free", (gauge_t) ios->free, total); + MEMORY_SUBMIT ("used", (gauge_t) ios->used, + "cached", (gauge_t) ios->cache, + "free", (gauge_t) ios->free); /* #endif HAVE_LIBSTATGRAB */ #elif HAVE_PERFSTAT @@ -498,14 +516,29 @@ static int memory_read (void) * real_total = real_free + real_inuse * real_inuse = "active" + real_pinned + numperm */ - memory_submit ("free", pmemory.real_free * pagesize, pmemory.real_total * pagesize); - memory_submit ("cached", pmemory.numperm * pagesize, pmemory.real_total * pagesize); - memory_submit ("system", pmemory.real_system * pagesize, pmemory.real_total * pagesize); - memory_submit ("user", pmemory.real_process * pagesize, pmemory.real_total * pagesize); + MEMORY_SUBMIT ("free", (gauge_t) (pmemory.real_free * pagesize), + "cached", (gauge_t) (pmemory.numperm * pagesize), + "system", (gauge_t) (pmemory.real_system * pagesize), + "user", (gauge_t) (pmemory.real_process * pagesize)); #endif /* HAVE_PERFSTAT */ return (0); -} +} /* }}} int memory_read_internal */ + +static int memory_read (void) /* {{{ */ +{ + value_t v[1]; + value_list_t vl = VALUE_LIST_INIT; + + vl.values = v; + vl.values_len = STATIC_ARRAY_SIZE (v); + sstrncpy (vl.host, hostname_g, sizeof (vl.host)); + sstrncpy (vl.plugin, "memory", sizeof (vl.plugin)); + sstrncpy (vl.type, "memory", sizeof (vl.type)); + vl.time = cdtime (); + + return (memory_read_internal (&vl)); +} /* }}} int memory_read */ void module_register (void) {