projects
/
collectd.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
4928cae
)
virt plugin: Fix indentation and some whitespace.
author
Florian Forster
<octo@collectd.org>
Fri, 28 Oct 2016 08:45:23 +0000
(10:45 +0200)
committer
Florian Forster
<octo@collectd.org>
Fri, 28 Oct 2016 11:43:54 +0000
(13:43 +0200)
src/virt.c
patch
|
blob
|
history
diff --git
a/src/virt.c
b/src/virt.c
index
6d83a5c
..
62b53dc
100644
(file)
--- a/
src/virt.c
+++ b/
src/virt.c
@@
-606,11
+606,12
@@
lv_read (void)
&stats, sizeof stats) != 0)
continue;
&stats, sizeof stats) != 0)
continue;
- char *type_instance = NULL;
- if (blockdevice_format_basename && blockdevice_format == source)
- type_instance = strdup(basename(block_devices[i].path));
- else
- type_instance = strdup(block_devices[i].path);
+ char *type_instance = NULL;
+ if (blockdevice_format_basename && blockdevice_format == source)
+ type_instance = strdup(basename(block_devices[i].path));
+ else
+ type_instance = strdup(block_devices[i].path);
+
if ((stats.rd_req != -1) && (stats.wr_req != -1))
submit_derive2 ("disk_ops",
(derive_t) stats.rd_req, (derive_t) stats.wr_req,
if ((stats.rd_req != -1) && (stats.wr_req != -1))
submit_derive2 ("disk_ops",
(derive_t) stats.rd_req, (derive_t) stats.wr_req,
@@
-620,8
+621,8
@@
lv_read (void)
submit_derive2 ("disk_octets",
(derive_t) stats.rd_bytes, (derive_t) stats.wr_bytes,
block_devices[i].dom, type_instance);
submit_derive2 ("disk_octets",
(derive_t) stats.rd_bytes, (derive_t) stats.wr_bytes,
block_devices[i].dom, type_instance);
-
-
sfree
(type_instance);
+
+
sfree
(type_instance);
} /* for (nr_block_devices) */
/* Get interface stats for each domain. */
} /* for (nr_block_devices) */
/* Get interface stats for each domain. */
@@
-629,7
+630,6
@@
lv_read (void)
struct _virDomainInterfaceStats stats;
char *display_name = NULL;
struct _virDomainInterfaceStats stats;
char *display_name = NULL;
-
switch (interface_format) {
case if_address:
display_name = interface_devices[i].address;
switch (interface_format) {
case if_address:
display_name = interface_devices[i].address;
@@
-750,9
+750,9
@@
refresh_lists (void)
xpath_ctx = xmlXPathNewContext (xml_doc);
/* Block devices. */
xpath_ctx = xmlXPathNewContext (xml_doc);
/* Block devices. */
- char *bd_xmlpath = "/domain/devices/disk/target[@dev]";
- if (blockdevice_format == source)
- bd_xmlpath = "/domain/devices/disk/source[@dev]";
+
char *bd_xmlpath = "/domain/devices/disk/target[@dev]";
+
if (blockdevice_format == source)
+
bd_xmlpath = "/domain/devices/disk/source[@dev]";
xpath_obj = xmlXPathEval ((xmlChar *) bd_xmlpath, xpath_ctx);
if (xpath_obj == NULL || xpath_obj->type != XPATH_NODESET ||
xpath_obj = xmlXPathEval ((xmlChar *) bd_xmlpath, xpath_ctx);
if (xpath_obj == NULL || xpath_obj->type != XPATH_NODESET ||