static time_t last_refresh = (time_t)0;
static int refresh_lists(struct lv_read_instance *inst);
+static int register_event_impl(void);
+static int start_event_loop(virt_notif_thread_t *thread_data);
struct lv_block_stats {
virDomainBlockStatsStruct bi;
oconfig_item_t *c = ci->children + i;
if (strcasecmp(c->key, "Connection") == 0) {
- if (cf_util_get_string(c, &conn_string) != 0 || conn_string == NULL) {
- ERROR(PLUGIN_NAME " plugin: Could not get 'Connection' parameter");
+ if (cf_util_get_string(c, &conn_string) != 0 || conn_string == NULL)
return -1;
- }
continue;
} else if (strcasecmp(c->key, "RefreshInterval") == 0) {
- if (cf_util_get_int(c, &interval) != 0) {
- ERROR(PLUGIN_NAME " plugin: Could not get 'RefreshInterval' parameter");
+ if (cf_util_get_int(c, &interval) != 0)
return -1;
- }
continue;
} else if (strcasecmp(c->key, "Domain") == 0) {
char *domain_name = NULL;
- if (cf_util_get_string(c, &domain_name) != 0 || domain_name == NULL) {
- ERROR(PLUGIN_NAME " plugin: Could not get 'Domain' parameter");
+ if (cf_util_get_string(c, &domain_name) != 0)
return -1;
- }
if (ignorelist_add(il_domains, domain_name)) {
ERROR(PLUGIN_NAME " plugin: Adding '%s' to domain-ignorelist failed",
continue;
} else if (strcasecmp(c->key, "BlockDevice") == 0) {
char *device_name = NULL;
- if (cf_util_get_string(c, &device_name) != 0 || device_name == NULL) {
- ERROR(PLUGIN_NAME " plugin: Could not get 'BlockDevice' parameter");
+ if (cf_util_get_string(c, &device_name) != 0)
return -1;
- }
if (ignorelist_add(il_block_devices, device_name) != 0) {
ERROR(PLUGIN_NAME
continue;
} else if (strcasecmp(c->key, "BlockDeviceFormat") == 0) {
char *device_format = NULL;
- if (cf_util_get_string(c, &device_format) != 0 || device_format == NULL) {
- ERROR(PLUGIN_NAME
- " plugin: Could not get 'BlockDeviceFormat' parameter");
+ if (cf_util_get_string(c, &device_format) != 0)
return -1;
- }
if (strcasecmp(device_format, "target") == 0)
blockdevice_format = target;
sfree(device_format);
continue;
} else if (strcasecmp(c->key, "BlockDeviceFormatBasename") == 0) {
- if (cf_util_get_boolean(c, &blockdevice_format_basename) != 0) {
- ERROR(PLUGIN_NAME
- " plugin: Could not get 'BlockDeviceFormatBasename' parameter");
+ if (cf_util_get_boolean(c, &blockdevice_format_basename) != 0)
return -1;
- }
continue;
} else if (strcasecmp(c->key, "InterfaceDevice") == 0) {
char *interface_name = NULL;
- if (cf_util_get_string(c, &interface_name) != 0 ||
- interface_name == NULL) {
- ERROR(PLUGIN_NAME " plugin: Could not get 'InterfaceDevice' parameter");
+ if (cf_util_get_string(c, &interface_name) != 0)
return -1;
- }
if (ignorelist_add(il_interface_devices, interface_name)) {
ERROR(PLUGIN_NAME " plugin: Adding '%s' to interface-ignorelist failed",
continue;
} else if (strcasecmp(c->key, "IgnoreSelected") == 0) {
bool ignore_selected = false;
- if (cf_util_get_boolean(c, &ignore_selected) != 0) {
- ERROR(PLUGIN_NAME " plugin: Could not get 'IgnoreSelected' parameter");
+ if (cf_util_get_boolean(c, &ignore_selected) != 0)
return -1;
- }
if (ignore_selected) {
ignorelist_set_invert(il_domains, 0);
continue;
} else if (strcasecmp(c->key, "HostnameMetadataNS") == 0) {
- if (cf_util_get_string(c, &hm_ns) != 0) {
- ERROR(PLUGIN_NAME
- " plugin: Could not get 'HostnameMetadataNS' parameter");
+ if (cf_util_get_string(c, &hm_ns) != 0)
return -1;
- }
continue;
} else if (strcasecmp(c->key, "HostnameMetadataXPath") == 0) {
- if (cf_util_get_string(c, &hm_xpath) != 0) {
- ERROR(PLUGIN_NAME
- " plugin: Could not get 'HostnameMetadataXPath' parameter");
+ if (cf_util_get_string(c, &hm_xpath) != 0)
return -1;
- }
continue;
} else if (strcasecmp(c->key, "HostnameFormat") == 0) {
continue;
} else if (strcasecmp(c->key, "InterfaceFormat") == 0) {
char *format = NULL;
- if (cf_util_get_string(c, &format) != 0 || format == NULL) {
- ERROR(PLUGIN_NAME " plugin: could not get 'InterfaceFormat' parameter");
+ if (cf_util_get_string(c, &format) != 0)
return -1;
- }
if (strcasecmp(format, "name") == 0)
interface_format = if_name;
sfree(format);
continue;
} else if (strcasecmp(c->key, "Instances") == 0) {
- if (cf_util_get_int(c, &nr_instances) != 0) {
- ERROR(PLUGIN_NAME " plugin: could not get 'Instances' parameter");
+ if (cf_util_get_int(c, &nr_instances) != 0)
return -1;
- }
if (nr_instances <= 0) {
ERROR(PLUGIN_NAME " plugin: Instances <= 0 makes no sense.");
} else if (strcasecmp(c->key, "ExtraStats") == 0) {
char *ex_str = NULL;
- if (cf_util_get_string(c, &ex_str) != 0 || ex_str == NULL) {
- ERROR(PLUGIN_NAME " plugin: could not get 'ExtraStats' parameter");
+ if (cf_util_get_string(c, &ex_str) != 0)
return -1;
- }
char *exstats[EX_STATS_MAX_FIELDS];
int numexstats = strsplit(ex_str, exstats, STATIC_ARRAY_SIZE(exstats));
}
#endif
- /* ExtraStats parsed successfully*/
+ /* ExtraStats parsed successfully */
continue;
} else if (strcasecmp(c->key, "PersistentNotification") == 0) {
- if (cf_util_get_boolean(c, &persistent_notification) != 0) {
- ERROR(PLUGIN_NAME
- " plugin: could not get 'PersistentNotification' parameter");
+ if (cf_util_get_boolean(c, &persistent_notification) != 0)
return -1;
- }
continue;
} else if (strcasecmp(c->key, "ReportBlockDevices") == 0) {
- if (cf_util_get_boolean(c, &report_block_devices) != 0) {
- ERROR(PLUGIN_NAME
- " plugin: could not get 'ReportBlockDevices' parameter");
+ if (cf_util_get_boolean(c, &report_block_devices) != 0)
return -1;
- }
continue;
} else if (strcasecmp(c->key, "ReportNetworkInterfaces") == 0) {
- if (cf_util_get_boolean(c, &report_network_interfaces) != 0) {
- ERROR(PLUGIN_NAME
- " plugin: could not get 'ReportNetworkInterfaces' parameter");
+ if (cf_util_get_boolean(c, &report_network_interfaces) != 0)
return -1;
- }
continue;
} else {
static int lv_connect(void) {
if (conn == NULL) {
+ /* event implementation must be registered before connection is opened */
+ if (!persistent_notification)
+ if (register_event_impl() != 0)
+ return -1;
+
/* `conn_string == NULL' is acceptable */
#ifdef HAVE_FS_INFO
/* virDomainGetFSInfo requires full read-write access connection */
int status = virNodeGetInfo(conn, &nodeinfo);
if (status != 0) {
ERROR(PLUGIN_NAME " plugin: virNodeGetInfo failed");
+ virConnectClose(conn);
+ conn = NULL;
return -1;
}
+
+ if (!persistent_notification)
+ if (start_event_loop(¬if_thread) != 0) {
+ virConnectClose(conn);
+ conn = NULL;
+ return -1;
+ }
}
c_release(LOG_NOTICE, &conn_complain,
PLUGIN_NAME " plugin: Connection established.");
}
static int virt_notif_thread_init(virt_notif_thread_t *thread_data) {
- int ret;
-
assert(thread_data != NULL);
- ret = pthread_mutex_init(&thread_data->active_mutex, NULL);
+
+ int ret = pthread_mutex_init(&thread_data->active_mutex, NULL);
if (ret != 0) {
ERROR(PLUGIN_NAME " plugin: Failed to initialize mutex, err %u", ret);
return ret;
return -1;
}
+ DEBUG(PLUGIN_NAME " plugin: starting event loop");
+
virt_notif_thread_set_active(thread_data, 1);
if (pthread_create(&thread_data->event_loop_tid, NULL, event_loop_worker,
thread_data)) {
ERROR(PLUGIN_NAME " plugin: failed event loop thread creation");
+ virt_notif_thread_set_active(thread_data, 0);
virConnectDomainEventDeregisterAny(conn, thread_data->domain_event_cb_id);
+ thread_data->domain_event_cb_id = -1;
return -1;
}
/* stop event loop thread and deregister callback */
static void stop_event_loop(virt_notif_thread_t *thread_data) {
- /* stopping loop and de-registering event handler*/
- virt_notif_thread_set_active(thread_data, 0);
- if (conn != NULL && thread_data->domain_event_cb_id != -1)
- virConnectDomainEventDeregisterAny(conn, thread_data->domain_event_cb_id);
- if (pthread_join(notif_thread.event_loop_tid, NULL) != 0)
- ERROR(PLUGIN_NAME " plugin: stopping notification thread failed");
+ DEBUG(PLUGIN_NAME " plugin: stopping event loop");
+
+ /* Stopping loop */
+ if (virt_notif_thread_is_active(thread_data)) {
+ virt_notif_thread_set_active(thread_data, 0);
+ if (pthread_join(notif_thread.event_loop_tid, NULL) != 0)
+ ERROR(PLUGIN_NAME " plugin: stopping notification thread failed");
+ }
+
+ /* ... and de-registering event handler */
+ if (conn != NULL && thread_data->domain_event_cb_id != -1) {
+ virConnectDomainEventDeregisterAny(conn, thread_data->domain_event_cb_id);
+ thread_data->domain_event_cb_id = -1;
+ }
}
static int persistent_domains_state_notification(void) {
}
static int lv_read(user_data_t *ud) {
- time_t t;
- struct lv_read_instance *inst = NULL;
- struct lv_read_state *state = NULL;
-
if (ud->data == NULL) {
ERROR(PLUGIN_NAME " plugin: NULL userdata");
return -1;
}
- inst = ud->data;
- state = &inst->read_state;
-
- bool reconnect = conn == NULL ? true : false;
- /* event implementation must be registered before connection is opened */
- if (inst->id == 0) {
- if (!persistent_notification && reconnect)
- if (register_event_impl() != 0)
- return -1;
+ struct lv_read_instance *inst = ud->data;
+ struct lv_read_state *state = &inst->read_state;
+ if (inst->id == 0)
if (lv_connect() < 0)
return -1;
- if (!persistent_notification && reconnect && conn != NULL)
- if (start_event_loop(¬if_thread) != 0)
- return -1;
- }
+ /* Wait until inst#0 establish connection */
+ if (conn == NULL)
+ return 0;
+ time_t t;
time(&t);
/* Need to refresh domain or device lists? */
if (lv_init_ignorelists() != 0)
return -1;
- /* event implementation must be registered before connection is opened */
if (!persistent_notification)
- if (register_event_impl() != 0)
- return -1;
-
- if (lv_connect() != 0)
- return -1;
-
- DEBUG(PLUGIN_NAME " plugin: starting event loop");
-
- if (!persistent_notification) {
virt_notif_thread_init(¬if_thread);
- if (start_event_loop(¬if_thread) != 0)
- return -1;
- }
+
+ lv_connect();
DEBUG(PLUGIN_NAME " plugin: starting %i instances", nr_instances);
lv_fini_instance(i);
}
- DEBUG(PLUGIN_NAME " plugin: stopping event loop");
-
if (!persistent_notification)
stop_event_loop(¬if_thread);
projects / collectd.git / blobdiff