projects / collectd.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
Merged revisions 640 and 642 from `trunk' to `tags/collectd-3.9.1'
[collectd.git] / src / nfs.c
diff --git a/src/nfs.c b/src/nfs.c
index 0333113..efb8dc6 100644 (file)
--- a/src/nfs.c
+++ b/src/nfs.c
@@ -1,6 +1,6 @@
 /**
  * collectd - src/nfs.c
- * Copyright (C) 2005  Jason Pepas
+ * Copyright (C) 2005,2006  Jason Pepas
  *
  * 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
@@ -83,52 +83,52 @@ Number      Procedures  Procedures
 
 static char *nfs2_procedures_ds_def[] =
 {
-       "DS:null:COUNTER:25:0:U",
-       "DS:getattr:COUNTER:25:0:U",
-       "DS:setattr:COUNTER:25:0:U",
-       "DS:root:COUNTER:25:0:U",
-       "DS:lookup:COUNTER:25:0:U",
-       "DS:readlink:COUNTER:25:0:U",
-       "DS:read:COUNTER:25:0:U",
-       "DS:wrcache:COUNTER:25:0:U",
-       "DS:write:COUNTER:25:0:U",
-       "DS:create:COUNTER:25:0:U",
-       "DS:remove:COUNTER:25:0:U",
-       "DS:rename:COUNTER:25:0:U",
-       "DS:link:COUNTER:25:0:U",
-       "DS:symlink:COUNTER:25:0:U",
-       "DS:mkdir:COUNTER:25:0:U",
-       "DS:rmdir:COUNTER:25:0:U",
-       "DS:readdir:COUNTER:25:0:U",
-       "DS:fsstat:COUNTER:25:0:U",
+       "DS:null:COUNTER:"COLLECTD_HEARTBEAT":0:U",
+       "DS:getattr:COUNTER:"COLLECTD_HEARTBEAT":0:U",
+       "DS:setattr:COUNTER:"COLLECTD_HEARTBEAT":0:U",
+       "DS:root:COUNTER:"COLLECTD_HEARTBEAT":0:U",
+       "DS:lookup:COUNTER:"COLLECTD_HEARTBEAT":0:U",
+       "DS:readlink:COUNTER:"COLLECTD_HEARTBEAT":0:U",
+       "DS:read:COUNTER:"COLLECTD_HEARTBEAT":0:U",
+       "DS:wrcache:COUNTER:"COLLECTD_HEARTBEAT":0:U",
+       "DS:write:COUNTER:"COLLECTD_HEARTBEAT":0:U",
+       "DS:create:COUNTER:"COLLECTD_HEARTBEAT":0:U",
+       "DS:remove:COUNTER:"COLLECTD_HEARTBEAT":0:U",
+       "DS:rename:COUNTER:"COLLECTD_HEARTBEAT":0:U",
+       "DS:link:COUNTER:"COLLECTD_HEARTBEAT":0:U",
+       "DS:symlink:COUNTER:"COLLECTD_HEARTBEAT":0:U",
+       "DS:mkdir:COUNTER:"COLLECTD_HEARTBEAT":0:U",
+       "DS:rmdir:COUNTER:"COLLECTD_HEARTBEAT":0:U",
+       "DS:readdir:COUNTER:"COLLECTD_HEARTBEAT":0:U",
+       "DS:fsstat:COUNTER:"COLLECTD_HEARTBEAT":0:U",
        NULL
 };
 static int nfs2_procedures_ds_num = 18;
 
 static char *nfs3_procedures_ds_def[] =
 {
-       "DS:null:COUNTER:25:0:U",
-       "DS:getattr:COUNTER:25:0:U",
-       "DS:setattr:COUNTER:25:0:U",
-       "DS:lookup:COUNTER:25:0:U",
-       "DS:access:COUNTER:25:0:U",
-       "DS:readlink:COUNTER:25:0:U",
-       "DS:read:COUNTER:25:0:U",
-       "DS:write:COUNTER:25:0:U",
-       "DS:create:COUNTER:25:0:U",
-       "DS:mkdir:COUNTER:25:0:U",
-       "DS:symlink:COUNTER:25:0:U",
-       "DS:mknod:COUNTER:25:0:U",
-       "DS:remove:COUNTER:25:0:U",
-       "DS:rmdir:COUNTER:25:0:U",
-       "DS:rename:COUNTER:25:0:U",
-       "DS:link:COUNTER:25:0:U",
-       "DS:readdir:COUNTER:25:0:U",
-       "DS:readdirplus:COUNTER:25:0:U",
-       "DS:fsstat:COUNTER:25:0:U",
-       "DS:fsinfo:COUNTER:25:0:U",
-       "DS:pathconf:COUNTER:25:0:U",
-       "DS:commit:COUNTER:25:0:U",
+       "DS:null:COUNTER:"COLLECTD_HEARTBEAT":0:U",
+       "DS:getattr:COUNTER:"COLLECTD_HEARTBEAT":0:U",
+       "DS:setattr:COUNTER:"COLLECTD_HEARTBEAT":0:U",
+       "DS:lookup:COUNTER:"COLLECTD_HEARTBEAT":0:U",
+       "DS:access:COUNTER:"COLLECTD_HEARTBEAT":0:U",
+       "DS:readlink:COUNTER:"COLLECTD_HEARTBEAT":0:U",
+       "DS:read:COUNTER:"COLLECTD_HEARTBEAT":0:U",
+       "DS:write:COUNTER:"COLLECTD_HEARTBEAT":0:U",
+       "DS:create:COUNTER:"COLLECTD_HEARTBEAT":0:U",
+       "DS:mkdir:COUNTER:"COLLECTD_HEARTBEAT":0:U",
+       "DS:symlink:COUNTER:"COLLECTD_HEARTBEAT":0:U",
+       "DS:mknod:COUNTER:"COLLECTD_HEARTBEAT":0:U",
+       "DS:remove:COUNTER:"COLLECTD_HEARTBEAT":0:U",
+       "DS:rmdir:COUNTER:"COLLECTD_HEARTBEAT":0:U",
+       "DS:rename:COUNTER:"COLLECTD_HEARTBEAT":0:U",
+       "DS:link:COUNTER:"COLLECTD_HEARTBEAT":0:U",
+       "DS:readdir:COUNTER:"COLLECTD_HEARTBEAT":0:U",
+       "DS:readdirplus:COUNTER:"COLLECTD_HEARTBEAT":0:U",
+       "DS:fsstat:COUNTER:"COLLECTD_HEARTBEAT":0:U",
+       "DS:fsinfo:COUNTER:"COLLECTD_HEARTBEAT":0:U",
+       "DS:pathconf:COUNTER:"COLLECTD_HEARTBEAT":0:U",
+       "DS:commit:COUNTER:"COLLECTD_HEARTBEAT":0:U",
        NULL
 };
 static int nfs3_procedures_ds_num = 22;
@@ -145,7 +145,7 @@ static kstat_t *nfs4_ksp_server;
 
 /* Possibly TODO: NFSv4 statistics */
 
