![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 44ac0e1)
raw | patch | inline | side by side (parent: 44ac0e1)
| author | Florian Forster <octo@leeloo.lan.home.verplant.org> | |
| Wed, 28 Feb 2007 15:06:03 +0000 (16:06 +0100) | ||
| committer | Florian Forster <octo@leeloo.lan.home.verplant.org> | |
| Wed, 28 Feb 2007 15:06:03 +0000 (16:06 +0100) |
| src/vserver.c | patch | blob | history |
diff --git a/src/vserver.c b/src/vserver.c
index 3a77961bbb3089ff6bb259593c671f46f81a1592..00a1e6ad49ca671839e1823bd42d3200e700c493 100644 (file)
--- a/src/vserver.c
+++ b/src/vserver.c
/**
* collectd - src/vserver.c
- * Copyright (C) 2006 Sebastian Harl
+ * Copyright (C) 2006,2007 Sebastian Harl
*
* 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
# define VSERVER_HAVE_READ 0
#endif /* defined(KERNEL_LINUX) */
-static char *rrd_unix = "vserver-%s/traffic-unix.rrd";
-static char *rrd_inet = "vserver-%s/traffic-inet.rrd";
-static char *rrd_inet6 = "vserver-%s/traffic-inet6.rrd";
-static char *rrd_other = "vserver-%s/traffic-other.rrd";
-static char *rrd_unspec = "vserver-%s/traffic-unspec.rrd";
-
-static char *rrd_thread = "vserver-%s/vs_threads.rrd";
-
-static char *rrd_load = "vserver-%s/load.rrd";
-
-static char *rrd_procs = "vserver-%s/vs_processes.rrd";
-static char *rrd_memory = "vserver-%s/vs_memory.rrd";
+static data_source_t octets_dsrc[2] =
+{
+ {"rx", DS_TYPE_COUNTER, 0, 4294967295.0},
+ {"tx", DS_TYPE_COUNTER, 0, 4294967295.0}
+};
-/* 9223372036854775807 == LLONG_MAX */
-/* bytes transferred */
-static char *ds_def_unix[] =
+static data_set_t octets_ds =
{
- "DS:incoming:COUNTER:"COLLECTD_HEARTBEAT":0:9223372036854775807",
- "DS:outgoing:COUNTER:"COLLECTD_HEARTBEAT":0:9223372036854775807",
- "DS:failed:COUNTER:"COLLECTD_HEARTBEAT":0:9223372036854775807",
- NULL
+ "if_octets", 2, octets_dsrc
};
-static int ds_num_unix = 3;
-static char *ds_def_inet[] =
+static data_source_t load_dsrc[3] =
{
- "DS:incoming:COUNTER:"COLLECTD_HEARTBEAT":0:9223372036854775807",
- "DS:outgoing:COUNTER:"COLLECTD_HEARTBEAT":0:9223372036854775807",
- "DS:failed:COUNTER:"COLLECTD_HEARTBEAT":0:9223372036854775807",
- NULL
+ {"shortterm", DS_TYPE_GAUGE, 0.0, 100.0},
+ {"midterm", DS_TYPE_GAUGE, 0.0, 100.0},
+ {"longterm", DS_TYPE_GAUGE, 0.0, 100.0}
};
-static int ds_num_inet = 3;
-static char *ds_def_inet6[] =
+static data_set_t load_ds =
{
- "DS:incoming:COUNTER:"COLLECTD_HEARTBEAT":0:9223372036854775807",
- "DS:outgoing:COUNTER:"COLLECTD_HEARTBEAT":0:9223372036854775807",
- "DS:failed:COUNTER:"COLLECTD_HEARTBEAT":0:9223372036854775807",
- NULL
+ "load", 3, load_dsrc
};
-static int ds_num_inet6 = 3;
-static char *ds_def_other[] =
+static data_source_t threads_dsrc[1] =
{
- "DS:incoming:COUNTER:"COLLECTD_HEARTBEAT":0:9223372036854775807",
- "DS:outgoing:COUNTER:"COLLECTD_HEARTBEAT":0:9223372036854775807",
- "DS:failed:COUNTER:"COLLECTD_HEARTBEAT":0:9223372036854775807",
- NULL
+ {"value", DS_TYPE_GAUGE, 0.0, 65535.0}
};
-static int ds_num_other = 3;
-static char *ds_def_unspec[] =
+static data_set_t threads_ds =
{
- "DS:incoming:COUNTER:"COLLECTD_HEARTBEAT":0:9223372036854775807",
- "DS:outgoing:COUNTER:"COLLECTD_HEARTBEAT":0:9223372036854775807",
- "DS:failed:COUNTER:"COLLECTD_HEARTBEAT":0:9223372036854775807",
- NULL
+ "vs_threads", 1, threads_dsrc
};
-static int ds_num_unspec = 3;
-static char *ds_def_threads[] =
+static data_source_t processes_dsrc[1] =
{
- "DS:total:GAUGE:"COLLECTD_HEARTBEAT":0:65535",
- "DS:running:GAUGE:"COLLECTD_HEARTBEAT":0:65535",
- "DS:uninterruptible:GAUGE:"COLLECTD_HEARTBEAT":0:65535",
- "DS:onhold:GAUGE:"COLLECTD_HEARTBEAT":0:65535",
- NULL
+ {"value", DS_TYPE_GAUGE, 0.0, 65535.0}
};
-static int ds_num_threads = 4;
-static char *ds_def_load[] =
+static data_set_t processes_ds =
{
- "DS:shortterm:GAUGE:"COLLECTD_HEARTBEAT":0:100",
- "DS:midterm:GAUGE:"COLLECTD_HEARTBEAT":0:100",
- "DS:longterm:GAUGE:"COLLECTD_HEARTBEAT":0:100",
- NULL
+ "vs_processes", 1, processes_dsrc
};
-static int ds_num_load = 3;
-static char *ds_def_procs[] =
+static data_source_t memory_dsrc[1] =
{
- "DS:total:GAUGE:"COLLECTD_HEARTBEAT":0:65535",
- NULL
+ {"value", DS_TYPE_GAUGE, 0.0, 9223372036854775807.0}
};
-static int ds_num_procs = 1;
-/* 9223372036854775807 == LLONG_MAX */
-/* bytes */
-static char *ds_def_memory[] =
+static data_set_t memory_ds =
{
- "DS:vm:GAUGE:"COLLECTD_HEARTBEAT":0:9223372036854775807",
- "DS:vml:GAUGE:"COLLECTD_HEARTBEAT":0:9223372036854775807",
- "DS:rss:GAUGE:"COLLECTD_HEARTBEAT":0:9223372036854775807",
- "DS:anon:GAUGE:"COLLECTD_HEARTBEAT":0:9223372036854775807",
- NULL
+ "vs_memory", 1, memory_dsrc
};
-static int ds_num_memory = 4;
+#if VSERVER_HAVE_READ
static int pagesize = 0;
-static void vserver_init (void)
+static int vserver_init (void)
{
/* XXX Should we check for getpagesize () in configure?
* What's the right thing to do, if there is no getpagesize ()? */
pagesize = getpagesize ();
- return;
-} /* static void vserver_init(void) */
-
-static void vserver_unix_write (char *host, char *inst, char *val)
-{
- int len;
- char filename[BUFSIZE];
-
- len = snprintf (filename, BUFSIZE, rrd_unix, inst);
- if ((len > 0) && (len < BUFSIZE))
- rrd_update_file (host, filename, val, ds_def_unix, ds_num_unix);
- return;
-} /* static void vserver_unix_write(char *host, char *inst, char *val) */
-
-static void vserver_inet_write (char *host, char *inst, char *val)
-{
- int len;
- char filename[BUFSIZE];
-
- len = snprintf (filename, BUFSIZE, rrd_inet, inst);
- if ((len > 0) && (len < BUFSIZE))
- rrd_update_file (host, filename, val, ds_def_inet, ds_num_inet);
- return;
-} /* static void vserver_inet_write(char *host, char *inst, char *val) */
-
-static void vserver_inet6_write (char *host, char *inst, char *val)
-{
- int len;
- char filename[BUFSIZE];
-
- len = snprintf (filename, BUFSIZE, rrd_inet6, inst);
- if ((len > 0) && (len < BUFSIZE))
- rrd_update_file (host, filename, val, ds_def_inet6, ds_num_inet6);
- return;
-} /* static void vserver_inet6_write(char *host, char *inst, char *val) */
-static void vserver_other_write (char *host, char *inst, char *val)
-{
- int len;
- char filename[BUFSIZE];
-
- len = snprintf (filename, BUFSIZE, rrd_other, inst);
- if ((len > 0) && (len < BUFSIZE))
- rrd_update_file (host, filename, val, ds_def_other, ds_num_other);
- return;
-} /* static void vserver_other_write(char *host, char *inst, char *val) */
+ return (0);
+} /* static void vserver_init(void) */
-static void vserver_unspec_write (char *host, char *inst, char *val)
+static void traffic_submit (const char *plugin_instance,
+ const char *type_instance, counter_t rx, counter_t tx)
{
- int len;
- char filename[BUFSIZE];
+ value_t values[2];
+ value_list_t vl = VALUE_LIST_INIT;
- len = snprintf (filename, BUFSIZE, rrd_unspec, inst);
- if ((len > 0) && (len < BUFSIZE))
- rrd_update_file (host, filename, val, ds_def_unspec, ds_num_unspec);
- return;
-} /* static void vserver_unspec_write(char *host, char *inst, char *val) */
+ values[0].counter = rx;
+ values[1].counter = tx;
-static void vserver_threads_write (char *host, char *inst, char *val)
-{
- int len;
- char filename[BUFSIZE];
+ vl.values = values;
+ vl.values_len = STATIC_ARRAY_SIZE (values);
+ vl.time = time (NULL);
+ strcpy (vl.host, hostname_g);
+ strcpy (vl.plugin, "vserver");
+ strncpy (vl.plugin_instance, plugin_instance, sizeof (vl.plugin_instance));
+ strncpy (vl.type_instance, type_instance, sizeof (vl.type_instance));
- len = snprintf (filename, BUFSIZE, rrd_thread, inst);
- if ((len > 0) && (len < BUFSIZE))
- rrd_update_file (host, filename, val, ds_def_threads, ds_num_threads);
- return;
-} /* static void vserver_threads_write(char *host, char *inst, char *val) */
+ plugin_dispatch_values ("if_octets", &vl);
+} /* void traffic_submit */
-static void vserver_load_write (char *host, char *inst, char *val)
+static void load_submit (const char *plugin_instance,
+ gauge_t snum, gauge_t mnum, gauge_t lnum)
{
- int len;
- char filename[BUFSIZE];
+ value_t values[3];
+ value_list_t vl = VALUE_LIST_INIT;
- len = snprintf (filename, BUFSIZE, rrd_load, inst);
- if ((len > 0) && (len < BUFSIZE))
- rrd_update_file (host, filename, val, ds_def_load, ds_num_load);
- return;
-} /* static void vserver_load_write(char *host, char *inst, char *val) */
-
-static void vserver_procs_write (char *host, char *inst, char *val)
-{
- int len;
- char filename[BUFSIZE];
+ values[0].gauge = snum;
+ values[1].gauge = mnum;
+ values[2].gauge = lnum;
- len = snprintf (filename, BUFSIZE, rrd_procs, inst);
- if ((len > 0) && (len < BUFSIZE))
- rrd_update_file (host, filename, val, ds_def_procs, ds_num_procs);
- return;
-} /* static void vserver_procs_write(char *host, char *inst, char *val) */
+ vl.values = values;
+ vl.values_len = STATIC_ARRAY_SIZE (values);
+ vl.time = time (NULL);
+ strcpy (vl.host, hostname_g);
+ strcpy (vl.plugin, "vserver");
+ strncpy (vl.plugin_instance, plugin_instance, sizeof (vl.plugin_instance));
-static void vserver_memory_write (char *host, char *inst, char *val)
-{
- int len;
- char filename[BUFSIZE];
+ plugin_dispatch_values ("load", &vl);
+}
- len = snprintf (filename, BUFSIZE, rrd_memory, inst);
- if ((len > 0) && (len < BUFSIZE))
- rrd_update_file (host, filename, val, ds_def_memory, ds_num_memory);
- return;
-} /* static void vserver_memory_write(char *host, char *inst, char *val) */
+static void submit_gauge (const char *plugin_instance, const char *type,
+ const char *type_instance, gauge_t value)
-#if VSERVER_HAVE_READ
-static void vserver_submit (char *inst, long long unix_in, long long unix_out,
- long long unix_failed, long long inet_in, long long inet_out,
- long long inet_failed, long long inet6_in, long long inet6_out,
- long long inet6_failed, long long other_in, long long other_out,
- long long other_failed, long long unspec_in, long long unspec_out,
- long long unspec_failed, int t_total, int t_running,
- int t_uninterruptible, int t_onhold, double avg1, double avg5,
- double avg15, int p_total, long long vm, long long vml, long long rss,
- long long anon)
{
- int len;
- char buffer[BUFSIZE];
-
- len = snprintf (buffer, BUFSIZE,
- "N:%lld:%lld:%lld", unix_in, unix_out, unix_failed);
-
- if ((len > 0) && (len < BUFSIZE))
- plugin_submit ("vserver_unix", inst, buffer);
-
-
- len = snprintf (buffer, BUFSIZE,
- "N:%lld:%lld:%lld", inet_in, inet_out, inet_failed);
-
- if ((len > 0) && (len < BUFSIZE))
- plugin_submit ("vserver_inet", inst, buffer);
-
-
- len = snprintf (buffer, BUFSIZE,
- "N:%lld:%lld:%lld", inet6_in, inet6_out, inet6_failed);
-
- if ((len > 0) && (len < BUFSIZE))
- plugin_submit ("vserver_inet6", inst, buffer);
-
-
- len = snprintf (buffer, BUFSIZE,
- "N:%lld:%lld:%lld", other_in, other_out, other_failed);
-
- if ((len > 0) && (len < BUFSIZE))
- plugin_submit ("vserver_other", inst, buffer);
-
-
- len = snprintf (buffer, BUFSIZE,
- "N:%lld:%lld:%lld", unspec_in, unspec_out, unspec_failed);
-
- if ((len > 0) && (len < BUFSIZE))
- plugin_submit ("vserver_unspec", inst, buffer);
-
-
- len = snprintf (buffer, BUFSIZE, "N:%d:%d:%d:%d",
- t_total, t_running, t_uninterruptible, t_onhold);
-
- if ((len > 0) && (len < BUFSIZE))
- plugin_submit ("vserver_threads", inst, buffer);
-
+ value_t values[1];
+ value_list_t vl = VALUE_LIST_INIT;
- len = snprintf (buffer, BUFSIZE, "N:%.2f:%.2f:%.2f",
- avg1, avg5, avg15);
+ values[0].gauge = value;
- if ((len > 0) && (len < BUFSIZE))
- plugin_submit ("vserver_load", inst, buffer);
+ vl.values = values;
+ vl.values_len = STATIC_ARRAY_SIZE (values);
+ vl.time = time (NULL);
+ strcpy (vl.host, hostname_g);
+ strcpy (vl.plugin, "vserver");
+ strncpy (vl.plugin_instance, plugin_instance, sizeof (vl.plugin_instance));
+ strncpy (vl.type_instance, type_instance, sizeof (vl.type_instance));
-
- len = snprintf (buffer, BUFSIZE, "N:%d",
- p_total);
-
- if ((len > 0) && (len < BUFSIZE))
- plugin_submit ("vserver_procs", inst, buffer);
-
-
- len = snprintf (buffer, BUFSIZE, "N:%lld:%lld:%lld:%lld",
- vm, vml, rss, anon);
-
- if ((len > 0) && (len < BUFSIZE))
- plugin_submit ("vserver_memory", inst, buffer);
- return;
-} /* static void vserver_submit() */
+ plugin_dispatch_values (type, &vl);
+} /* void submit_gauge */
static inline long long __get_sock_bytes(const char *s)
{
return atoll(s);
}
-static void vserver_read (void)
+static int vserver_read (void)
{
DIR *proc;
struct dirent *dent; /* 42 */
{
plugin_complain (LOG_ERR, &complain_obj, "vserver plugin: "
"fopen (%s) failed: %s", PROCDIR, strerror (errno));
- return;
+ return (-1);
}
plugin_relief (LOG_NOTICE, &complain_obj, "vserver plugin: "
"fopen (%s) succeeded.", PROCDIR);
- while (NULL != (dent = readdir (proc))) {
+ while (NULL != (dent = readdir (proc)))
+ {
int len;
char file[BUFSIZE];
char *cols[4];
- long long unix_s[3] = {-1, -1, -1};
- long long inet[3] = {-1, -1, -1};
- long long inet6[3] = {-1, -1, -1};
- long long other[3] = {-1, -1, -1};
- long long unspec[3] = {-1, -1, -1};
- int threads[4] = {-1, -1, -1, -1};
- double load[3] = {-1, -1, -1};
- /* Just to be consistent ;-) */
- int procs[1] = {-1};
- long long memory[4] = {-1, -1, -1, -1};
-
if (dent->d_name[0] == '.')
continue;
- /* XXX This check is just the result of a trial-and-error test.
- * I did not find any documentation describing the d_type field. */
- if (!(dent->d_type & 0x4))
- /* This is not a directory */
+ /* This is not a directory */
+ if (dent->d_type != DT_DIR)
continue;
/* socket message accounting */
if ((len < 0) || (len >= BUFSIZE))
continue;
- if (NULL == (fh = fopen (file, "r"))) {
+ if (NULL == (fh = fopen (file, "r")))
syslog (LOG_ERR, "Cannot open '%s': %s", file, strerror (errno));
- continue;
- }
- while (NULL != fgets (buffer, BUFSIZE, fh)) {
+ while ((fh != NULL) && (NULL != fgets (buffer, BUFSIZE, fh)))
+ {
+ counter_t rx;
+ counter_t tx;
+ char *type_instance;
+
if (strsplit (buffer, cols, 4) < 4)
continue;
- if (0 == strcmp (cols[0], "UNIX:")) {
- unix_s[0] = __get_sock_bytes (cols[1]);
- unix_s[1] = __get_sock_bytes (cols[2]);
- unix_s[2] = __get_sock_bytes (cols[3]);
- }
- else if (0 == strcmp (cols[0], "INET:")) {
- inet[0] = __get_sock_bytes (cols[1]);
- inet[1] = __get_sock_bytes (cols[2]);
- inet[2] = __get_sock_bytes (cols[3]);
- }
- else if (0 == strcmp (cols[0], "INET6:")) {
- inet6[0] = __get_sock_bytes (cols[1]);
- inet6[1] = __get_sock_bytes (cols[2]);
- inet6[2] = __get_sock_bytes (cols[3]);
- }
- else if (0 == strcmp (cols[0], "OTHER:")) {
- other[0] = __get_sock_bytes (cols[1]);
- other[1] = __get_sock_bytes (cols[2]);
- other[2] = __get_sock_bytes (cols[3]);
- }
- else if (0 == strcmp (cols[0], "UNSPEC:")) {
- unspec[0] = __get_sock_bytes (cols[1]);
- unspec[1] = __get_sock_bytes (cols[2]);
- unspec[2] = __get_sock_bytes (cols[3]);
- }
- }
+ if (0 == strcmp (cols[0], "UNIX:"))
+ type_instance = "unix";
+ else if (0 == strcmp (cols[0], "INET:"))
+ type_instance = "inet";
+ else if (0 == strcmp (cols[0], "INET6:"))
+ type_instance = "inet6";
+ else if (0 == strcmp (cols[0], "OTHER:"))
+ type_instance = "other";
+ else if (0 == strcmp (cols[0], "UNSPEC:"))
+ type_instance = "unspec";
+ else
+ continue;
- fclose (fh);
+ rx = __get_sock_bytes (cols[1]);
+ tx = __get_sock_bytes (cols[2]);
+ /* cols[3] == errors */
+
+ traffic_submit (dent->d_name, type_instance, rx, tx);
+ } /* while (fgets) */
+
+ if (fh != NULL)
+ {
+ fclose (fh);
+ fh = NULL;
+ }
/* thread information and load */
len = snprintf (file, BUFSIZE, PROCDIR "/%s/cvirt", dent->d_name);
if ((len < 0) || (len >= BUFSIZE))
continue;
- if (NULL == (fh = fopen (file, "r"))) {
+ if (NULL == (fh = fopen (file, "r")))
syslog (LOG_ERR, "Cannot open '%s': %s", file, strerror (errno));
- continue;
- }
- while (NULL != fgets (buffer, BUFSIZE, fh)) {
+ while ((fh != NULL) && (NULL != fgets (buffer, BUFSIZE, fh)))
+ {
int n = strsplit (buffer, cols, 4);
- if (2 == n) {
- if (0 == strcmp (cols[0], "nr_threads:")) {
- threads[0] = atoi (cols[1]);
- }
- else if (0 == strcmp (cols[0], "nr_running:")) {
- threads[1] = atoi (cols[1]);
- }
- else if (0 == strcmp (cols[0], "nr_unintr:")) {
- threads[2] = atoi (cols[1]);
- }
- else if (0 == strcmp (cols[0], "nr_onhold:")) {
- threads[3] = atoi (cols[1]);
- }
+ if (2 == n)
+ {
+ char *type_instance;
+ gauge_t value;
+
+ if (0 == strcmp (cols[0], "nr_threads:"))
+ type_instance = "total";
+ else if (0 == strcmp (cols[0], "nr_running:"))
+ type_instance = "running";
+ else if (0 == strcmp (cols[0], "nr_unintr:"))
+ type_instance = "uninterruptable";
+ else if (0 == strcmp (cols[0], "nr_onhold:"))
+ type_instance = "onhold";
+ else
+ continue;
+
+ value = atof (cols[1]);
+ submit_gauge (dent->d_name, "vs_threads", type_instance, value);
}
else if (4 == n) {
- if (0 == strcmp (cols[0], "loadavg:")) {
- load[0] = atof (cols[1]);
- load[1] = atof (cols[2]);
- load[2] = atof (cols[3]);
+ if (0 == strcmp (cols[0], "loadavg:"))
+ {
+ gauge_t snum = atof (cols[1]);
+ gauge_t mnum = atof (cols[2]);
+ gauge_t lnum = atof (cols[3]);
+ load_submit (dent->d_name, snum, mnum, lnum);
}
}
- }
+ } /* while (fgets) */
- fclose (fh);
+ if (fh != NULL)
+ {
+ fclose (fh);
+ fh = NULL;
+ }
/* processes and memory usage */
len = snprintf (file, BUFSIZE, PROCDIR "/%s/limit", dent->d_name);
if ((len < 0) || (len >= BUFSIZE))
continue;
- if (NULL == (fh = fopen (file, "r"))) {
+ if (NULL == (fh = fopen (file, "r")))
syslog (LOG_ERR, "Cannot open '%s': %s", file, strerror (errno));
- continue;
- }
- while (NULL != fgets (buffer, BUFSIZE, fh)) {
+ while ((fh != NULL) && (NULL != fgets (buffer, BUFSIZE, fh)))
+ {
+ char *type = "vs_memory";
+ char *type_instance;
+ gauge_t value;
+
if (strsplit (buffer, cols, 2) < 2)
continue;
- if (0 == strcmp (cols[0], "PROC:")) {
- procs[0] = atoi (cols[1]);
- }
- else if (0 == strcmp (cols[0], "VM:")) {
- memory[0] = atoll (cols[1]) * pagesize;
- }
- else if (0 == strcmp (cols[0], "VML:")) {
- memory[1] = atoll (cols[1]) * pagesize;
+ if (0 == strcmp (cols[0], "PROC:"))
+ {
+ type = "vs_processes";
+ type_instance = "";
+ value = atof (cols[1]);
}
- else if (0 == strcmp (cols[0], "RSS:")) {
- memory[2] = atoll (cols[1]) * pagesize;
+ else
+ {
+ if (0 == strcmp (cols[0], "VM:"))
+ type_instance = "vm";
+ else if (0 == strcmp (cols[0], "VML:"))
+ type_instance = "vml";
+ else if (0 == strcmp (cols[0], "RSS:"))
+ type_instance = "rss";
+ else if (0 == strcmp (cols[0], "ANON:"))
+ type_instance = "anon";
+ else
+ continue;
+
+ value = atof (cols[1]) * pagesize;
}
- else if (0 == strcmp (cols[0], "ANON:")) {
- memory[3] = atoll (cols[1]) * pagesize;
- }
- }
-
- fclose (fh);
- /* XXX What to do in case of an error (i.e. some value is
- * still -1)? */
+ submit_gauge (dent->d_name, type, type_instance, value);
+ } /* while (fgets) */
- vserver_submit (dent->d_name, unix_s[0], unix_s[1], unix_s[2],
- inet[0], inet[1], inet[2], inet6[0], inet6[1], inet6[2],
- other[0], other[1], other[2], unspec[0], unspec[1], unspec[2],
- threads[0], threads[1], threads[2], threads[3], load[0],
- load[1], load[2], procs[0], memory[0], memory[1], memory[2],
- memory[3]);
- }
+ if (fh != NULL)
+ {
+ fclose (fh);
+ fh = NULL;
+ }
+ } /* while (readdir) */
closedir (proc);
- return;
-} /* static void vserver_read(void) */
-#else
-# define vserver_read NULL
+
+ return (0);
+} /* int vserver_read */
#endif /* VSERVER_HAVE_READ */
void module_register (void)
{
- plugin_register (MODULE_NAME, vserver_init, vserver_read, NULL);
- plugin_register ("vserver_unix", NULL, NULL, vserver_unix_write);
- plugin_register ("vserver_inet", NULL, NULL, vserver_inet_write);
- plugin_register ("vserver_inet6", NULL, NULL, vserver_inet6_write);
- plugin_register ("vserver_other", NULL, NULL, vserver_other_write);
- plugin_register ("vserver_unspec", NULL, NULL, vserver_unspec_write);
- plugin_register ("vserver_threads", NULL, NULL, vserver_threads_write);
- plugin_register ("vserver_load", NULL, NULL, vserver_load_write);
- plugin_register ("vserver_procs", NULL, NULL, vserver_procs_write);
- plugin_register ("vserver_memory", NULL, NULL, vserver_memory_write);
- return;
+ plugin_register_data_set (&octets_ds);
+ plugin_register_data_set (&load_ds);
+ plugin_register_data_set (&threads_ds);
+ plugin_register_data_set (&processes_ds);
+ plugin_register_data_set (&memory_ds);
+
+#if VSERVER_HAVE_READ
+ plugin_register_init ("vserver", vserver_init);
+ plugin_register_read ("vserver", vserver_read);
+#endif /* VSERVER_HAVE_READ */
} /* void module_register(void) */
/* vim: set ts=4 sw=4 noexpandtab : */