projects
/
collectd.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
contrib/php-collection: Add a PHP frontend for graph generation.
[collectd.git]
/
src
/
nfs.c
diff --git
a/src/nfs.c
b/src/nfs.c
index
81f0793
..
91e6788
100644
(file)
--- a/
src/nfs.c
+++ b/
src/nfs.c
@@
-24,13
+24,8
@@
#include "common.h"
#include "plugin.h"
#include "common.h"
#include "plugin.h"
-#define MODULE_NAME "nfs"
-
-/* #if defined(KERNEL_LINUX) || defined(HAVE_LIBKSTAT) */
-#if KERNEL_LINUX
-# define NFS_HAVE_READ 1
-#else
-# define NFS_HAVE_READ 0
+#if !KERNEL_LINUX
+# error "No applicable input method."
#endif
/*
#endif
/*
@@
-78,17
+73,6
@@
Number Procedures Procedures
21 commit
*/
21 commit
*/
-static data_source_t procedure_dsrc[1] =
-{
- {"value", DS_TYPE_COUNTER, 0, 4294967295.0}
-};
-
-static data_set_t procedure_ds =
-{
- "nfs_procedure", 1, procedure_dsrc
-};
-
-#if NFS_HAVE_READ
static const char *nfs2_procedures_names[] =
{
"null",
static const char *nfs2_procedures_names[] =
{
"null",
@@
-204,8
+188,8
@@
static void nfs_procedures_submit (const char *plugin_instance,
vl.values = values;
vl.values_len = 1;
vl.time = time (NULL);
vl.values = values;
vl.values_len = 1;
vl.time = time (NULL);
- s
trcpy (vl.host, hostname_g
);
- s
trcpy (vl.plugin, "nfs"
);
+ s
strncpy (vl.host, hostname_g, sizeof (vl.host)
);
+ s
strncpy (vl.plugin, "nfs", sizeof (vl.plugin)
);
strncpy (vl.plugin_instance, plugin_instance,
sizeof (vl.plugin_instance));
strncpy (vl.plugin_instance, plugin_instance,
sizeof (vl.plugin_instance));
@@
-221,7
+205,6
@@
static void nfs_procedures_submit (const char *plugin_instance,
}
} /* void nfs_procedures_submit */
}
} /* void nfs_procedures_submit */
-#if KERNEL_LINUX
static void nfs_read_stats_file (FILE *fh, char *inst)
{
char buffer[BUFSIZE];
static void nfs_read_stats_file (FILE *fh, char *inst)
{
char buffer[BUFSIZE];
@@
-264,9
+247,10
@@
static void nfs_read_stats_file (FILE *fh, char *inst)
values = (unsigned long long *) malloc (nfs2_procedures_names_num * sizeof (unsigned long long));
if (values == NULL)
{
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",
ERROR ("nfs plugin: malloc "
"failed: %s",
- s
trerror (errno
));
+ s
strerror (errno, errbuf, sizeof (errbuf)
));
continue;
}
continue;
}
@@
-300,9
+284,10
@@
static void nfs_read_stats_file (FILE *fh, char *inst)
values = (unsigned long long *) malloc (nfs3_procedures_names_num * sizeof (unsigned long long));
if (values == NULL)
{
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",
ERROR ("nfs plugin: malloc "
"failed: %s",
- s
trerror (errno
));
+ s
strerror (errno, errbuf, sizeof (errbuf)
));
continue;
}
continue;
}
@@
-317,7
+302,6
@@
static void nfs_read_stats_file (FILE *fh, char *inst)
}
} /* while (fgets (buffer, BUFSIZE, fh) != NULL) */
} /* void nfs_read_stats_file */
}
} /* while (fgets (buffer, BUFSIZE, fh) != NULL) */
} /* void nfs_read_stats_file */
-#endif /* defined(KERNEL_LINUX) */
#undef BUFSIZE
#if HAVE_LIBKSTAT && 0
#undef BUFSIZE
#if HAVE_LIBKSTAT && 0
@@
-350,7
+334,6
@@
static void nfs2_read_kstat (kstat_t *ksp, char *inst)
static int nfs_read (void)
{
static int nfs_read (void)
{
-#if KERNEL_LINUX
FILE *fh;
if ((fh = fopen ("/proc/net/rpc/nfs", "r")) != NULL)
FILE *fh;
if ((fh = fopen ("/proc/net/rpc/nfs", "r")) != NULL)
@@
-365,9
+348,7
@@
static int nfs_read (void)
fclose (fh);
}
fclose (fh);
}
-/* #endif defined(KERNEL_LINUX) */
-
-#elif HAVE_LIBKSTAT && 0
+#if HAVE_LIBKSTAT && 0
if (nfs2_ksp_client != NULL)
nfs2_read_kstat (nfs2_ksp_client, "client");
if (nfs2_ksp_server != NULL)
if (nfs2_ksp_client != NULL)
nfs2_read_kstat (nfs2_ksp_client, "client");
if (nfs2_ksp_server != NULL)
@@
-376,15
+357,8
@@
static int nfs_read (void)
return (0);
}
return (0);
}
-#endif /* NFS_HAVE_READ */
void module_register (void)
{
void module_register (void)
{
- plugin_register_data_set (&procedure_ds);
-
-#if NFS_HAVE_READ
plugin_register_read ("nfs", nfs_read);
plugin_register_read ("nfs", nfs_read);
-#endif
-}
-
-#undef MODULE_NAME
+} /* void module_register */