projects
/
collectd.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
curl plugin: Fix memory leak.
[collectd.git]
/
src
/
libvirt.c
diff --git
a/src/libvirt.c
b/src/libvirt.c
index
10ca37f
..
6a397db
100644
(file)
--- a/
src/libvirt.c
+++ b/
src/libvirt.c
@@
-191,6
+191,7
@@
memory_submit (gauge_t memory, virDomainPtr dom)
vl.values_len = 1;
sstrncpy (vl.type, "memory", sizeof (vl.type));
vl.values_len = 1;
sstrncpy (vl.type, "memory", sizeof (vl.type));
+ sstrncpy (vl.type_instance, "total", sizeof (vl.type_instance));
plugin_dispatch_values (&vl);
}
plugin_dispatch_values (&vl);
}
@@
-440,8
+441,14
@@
lv_read (void)
continue;
}
continue;
}
+ if (info.state != VIR_DOMAIN_RUNNING)
+ {
+ /* only gather stats for running domains */
+ continue;
+ }
+
cpu_submit (info.cpuTime, domains[i], "virt_cpu_total");
cpu_submit (info.cpuTime, domains[i], "virt_cpu_total");
- memory_submit ((gauge_t) info.memory, domains[i]);
+ memory_submit ((gauge_t) info.memory
* 1024
, domains[i]);
vinfo = malloc (info.nrVirtCpu * sizeof (vinfo[0]));
if (vinfo == NULL) {
vinfo = malloc (info.nrVirtCpu * sizeof (vinfo[0]));
if (vinfo == NULL) {
@@
-791,6
+798,9
@@
add_interface_device (virDomainPtr dom, const char *path, const char *address, u
int new_size = sizeof (interface_devices[0]) * (nr_interface_devices+1);
char *path_copy, *address_copy, number_string[15];
int new_size = sizeof (interface_devices[0]) * (nr_interface_devices+1);
char *path_copy, *address_copy, number_string[15];
+ if ((path == NULL) || (address == NULL))
+ return EINVAL;
+
path_copy = strdup (path);
if (!path_copy) return -1;
path_copy = strdup (path);
if (!path_copy) return -1;
@@
-826,6
+836,9
@@
ignore_device_match (ignorelist_t *il, const char *domname, const char *devpath)
char *name;
int n, r;
char *name;
int n, r;
+ if ((domname == NULL) || (devpath == NULL))
+ return 0;
+
n = sizeof (char) * (strlen (domname) + strlen (devpath) + 2);
name = malloc (n);
if (name == NULL) {
n = sizeof (char) * (strlen (domname) + strlen (devpath) + 2);
name = malloc (n);
if (name == NULL) {