do { \
status = _f(__VA_ARGS__); \
if (status != 0) \
- ERROR(PLUGIN_NAME ": Failed to get " _name); \
+ ERROR(PLUGIN_NAME " plugin: Failed to get " _name); \
} while (0)
/* Connection. */
static int refresh_lists(struct lv_read_instance *inst);
-struct lv_info {
- virDomainInfo di;
- unsigned long long total_user_cpu_time;
- unsigned long long total_syst_cpu_time;
-};
-
struct lv_block_info {
virDomainBlockStatsStruct bi;
virErrorPtr err; \
err = (conn) ? virConnGetLastError((conn)) : virGetLastError(); \
if (err) \
- ERROR("%s: %s", (s), err->message); \
+ ERROR(PLUGIN_NAME " plugin: %s failed: %s", (s), err->message); \
} while (0)
-static void init_lv_info(struct lv_info *info) {
- if (info != NULL)
- memset(info, 0, sizeof(*info));
-}
-
-static int lv_domain_info(virDomainPtr dom, struct lv_info *info) {
-#ifdef HAVE_CPU_STATS
- virTypedParameterPtr param = NULL;
- int nparams = 0;
-#endif /* HAVE_CPU_STATS */
- int ret = virDomainGetInfo(dom, &(info->di));
- if (ret != 0) {
- return ret;
- }
-
-#ifdef HAVE_CPU_STATS
- nparams = virDomainGetCPUStats(dom, NULL, 0, -1, 1, 0);
- if (nparams < 0) {
- VIRT_ERROR(conn, "getting the CPU params count");
- return -1;
- }
-
- param = calloc(nparams, sizeof(virTypedParameter));
- if (param == NULL) {
- ERROR("virt plugin: alloc(%i) for cpu parameters failed.", nparams);
- return -1;
- }
-
- ret = virDomainGetCPUStats(dom, param, nparams, -1, 1, 0); // total stats.
- if (ret < 0) {
- virTypedParamsClear(param, nparams);
- sfree(param);
- VIRT_ERROR(conn, "getting the disk params values");
- return -1;
- }
-
- for (int i = 0; i < nparams; ++i) {
- if (!strcmp(param[i].field, "user_time"))
- info->total_user_cpu_time = param[i].value.ul;
- else if (!strcmp(param[i].field, "system_time"))
- info->total_syst_cpu_time = param[i].value.ul;
- }
-
- virTypedParamsClear(param, nparams);
- sfree(param);
-#endif /* HAVE_CPU_STATS */
-
- return 0;
-}
-
static void init_value_list(value_list_t *vl, virDomainPtr dom) {
const char *name;
char uuid[VIR_UUID_STRING_BUFLEN];
value_list_t vl = VALUE_LIST_INIT;
if (!notif) {
- ERROR(PLUGIN_NAME ": init_notif: NULL pointer");
+ ERROR(PLUGIN_NAME " plugin: init_notif: NULL pointer");
return -1;
}
submit(dom, type, devname, values, STATIC_ARRAY_SIZE(values));
} /* void submit_derive2 */
-static void pcpu_submit(virDomainPtr dom, struct lv_info *info) {
-#ifdef HAVE_CPU_STATS
- if (extra_stats & ex_stats_pcpu)
- submit_derive2("ps_cputime", info->total_user_cpu_time,
- info->total_syst_cpu_time, dom, NULL);
-#endif /* HAVE_CPU_STATS */
-}
-
static double cpu_ns_to_percent(unsigned int node_cpus,
unsigned long long cpu_time_old,
unsigned long long cpu_time_new) {
(time_diff_sec * node_cpus * NANOSEC_IN_SEC);
}
- DEBUG(PLUGIN_NAME ": node_cpus=%u cpu_time_old=%" PRIu64
+ DEBUG(PLUGIN_NAME " plugin: node_cpus=%u cpu_time_old=%" PRIu64
" cpu_time_new=%" PRIu64 "cpu_time_diff=%" PRIu64
" time_diff_sec=%f percent=%f",
node_cpus, (uint64_t)cpu_time_old, (uint64_t)cpu_time_new,
}
if (ex_stats_table[j + 1].name == NULL) {
- ERROR(PLUGIN_NAME ": Unmatched ExtraStats option: %s", exstats[i]);
+ ERROR(PLUGIN_NAME " plugin: Unmatched ExtraStats option: %s",
+ exstats[i]);
}
}
}
}
static void domain_state_submit_notif(virDomainPtr dom, int state, int reason) {
- if ((state < 0) || (state >= STATIC_ARRAY_SIZE(domain_states))) {
- ERROR(PLUGIN_NAME ": Array index out of bounds: state=%d", state);
+ if ((state < 0) || ((size_t)state >= STATIC_ARRAY_SIZE(domain_states))) {
+ ERROR(PLUGIN_NAME " plugin: Array index out of bounds: state=%d", state);
return;
}
char msg[DATA_MAX_NAME_LEN];
const char *state_str = domain_states[state];
#ifdef HAVE_DOM_REASON
- if ((reason < 0) || (reason >= STATIC_ARRAY_SIZE(domain_reasons[0]))) {
- ERROR(PLUGIN_NAME ": Array index out of bounds: reason=%d", reason);
+ if ((reason < 0) ||
+ ((size_t)reason >= STATIC_ARRAY_SIZE(domain_reasons[0]))) {
+ ERROR(PLUGIN_NAME " plugin: Array index out of bounds: reason=%d", reason);
return;
}
* have different number of reasons. We need to check if reason was
* successfully parsed */
if (!reason_str) {
- ERROR(PLUGIN_NAME ": Invalid reason (%d) for domain state: %s", reason,
- state_str);
+ ERROR(PLUGIN_NAME " plugin: Invalid reason (%d) for domain state: %s",
+ reason, state_str);
return;
}
#else
severity = NOTIF_FAILURE;
break;
default:
- ERROR(PLUGIN_NAME ": Unrecognized domain state (%d)", state);
+ ERROR(PLUGIN_NAME " plugin: Unrecognized domain state (%d)", state);
return;
}
submit_notif(dom, severity, msg, "domain_state", NULL);
}
if (strcasecmp(key, "HostnameFormat") == 0) {
- char *value_copy;
- char *fields[HF_MAX_FIELDS];
- int n;
-
- value_copy = strdup(value);
+ char *value_copy = strdup(value);
if (value_copy == NULL) {
ERROR(PLUGIN_NAME " plugin: strdup failed.");
return -1;
}
- n = strsplit(value_copy, fields, HF_MAX_FIELDS);
+ char *fields[HF_MAX_FIELDS];
+ int n = strsplit(value_copy, fields, HF_MAX_FIELDS);
if (n < 1) {
sfree(value_copy);
ERROR(PLUGIN_NAME " plugin: HostnameFormat: no fields");
}
if (strcasecmp(key, "PluginInstanceFormat") == 0) {
- char *value_copy;
- char *fields[PLGINST_MAX_FIELDS];
- int n;
-
- value_copy = strdup(value);
+ char *value_copy = strdup(value);
if (value_copy == NULL) {
ERROR(PLUGIN_NAME " plugin: strdup failed.");
return -1;
}
- n = strsplit(value_copy, fields, PLGINST_MAX_FIELDS);
+ char *fields[PLGINST_MAX_FIELDS];
+ int n = strsplit(value_copy, fields, PLGINST_MAX_FIELDS);
if (n < 1) {
sfree(value_copy);
ERROR(PLUGIN_NAME " plugin: PluginInstanceFormat: no fields");
}
int status = virNodeGetInfo(conn, &nodeinfo);
if (status != 0) {
- ERROR(PLUGIN_NAME ": virNodeGetInfo failed");
+ ERROR(PLUGIN_NAME " plugin: virNodeGetInfo failed");
return -1;
}
}
virVcpuInfoPtr vinfo = calloc(nr_virt_cpu, sizeof(vinfo[0]));
if (vinfo == NULL) {
- ERROR(PLUGIN_NAME " plugin: malloc failed.");
+ ERROR(PLUGIN_NAME " plugin: calloc failed.");
return -1;
}
unsigned char *cpumaps = calloc(nr_virt_cpu, cpu_map_len);
if (cpumaps == NULL) {
- ERROR(PLUGIN_NAME " plugin: malloc failed.");
+ ERROR(PLUGIN_NAME " plugin: calloc failed.");
sfree(vinfo);
return -1;
}
return 0;
}
+#ifdef HAVE_CPU_STATS
+static int get_pcpu_stats(virDomainPtr dom) {
+ int nparams = virDomainGetCPUStats(dom, NULL, 0, -1, 1, 0);
+ if (nparams < 0) {
+ VIRT_ERROR(conn, "getting the CPU params count");
+ return -1;
+ }
+
+ virTypedParameterPtr param = calloc(nparams, sizeof(virTypedParameter));
+ if (param == NULL) {
+ ERROR(PLUGIN_NAME " plugin: alloc(%i) for cpu parameters failed.", nparams);
+ return -1;
+ }
+
+ int ret = virDomainGetCPUStats(dom, param, nparams, -1, 1, 0); // total stats.
+ if (ret < 0) {
+ virTypedParamsClear(param, nparams);
+ sfree(param);
+ VIRT_ERROR(conn, "getting the CPU params values");
+ return -1;
+ }
+
+ unsigned long long total_user_cpu_time = 0;
+ unsigned long long total_syst_cpu_time = 0;
+
+ for (int i = 0; i < nparams; ++i) {
+ if (!strcmp(param[i].field, "user_time"))
+ total_user_cpu_time = param[i].value.ul;
+ else if (!strcmp(param[i].field, "system_time"))
+ total_syst_cpu_time = param[i].value.ul;
+ }
+
+ if (total_user_cpu_time > 0 || total_syst_cpu_time > 0)
+ submit_derive2("ps_cputime", total_user_cpu_time, total_syst_cpu_time, dom,
+ NULL);
+
+ virTypedParamsClear(param, nparams);
+ sfree(param);
+
+ return 0;
+}
+#endif /* HAVE_CPU_STATS */
+
#ifdef HAVE_DOM_REASON
static void domain_state_submit(virDomainPtr dom, int state, int reason) {
#define NM_ADD_STR_ITEMS(_items, _size) \
do { \
- for (int _i = 0; _i < _size; ++_i) { \
+ for (size_t _i = 0; _i < _size; ++_i) { \
DEBUG(PLUGIN_NAME \
" plugin: Adding notification metadata name=%s value=%s", \
_items[_i].name, _items[_i].value); \
{.name = "name", .value = fs_info->name},
{.name = "fstype", .value = fs_info->fstype}};
- for (int i = 0; i < fs_info->ndevAlias; ++i) {
+ for (size_t i = 0; i < fs_info->ndevAlias; ++i) {
fs_dev_alias[i].name = "devAlias";
fs_dev_alias[i].value = fs_info->devAlias[i];
}
#endif /* HAVE_JOB_STATS */
static int get_domain_metrics(domain_t *domain) {
- struct lv_info info;
-
if (!domain || !domain->ptr) {
- ERROR(PLUGIN_NAME ": get_domain_metrics: NULL pointer");
+ ERROR(PLUGIN_NAME " plugin: get_domain_metrics: NULL pointer");
return -1;
}
- init_lv_info(&info);
- int status = lv_domain_info(domain->ptr, &info);
+ virDomainInfo info;
+ int status = virDomainGetInfo(domain->ptr, &info);
if (status != 0) {
ERROR(PLUGIN_NAME " plugin: virDomainGetInfo failed with status %i.",
status);
}
/* Gather remaining stats only for running domains */
- if (info.di.state != VIR_DOMAIN_RUNNING)
+ if (info.state != VIR_DOMAIN_RUNNING)
return 0;
- pcpu_submit(domain->ptr, &info);
- cpu_submit(domain, info.di.cpuTime);
+#ifdef HAVE_CPU_STATS
+ if (extra_stats & ex_stats_pcpu)
+ get_pcpu_stats(domain->ptr);
+#endif
+
+ cpu_submit(domain, info.cpuTime);
- memory_submit(domain->ptr, (gauge_t)info.di.memory * 1024);
+ memory_submit(domain->ptr, (gauge_t)info.memory * 1024);
- GET_STATS(get_vcpu_stats, "vcpu stats", domain->ptr, info.di.nrVirtCpu);
+ GET_STATS(get_vcpu_stats, "vcpu stats", domain->ptr, info.nrVirtCpu);
GET_STATS(get_memory_stats, "memory stats", domain->ptr);
#ifdef HAVE_PERF_STATS
#endif
/* Update cached virDomainInfo. It has to be done after cpu_submit */
- memcpy(&domain->info, &info.di, sizeof(domain->info));
+ memcpy(&domain->info, &info, sizeof(domain->info));
return 0;
}
return 0;
}
-static int domain_lifecycle_event_cb(__attribute__((unused)) virConnectPtr conn,
+static int domain_lifecycle_event_cb(__attribute__((unused)) virConnectPtr con_,
virDomainPtr dom, int event, int detail,
__attribute__((unused)) void *opaque) {
int domain_state = map_domain_event_to_state(event);
assert(thread_data != NULL);
ret = pthread_mutex_init(&thread_data->active_mutex, NULL);
if (ret != 0) {
- ERROR(PLUGIN_NAME ": Failed to initialize mutex, err %u", ret);
+ ERROR(PLUGIN_NAME " plugin: Failed to initialize mutex, err %u", ret);
return ret;
}
#endif
if (status != 0)
- ERROR(PLUGIN_NAME " failed to get metrics for domain=%s",
+ ERROR(PLUGIN_NAME " plugin: failed to get metrics for domain=%s",
virDomainGetName(dom->ptr));
}
int status = get_block_stats(&state->block_devices[i]);
if (status != 0)
ERROR(PLUGIN_NAME
- " failed to get stats for block device (%s) in domain %s",
+ " plugin: failed to get stats for block device (%s) in domain %s",
state->block_devices[i].path,
- virDomainGetName(state->domains[i].ptr));
+ virDomainGetName(state->block_devices[i].dom));
}
/* Get interface stats for each domain. */
for (int i = 0; i < state->nr_interface_devices; ++i) {
int status = get_if_dev_stats(&state->interface_devices[i]);
if (status != 0)
- ERROR(PLUGIN_NAME
- " failed to get interface stats for device (%s) in domain %s",
- state->interface_devices[i].path,
- virDomainGetName(state->interface_devices[i].dom));
+ ERROR(
+ PLUGIN_NAME
+ " plugin: failed to get interface stats for device (%s) in domain %s",
+ state->interface_devices[i].path,
+ virDomainGetName(state->interface_devices[i].dom));
}
return 0;
static int add_domain(struct lv_read_state *state, virDomainPtr dom,
bool active) {
- domain_t *new_ptr;
- int new_size = sizeof(state->domains[0]) * (state->nr_domains + 1);
- if (state->domains)
- new_ptr = realloc(state->domains, new_size);
- else
- new_ptr = malloc(new_size);
+ int new_size = sizeof(state->domains[0]) * (state->nr_domains + 1);
+ domain_t *new_ptr = realloc(state->domains, new_size);
if (new_ptr == NULL)
return -1;
static int add_block_device(struct lv_read_state *state, virDomainPtr dom,
const char *path) {
- struct block_device *new_ptr;
- int new_size =
- sizeof(state->block_devices[0]) * (state->nr_block_devices + 1);
- char *path_copy;
- path_copy = strdup(path);
+ char *path_copy = strdup(path);
if (!path_copy)
return -1;
- if (state->block_devices)
- new_ptr = realloc(state->block_devices, new_size);
- else
- new_ptr = malloc(new_size);
+ int new_size =
+ sizeof(state->block_devices[0]) * (state->nr_block_devices + 1);
+ struct block_device *new_ptr = realloc(state->block_devices, new_size);
if (new_ptr == NULL) {
sfree(path_copy);
return -1;
static int add_interface_device(struct lv_read_state *state, virDomainPtr dom,
const char *path, const char *address,
unsigned int number) {
- struct interface_device *new_ptr;
- int new_size =
- sizeof(state->interface_devices[0]) * (state->nr_interface_devices + 1);
- char *path_copy, *address_copy, number_string[21];
if ((path == NULL) || (address == NULL))
return EINVAL;
- path_copy = strdup(path);
+ char *path_copy = strdup(path);
if (!path_copy)
return -1;
- address_copy = strdup(address);
+ char *address_copy = strdup(address);
if (!address_copy) {
sfree(path_copy);
return -1;
}
+ char number_string[21];
snprintf(number_string, sizeof(number_string), "interface-%u", number);
+ char *number_copy = strdup(number_string);
+ if (!number_copy) {
+ sfree(path_copy);
+ sfree(address_copy);
+ return -1;
+ }
- if (state->interface_devices)
- new_ptr = realloc(state->interface_devices, new_size);
- else
- new_ptr = malloc(new_size);
+ int new_size =
+ sizeof(state->interface_devices[0]) * (state->nr_interface_devices + 1);
+ struct interface_device *new_ptr =
+ realloc(state->interface_devices, new_size);
if (new_ptr == NULL) {
sfree(path_copy);
sfree(address_copy);
+ sfree(number_copy);
return -1;
}
+
state->interface_devices = new_ptr;
state->interface_devices[state->nr_interface_devices].dom = dom;
state->interface_devices[state->nr_interface_devices].path = path_copy;
state->interface_devices[state->nr_interface_devices].address = address_copy;
- state->interface_devices[state->nr_interface_devices].number =
- strdup(number_string);
+ state->interface_devices[state->nr_interface_devices].number = number_copy;
return state->nr_interface_devices++;
}
static int ignore_device_match(ignorelist_t *il, const char *domname,
const char *devpath) {
char *name;
- int n, r;
+ int r;
if ((domname == NULL) || (devpath == NULL))
return 0;
- n = strlen(domname) + strlen(devpath) + 2;
+ size_t n = strlen(domname) + strlen(devpath) + 2;
name = malloc(n);
if (name == NULL) {
ERROR(PLUGIN_NAME " plugin: malloc failed.");
projects / collectd.git / blobdiff