X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Fvmem.c;h=5341e1594798b9eb24b0826f489e87054ad80a78;hb=633c3966f770e4d46651a2fe219a18d8a9907a9f;hp=3235cb6868570c42bb97414f5070c419d22d71c2;hpb=7b6abfd016cda55f7c4e858db09da16444fc1fb5;p=collectd.git diff --git a/src/vmem.c b/src/vmem.c index 3235cb68..c3ccbe62 100644 --- a/src/vmem.c +++ b/src/vmem.c @@ -1,22 +1,27 @@ /** * collectd - src/vmem.c - * Copyright (C) 2008 Florian octo Forster + * Copyright (C) 2008-2010 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; only version 2 of the License is applicable. + * Permission is hereby granted, free of charge, to any person obtaining a + * copy of this software and associated documentation files (the "Software"), + * to deal in the Software without restriction, including without limitation + * the rights to use, copy, modify, merge, publish, distribute, sublicense, + * and/or sell copies of the Software, and to permit persons to whom the + * Software is furnished to do so, subject to the following conditions: * - * This program is distributed in the hope that it will be useful, but - * WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. + * The above copyright notice and this permission notice shall be included in + * all copies or substantial portions of the Software. * - * You should have received a copy of the GNU General Public License along - * with this program; if not, write to the Free Software Foundation, Inc., - * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING + * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER + * DEALINGS IN THE SOFTWARE. * * Authors: - * Florian octo Forster + * Florian octo Forster **/ #include "collectd.h" @@ -24,7 +29,13 @@ #include "plugin.h" #if KERNEL_LINUX -/* No global variables */ +static const char *config_keys[] = +{ + "Verbose" +}; +static int config_keys_num = STATIC_ARRAY_SIZE (config_keys); + +static int verbose_output = 0; /* #endif KERNEL_LINUX */ #else @@ -39,24 +50,24 @@ static void submit (const char *plugin_instance, const char *type, vl.values = values; vl.values_len = values_len; - vl.time = time (NULL); - strcpy (vl.host, hostname_g); - strcpy (vl.plugin, "vmem"); + sstrncpy (vl.host, hostname_g, sizeof (vl.host)); + sstrncpy (vl.plugin, "vmem", sizeof (vl.plugin)); if (plugin_instance != NULL) sstrncpy (vl.plugin_instance, plugin_instance, sizeof (vl.plugin_instance)); + sstrncpy (vl.type, type, sizeof (vl.type)); if (type_instance != NULL) sstrncpy (vl.type_instance, type_instance, sizeof (vl.type_instance)); - plugin_dispatch_values (type, &vl); + plugin_dispatch_values (&vl); } /* void vmem_submit */ static void submit_two (const char *plugin_instance, const char *type, - const char *type_instance, counter_t c0, counter_t c1) + const char *type_instance, derive_t c0, derive_t c1) { value_t values[2]; - values[0].counter = c0; - values[1].counter = c1; + values[0].derive = c0; + values[1].derive = c1; submit (plugin_instance, type, type_instance, values, 2); } /* void submit_one */ @@ -67,19 +78,36 @@ static void submit_one (const char *plugin_instance, const char *type, submit (plugin_instance, type, type_instance, &value, 1); } /* void submit_one */ +static int vmem_config (const char *key, const char *value) +{ + if (strcasecmp ("Verbose", key) == 0) + { + if (IS_TRUE (value)) + verbose_output = 1; + else + verbose_output = 0; + } + else + { + return (-1); + } + + return (0); +} /* int vmem_config */ + static int vmem_read (void) { #if KERNEL_LINUX - counter_t pgpgin = 0; - counter_t pgpgout = 0; + derive_t pgpgin = 0; + derive_t pgpgout = 0; int pgpgvalid = 0; - counter_t pswpin = 0; - counter_t pswpout = 0; + derive_t pswpin = 0; + derive_t pswpout = 0; int pswpvalid = 0; - counter_t pgfault = 0; - counter_t pgmajfault = 0; + derive_t pgfault = 0; + derive_t pgmajfault = 0; int pgfaultvalid = 0; FILE *fh; @@ -100,7 +128,7 @@ static int vmem_read (void) int fields_num; char *key; char *endptr; - counter_t counter; + derive_t counter; gauge_t gauge; fields_num = strsplit (buffer, fields, STATIC_ARRAY_SIZE (fields)); @@ -131,41 +159,6 @@ static int vmem_read (void) submit_one (NULL, "vmpage_number", inst, value); } - /* - * Number of page allocations, refills, steals and scans. This is collected - * ``per zone'', i. e. for DMA, DMA32, normal and possibly highmem. - */ - else if (strncmp ("pgalloc_", key, strlen ("pgalloc_")) == 0) - { - char *inst = key + strlen ("pgalloc_"); - value_t value = { .counter = counter }; - submit_one (inst, "vmpage_action", "alloc", value); - } - else if (strncmp ("pgrefill_", key, strlen ("pgrefill_")) == 0) - { - char *inst = key + strlen ("pgrefill_"); - value_t value = { .counter = counter }; - submit_one (inst, "vmpage_action", "refill", value); - } - else if (strncmp ("pgsteal_", key, strlen ("pgsteal_")) == 0) - { - char *inst = key + strlen ("pgsteal_"); - value_t value = { .counter = counter }; - submit_one (inst, "vmpage_action", "steal", value); - } - else if (strncmp ("pgscan_kswapd_", key, strlen ("pgscan_kswapd_")) == 0) - { - char *inst = key + strlen ("pgscan_kswapd_"); - value_t value = { .counter = counter }; - submit_one (inst, "vmpage_action", "scan_kswapd", value); - } - else if (strncmp ("pgscan_direct_", key, strlen ("pgscan_direct_")) == 0) - { - char *inst = key + strlen ("pgscan_direct_"); - value_t value = { .counter = counter }; - submit_one (inst, "vmpage_action", "scan_direct", value); - } - /* * Page in and page outs. For memory and swap. */ @@ -205,6 +198,47 @@ static int vmem_read (void) } /* + * Skip the other statistics if verbose output is disabled. + */ + else if (verbose_output == 0) + continue; + + /* + * Number of page allocations, refills, steals and scans. This is collected + * ``per zone'', i. e. for DMA, DMA32, normal and possibly highmem. + */ + else if (strncmp ("pgalloc_", key, strlen ("pgalloc_")) == 0) + { + char *inst = key + strlen ("pgalloc_"); + value_t value = { .derive = counter }; + submit_one (inst, "vmpage_action", "alloc", value); + } + else if (strncmp ("pgrefill_", key, strlen ("pgrefill_")) == 0) + { + char *inst = key + strlen ("pgrefill_"); + value_t value = { .derive = counter }; + submit_one (inst, "vmpage_action", "refill", value); + } + else if (strncmp ("pgsteal_", key, strlen ("pgsteal_")) == 0) + { + char *inst = key + strlen ("pgsteal_"); + value_t value = { .derive = counter }; + submit_one (inst, "vmpage_action", "steal", value); + } + else if (strncmp ("pgscan_kswapd_", key, strlen ("pgscan_kswapd_")) == 0) + { + char *inst = key + strlen ("pgscan_kswapd_"); + value_t value = { .derive = counter }; + submit_one (inst, "vmpage_action", "scan_kswapd", value); + } + else if (strncmp ("pgscan_direct_", key, strlen ("pgscan_direct_")) == 0) + { + char *inst = key + strlen ("pgscan_direct_"); + value_t value = { .derive = counter }; + submit_one (inst, "vmpage_action", "scan_direct", value); + } + + /* * Page action * * number of pages moved to the active or inactive lists and freed, i. e. @@ -212,17 +246,17 @@ static int vmem_read (void) */ else if (strcmp ("pgfree", key) == 0) { - value_t value = { .counter = counter }; + value_t value = { .derive = counter }; submit_one (NULL, "vmpage_action", "free", value); } else if (strcmp ("pgactivate", key) == 0) { - value_t value = { .counter = counter }; + value_t value = { .derive = counter }; submit_one (NULL, "vmpage_action", "activate", value); } else if (strcmp ("pgdeactivate", key) == 0) { - value_t value = { .counter = counter }; + value_t value = { .derive = counter }; submit_one (NULL, "vmpage_action", "deactivate", value); } } /* while (fgets) */ @@ -245,7 +279,9 @@ static int vmem_read (void) void module_register (void) { - plugin_register_read ("vmem", vmem_read); + plugin_register_config ("vmem", vmem_config, + config_keys, config_keys_num); + plugin_register_read ("vmem", vmem_read); } /* void module_register */ /* vim: set sw=2 sts=2 ts=8 : */