-void nfs_init (void)
+static void nfs_init (void)
 {
 #ifdef HAVE_LIBKSTAT
        kstat_t *ksp_chain;
@@ -184,7 +184,7 @@ void nfs_init (void)
 }
 
 #define BUFSIZE 1024
-void nfs2_procedures_write (char *host, char *inst, char *val)
+static void nfs2_procedures_write (char *host, char *inst, char *val)
 {
        char filename[BUFSIZE];
 
@@ -195,7 +195,7 @@ void nfs2_procedures_write (char *host, char *inst, char *val)
                        nfs2_procedures_ds_num);
 }
 
-void nfs3_procedures_write (char *host, char *inst, char *val)
+static void nfs3_procedures_write (char *host, char *inst, char *val)
 {
        char filename[BUFSIZE];
 
@@ -206,7 +206,8 @@ void nfs3_procedures_write (char *host, char *inst, char *val)
                        nfs3_procedures_ds_num);
 }
 
-void nfs2_procedures_submit (unsigned long long *val, char *inst)
+#if NFS_HAVE_READ
+static void nfs2_procedures_submit (unsigned long long *val, char *inst)
 {
        char buf[BUFSIZE];
        int retval = 0;
@@ -231,7 +232,7 @@ void nfs2_procedures_submit (unsigned long long *val, char *inst)
        plugin_submit ("nfs2_procedures", inst, buf);
 }
 
-void nfs3_procedures_submit (unsigned long long *val, char *inst)
+static void nfs3_procedures_submit (unsigned long long *val, char *inst)
 {
        char buf[BUFSIZE];
        int retval = 0;
@@ -255,9 +256,10 @@ void nfs3_procedures_submit (unsigned long long *val, char *inst)
 
        plugin_submit("nfs3_procedures", inst, buf);
 }
+#endif /* NFS_HAVE_READ */
 
 #if defined(KERNEL_LINUX)
-void nfs_read_stats_file (FILE *fh, char *inst)
+static void nfs_read_stats_file (FILE *fh, char *inst)
 {
        char buffer[BUFSIZE];
 
@@ -328,7 +330,7 @@ void nfs_read_stats_file (FILE *fh, char *inst)
 #undef BUFSIZE
 
 #ifdef HAVE_LIBKSTAT
-void nfs2_read_kstat (kstat_t *ksp, char *inst)
+static void nfs2_read_kstat (kstat_t *ksp, char *inst)
 {
        unsigned long long values[18];
 
@@ -356,7 +358,7 @@ void nfs2_read_kstat (kstat_t *ksp, char *inst)
 #endif
 
 #if NFS_HAVE_READ
-void nfs_read (void)
+static void nfs_read (void)
 {
 #if defined(KERNEL_LINUX)
        FILE *fh;
@@ -382,17 +384,13 @@ void nfs_read (void)
                nfs2_read_kstat (nfs2_ksp_server, "server");
 #endif /* defined(HAVE_LIBKSTAT) */
 }
+#else
+# define nfs_read NULL
 #endif /* NFS_HAVE_READ */
 
 void module_register (void)
 {
-       plugin_register (MODULE_NAME, nfs_init,
-#if NFS_HAVE_READ
-                       nfs_read,
-#else
-                       NULL,
-#endif
-                       NULL);
+       plugin_register (MODULE_NAME, nfs_init, nfs_read, NULL);
        plugin_register ("nfs2_procedures", NULL, NULL, nfs2_procedures_write);
        plugin_register ("nfs3_procedures", NULL, NULL, nfs3_procedures_write);
 }
collectd, the system statistics collection daemon