X-Git-Url: https://git.octo.it/?p=collectd.git;a=blobdiff_plain;f=src%2Fvmem.c;h=c3ccbe624c9d794a00fb4e1a9495fb05e9c870c8;hp=25f7c70cd3c15b581f0f22f3252e921c82373c33;hb=633c3966f770e4d46651a2fe219a18d8a9907a9f;hpb=68ab7da7a51018a00e6e03347182b988a30296a7 diff --git a/src/vmem.c b/src/vmem.c index 25f7c70c..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" @@ -45,7 +50,6 @@ static void submit (const char *plugin_instance, const char *type, vl.values = values; vl.values_len = values_len; - vl.time = time (NULL); sstrncpy (vl.host, hostname_g, sizeof (vl.host)); sstrncpy (vl.plugin, "vmem", sizeof (vl.plugin)); if (plugin_instance != NULL) @@ -58,12 +62,12 @@ static void submit (const char *plugin_instance, const char *type, } /* 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 */ @@ -78,9 +82,7 @@ static int vmem_config (const char *key, const char *value) { if (strcasecmp ("Verbose", key) == 0) { - if ((strcasecmp ("true", value) == 0) - || (strcasecmp ("yes", value) == 0) - || (strcasecmp ("on", value) == 0)) + if (IS_TRUE (value)) verbose_output = 1; else verbose_output = 0; @@ -96,16 +98,16 @@ static int vmem_config (const char *key, const char *value) 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; @@ -126,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)); @@ -208,31 +210,31 @@ static int vmem_read (void) else if (strncmp ("pgalloc_", key, strlen ("pgalloc_")) == 0) { char *inst = key + strlen ("pgalloc_"); - value_t value = { .counter = counter }; + 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 = { .counter = counter }; + 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 = { .counter = counter }; + 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 = { .counter = counter }; + 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 = { .counter = counter }; + value_t value = { .derive = counter }; submit_one (inst, "vmpage_action", "scan_direct", value); } @@ -244,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) */