X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=src%2Fnfs.c;h=1a4ed7487b0566378092edb3f6d8b3b84d49adab;hb=1e74bb66c61d965c4aa261adfaf058f3356cff09;hp=f3c636ecce9cd14aead260b9cfdd3149750b5c31;hpb=2652653c3db161442d28709d79c3f2d81ab571ee;p=collectd.git diff --git a/src/nfs.c b/src/nfs.c index f3c636ec..1a4ed748 100644 --- a/src/nfs.c +++ b/src/nfs.c @@ -1,6 +1,7 @@ /** * collectd - src/nfs.c * Copyright (C) 2005,2006 Jason Pepas + * Copyright (C) 2012,2013 Florian 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 @@ -17,15 +18,16 @@ * * Authors: * Jason Pepas - * Florian octo Forster + * Florian octo Forster + * Cosmin Ioiart **/ #include "collectd.h" #include "common.h" #include "plugin.h" -#if !KERNEL_LINUX -# error "No applicable input method." +#if HAVE_KSTAT_H +#include #endif /* @@ -92,10 +94,9 @@ static const char *nfs2_procedures_names[] = "mkdir", "rmdir", "readdir", - "fsstat", - NULL + "fsstat" }; -static int nfs2_procedures_names_num = 18; +static size_t nfs2_procedures_names_num = STATIC_ARRAY_SIZE (nfs2_procedures_names); static const char *nfs3_procedures_names[] = { @@ -120,12 +121,57 @@ static const char *nfs3_procedures_names[] = "fsstat", "fsinfo", "pathconf", + "commit" +}; +static size_t nfs3_procedures_names_num = STATIC_ARRAY_SIZE (nfs3_procedures_names); + +#if HAVE_LIBKSTAT +static const char *nfs4_procedures_names[] = +{ + "null", + "compound", + "reserved", + "access", + "close", "commit", - NULL + "create", + "delegpurge", + "delegreturn", + "getattr", + "getfh", + "link", + "lock", + "lockt", + "locku", + "lookup", + "lookupp", + "nverify", + "open", + "openattr", + "open_confirm", + "open_downgrade", + "putfh", + "putpubfh", + "putrootfh", + "read", + "readdir", + "readlink", + "remove", + "rename", + "renew", + "restorefh", + "savefh", + "secinfo", + "setattr", + "setclientid", + "setclientid_confirm", + "verify", + "write" }; -static int nfs3_procedures_names_num = 22; +static size_t nfs4_procedures_names_num = STATIC_ARRAY_SIZE (nfs4_procedures_names); +#endif -#if HAVE_LIBKSTAT && 0 +#if HAVE_LIBKSTAT extern kstat_ctl_t *kc; static kstat_t *nfs2_ksp_client; static kstat_t *nfs2_ksp_server; @@ -137,11 +183,17 @@ static kstat_t *nfs4_ksp_server; /* Possibly TODO: NFSv4 statistics */ -#if 0 +#if KERNEL_LINUX static int nfs_init (void) { -#if HAVE_LIBKSTAT && 0 - kstat_t *ksp_chain; + return (0); +} +/* #endif KERNEL_LINUX */ + +#elif HAVE_LIBKSTAT +static int nfs_init (void) +{ + kstat_t *ksp_chain = NULL; nfs2_ksp_client = NULL; nfs2_ksp_server = NULL; @@ -149,9 +201,9 @@ static int nfs_init (void) nfs3_ksp_server = NULL; nfs4_ksp_client = NULL; nfs4_ksp_server = NULL; - + if (kc == NULL) - return; + return (-1); for (ksp_chain = kc->kc_chain; ksp_chain != NULL; ksp_chain = ksp_chain->ks_next) @@ -171,192 +223,174 @@ static int nfs_init (void) else if (strncmp (ksp_chain->ks_name, "rfsreqcnt_v4", 12) == 0) nfs4_ksp_client = ksp_chain; } -#endif return (0); } /* int nfs_init */ #endif -#define BUFSIZE 1024 static void nfs_procedures_submit (const char *plugin_instance, - unsigned long long *val, const char **names, int len) + const char **type_instances, + value_t *values, size_t values_num) { - value_t values[1]; value_list_t vl = VALUE_LIST_INIT; - int i; + size_t i; - vl.values = values; vl.values_len = 1; sstrncpy (vl.host, hostname_g, sizeof (vl.host)); sstrncpy (vl.plugin, "nfs", sizeof (vl.plugin)); sstrncpy (vl.plugin_instance, plugin_instance, - sizeof (vl.plugin_instance)); + sizeof (vl.plugin_instance)); sstrncpy (vl.type, "nfs_procedure", sizeof (vl.type)); - for (i = 0; i < len; i++) + for (i = 0; i < values_num; i++) { - values[0].derive = val[i]; - sstrncpy (vl.type_instance, names[i], + vl.values = values + i; + sstrncpy (vl.type_instance, type_instances[i], sizeof (vl.type_instance)); - DEBUG ("%s-%s/nfs_procedure-%s = %llu", - vl.plugin, vl.plugin_instance, - vl.type_instance, val[i]); - plugin_dispatch_values (&vl); + plugin_dispatch_values_secure (&vl); } } /* void nfs_procedures_submit */ -static void nfs_read_stats_file (FILE *fh, char *inst) +#if KERNEL_LINUX +static int nfs_submit_fields (int nfs_version, const char *instance, + char **fields, size_t fields_num, + const char **proc_names, size_t proc_names_num) { - char buffer[BUFSIZE]; - char plugin_instance[DATA_MAX_NAME_LEN]; + value_t values[fields_num]; + size_t i; + + if (fields_num != proc_names_num) + { + WARNING ("nfs plugin: Wrong number of fields for " + "NFSv%i %s statistics. Expected %zu, got %zu.", + nfs_version, instance, + proc_names_num, fields_num); + return (EINVAL); + } + + ssnprintf (plugin_instance, sizeof (plugin_instance), "v%i%s", + nfs_version, instance); + + for (i = 0; i < proc_names_num; i++) + (void) parse_value (fields[i], &values[i], DS_TYPE_DERIVE); + + nfs_procedures_submit (plugin_instance, proc_names, values, + proc_names_num); + + return (0); +} + +static void nfs_read_linux (FILE *fh, char *inst) +{ + char buffer[1024]; char *fields[48]; - int numfields = 0; + int fields_num = 0; if (fh == NULL) return; - while (fgets (buffer, BUFSIZE, fh) != NULL) + while (fgets (buffer, sizeof (buffer), fh) != NULL) { - numfields = strsplit (buffer, fields, 48); + fields_num = strsplit (buffer, + fields, STATIC_ARRAY_SIZE (fields)); - if (((numfields - 2) != nfs2_procedures_names_num) - && ((numfields - 2) - != nfs3_procedures_names_num)) + if (fields_num < 3) continue; if (strcmp (fields[0], "proc2") == 0) { - int i; - unsigned long long *values; - - if ((numfields - 2) != nfs2_procedures_names_num) - { - WARNING ("nfs plugin: Wrong " - "number of fields (= %i) " - "for NFSv2 statistics.", - numfields - 2); - continue; - } - - ssnprintf (plugin_instance, sizeof (plugin_instance), - "v2%s", inst); - - values = (unsigned long long *) malloc (nfs2_procedures_names_num * sizeof (unsigned long long)); - if (values == NULL) - { - char errbuf[1024]; - ERROR ("nfs plugin: malloc " - "failed: %s", - sstrerror (errno, errbuf, sizeof (errbuf))); - continue; - } - - for (i = 0; i < nfs2_procedures_names_num; i++) - values[i] = atoll (fields[i + 2]); - - nfs_procedures_submit (plugin_instance, values, + nfs_submit_fields (/* version = */ 2, inst, + fields + 2, (size_t) (fields_num - 2), nfs2_procedures_names, nfs2_procedures_names_num); - - free (values); } else if (strncmp (fields[0], "proc3", 5) == 0) { - int i; - unsigned long long *values; - - if ((numfields - 2) != nfs3_procedures_names_num) - { - WARNING ("nfs plugin: Wrong " - "number of fields (= %i) " - "for NFSv3 statistics.", - numfields - 2); - continue; - } - - ssnprintf (plugin_instance, sizeof (plugin_instance), - "v3%s", inst); - - values = (unsigned long long *) malloc (nfs3_procedures_names_num * sizeof (unsigned long long)); - if (values == NULL) - { - char errbuf[1024]; - ERROR ("nfs plugin: malloc " - "failed: %s", - sstrerror (errno, errbuf, sizeof (errbuf))); - continue; - } - - for (i = 0; i < nfs3_procedures_names_num; i++) - values[i] = atoll (fields[i + 2]); - - nfs_procedures_submit (plugin_instance, values, + nfs_submit_fields (/* version = */ 3, inst, + fields + 2, (size_t) (fields_num - 2), nfs3_procedures_names, nfs3_procedures_names_num); - - free (values); } - } /* while (fgets (buffer, BUFSIZE, fh) != NULL) */ -} /* void nfs_read_stats_file */ -#undef BUFSIZE + } /* while (fgets) */ +} /* void nfs_read_linux */ +#endif /* KERNEL_LINUX */ -#if HAVE_LIBKSTAT && 0 -static void nfs2_read_kstat (kstat_t *ksp, char *inst) +#if HAVE_LIBKSTAT +static int nfs_read_kstat (kstat_t *ksp, int nfs_version, char *inst, + char const **proc_names, size_t proc_names_num) { - unsigned long long values[18]; - - values[0] = get_kstat_value (ksp, "null"); - values[1] = get_kstat_value (ksp, "getattr"); - values[2] = get_kstat_value (ksp, "setattr"); - values[3] = get_kstat_value (ksp, "root"); - values[4] = get_kstat_value (ksp, "lookup"); - values[5] = get_kstat_value (ksp, "readlink"); - values[6] = get_kstat_value (ksp, "read"); - values[7] = get_kstat_value (ksp, "wrcache"); - values[8] = get_kstat_value (ksp, "write"); - values[9] = get_kstat_value (ksp, "create"); - values[10] = get_kstat_value (ksp, "remove"); - values[11] = get_kstat_value (ksp, "rename"); - values[12] = get_kstat_value (ksp, "link"); - values[13] = get_kstat_value (ksp, "symlink"); - values[14] = get_kstat_value (ksp, "mkdir"); - values[15] = get_kstat_value (ksp, "rmdir"); - values[16] = get_kstat_value (ksp, "readdir"); - values[17] = get_kstat_value (ksp, "statfs"); - - nfs2_procedures_submit (values, inst); + char plugin_instance[DATA_MAX_NAME_LEN]; + value_t values[proc_names_num]; + size_t i; + + if (ksp == NULL) + return (EINVAL); + + ssnprintf (plugin_instance, sizeof (plugin_instance), "v%i%s", + nfs_version, inst); + + kstat_read(kc, ksp, NULL); + for (i = 0; i < proc_names_num; i++) + { + /* The name passed to kstat_data_lookup() doesn't have the + * "const" modifier, so we need to copy the name here. */ + char name[32]; + sstrncpy (name, proc_names[i], sizeof (name)); + + values[i].counter = (derive_t) get_kstat_value (ksp, name); + } + + nfs_procedures_submit (plugin_instance, proc_names, values, + proc_names_num); + return (0); } #endif +#if KERNEL_LINUX static int nfs_read (void) { FILE *fh; if ((fh = fopen ("/proc/net/rpc/nfs", "r")) != NULL) { - nfs_read_stats_file (fh, "client"); + nfs_read_linux (fh, "client"); fclose (fh); } if ((fh = fopen ("/proc/net/rpc/nfsd", "r")) != NULL) { - nfs_read_stats_file (fh, "server"); + nfs_read_linux (fh, "server"); fclose (fh); } -#if HAVE_LIBKSTAT && 0 - if (nfs2_ksp_client != NULL) - nfs2_read_kstat (nfs2_ksp_client, "client"); - if (nfs2_ksp_server != NULL) - nfs2_read_kstat (nfs2_ksp_server, "server"); -#endif /* defined(HAVE_LIBKSTAT) */ + return (0); +} +/* #endif KERNEL_LINUX */ + +#elif HAVE_LIBKSTAT +static int nfs_read (void) +{ + nfs_read_kstat (nfs2_ksp_client, /* version = */ 2, "client", + nfs2_procedures_names, nfs2_procedures_names_num); + nfs_read_kstat (nfs2_ksp_server, /* version = */ 2, "server", + nfs2_procedures_names, nfs2_procedures_names_num); + nfs_read_kstat (nfs3_ksp_client, /* version = */ 3, "client", + nfs3_procedures_names, nfs3_procedures_names_num); + nfs_read_kstat (nfs3_ksp_server, /* version = */ 3, "server", + nfs3_procedures_names, nfs3_procedures_names_num); + nfs_read_kstat (nfs4_ksp_client, /* version = */ 4, "client", + nfs4_procedures_names, nfs4_procedures_names_num); + nfs_read_kstat (nfs4_ksp_server, /* version = */ 4, "server", + nfs4_procedures_names, nfs4_procedures_names_num); return (0); } +#endif /* HAVE_LIBKSTAT */ void module_register (void) { + plugin_register_init ("nfs", nfs_init); plugin_register_read ("nfs", nfs_read); } /* void module_register */