X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Fovs_stats.c;h=23b7533c185a0ddeb52d21c800c5ce2351e28b78;hb=9eb3efd17e10c3bd59aa227d8d11fe60d6d4f303;hp=bbdb600fde7fe057863145a0717cfc27d7a84c72;hpb=481983e05f050dd860bb319c4368da040304d1ea;p=collectd.git diff --git a/src/ovs_stats.c b/src/ovs_stats.c index bbdb600f..23b7533c 100644 --- a/src/ovs_stats.c +++ b/src/ovs_stats.c @@ -33,7 +33,7 @@ static const char plugin_name[] = "ovs_stats"; typedef enum iface_counter { - not_supportred = -1, + not_supported = -1, collisions, rx_bytes, rx_crc_err, @@ -128,19 +128,19 @@ static const char *const iface_counter_table[IFACE_COUNTER_COUNT] = { }; /* Entry into the list of network bridges */ -static bridge_list_t *g_bridge_list_head = NULL; +static bridge_list_t *g_bridge_list_head; /* Entry into the list of monitored network bridges */ -static bridge_list_t *g_monitored_bridge_list_head = NULL; +static bridge_list_t *g_monitored_bridge_list_head; /* entry into the list of network bridges */ -static port_list_t *g_port_list_head = NULL; +static port_list_t *g_port_list_head; /* lock for statistics cache */ static pthread_mutex_t g_stats_lock; /* OvS DB socket */ -static ovs_db_t *ovs_db = NULL; +static ovs_db_t *g_ovs_db; /* OVS stats configuration data */ struct ovs_stats_config_s { @@ -155,11 +155,11 @@ static ovs_stats_config_t ovs_stats_cfg = { .ovs_db_serv = "6640", /* use default OVS DB service */ }; -static const iface_counter ovs_stats_counter_name_to_type(const char *counter) { - iface_counter index = not_supportred; +static iface_counter ovs_stats_counter_name_to_type(const char *counter) { + iface_counter index = not_supported; if (counter == NULL) - return not_supportred; + return not_supported; for (int i = 0; i < IFACE_COUNTER_COUNT; i++) { if (strncmp(iface_counter_table[i], counter, @@ -349,13 +349,15 @@ static int ovs_stats_update_bridge(yajl_val bridge) { if (br_ports && YAJL_IS_ARRAY(br_ports)) { char *tmp = YAJL_GET_STRING(br_ports->u.array.values[0]); if (tmp != NULL && strcmp("set", tmp) == 0) { - yajl_val *ports_arr = - YAJL_GET_ARRAY(br_ports->u.array.values[1])->values; - size_t ports_num = YAJL_GET_ARRAY(br_ports->u.array.values[1])->len; - - for (int i = 0; i < ports_num; i++) - ovs_stats_new_port( - br, YAJL_GET_STRING(ports_arr[i]->u.array.values[1])); + yajl_val *array = YAJL_GET_ARRAY(br_ports)->values; + size_t array_len = YAJL_GET_ARRAY(br_ports)->len; + if (array != NULL && array_len > 0 && YAJL_IS_ARRAY(array[1])) { + yajl_val *ports_arr = YAJL_GET_ARRAY(array[1])->values; + size_t ports_num = YAJL_GET_ARRAY(array[1])->len; + for (size_t i = 0; i < ports_num && ports_arr != NULL; i++) + ovs_stats_new_port( + br, YAJL_GET_STRING(ports_arr[i]->u.array.values[1])); + } } else ovs_stats_new_port(br, YAJL_GET_STRING(br_ports->u.array.values[1])); } @@ -398,7 +400,7 @@ static void ovs_stats_bridge_table_change_cb(yajl_val jupdates) { yajl_val bridges = yajl_tree_get(jupdates, path, yajl_t_object); if (bridges && YAJL_IS_OBJECT(bridges)) { - for (int i = 0; i < YAJL_GET_OBJECT(bridges)->len; i++) { + for (size_t i = 0; i < YAJL_GET_OBJECT(bridges)->len; i++) { yajl_val bridge = YAJL_GET_OBJECT(bridges)->values[i]; ovs_stats_update_bridge(bridge); } @@ -412,7 +414,7 @@ static void ovs_stats_bridge_table_delete_cb(yajl_val jupdates) { yajl_val bridge; if (bridges && YAJL_IS_OBJECT(bridges)) { pthread_mutex_lock(&g_stats_lock); - for (int i = 0; i < YAJL_GET_OBJECT(bridges)->len; i++) { + for (size_t i = 0; i < YAJL_GET_OBJECT(bridges)->len; i++) { bridge = YAJL_GET_OBJECT(bridges)->values[i]; ovs_stats_del_bridge(bridge); } @@ -498,7 +500,7 @@ static void ovs_stats_port_table_change_cb(yajl_val jupdates) { yajl_val ports = yajl_tree_get(jupdates, path, yajl_t_object); yajl_val port; if (ports && YAJL_IS_OBJECT(ports)) { - for (int i = 0; i < YAJL_GET_OBJECT(ports)->len; i++) { + for (size_t i = 0; i < YAJL_GET_OBJECT(ports)->len; i++) { port = YAJL_GET_OBJECT(ports)->values[i]; ovs_stats_update_port(YAJL_GET_OBJECT(ports)->keys[i], port); } @@ -521,7 +523,7 @@ static void ovs_stats_port_table_delete_cb(yajl_val jupdates) { yajl_val ports = yajl_tree_get(jupdates, path, yajl_t_object); pthread_mutex_lock(&g_stats_lock); if (ports && YAJL_IS_OBJECT(ports)) - for (int i = 0; i < YAJL_GET_OBJECT(ports)->len; i++) { + for (size_t i = 0; i < YAJL_GET_OBJECT(ports)->len; i++) { ovs_stats_del_port(YAJL_GET_OBJECT(ports)->keys[i]); } pthread_mutex_unlock(&g_stats_lock); @@ -535,12 +537,14 @@ static int ovs_stats_update_iface_stats(port_list_t *port, yajl_val stats) { char *counter_name = NULL; int64_t counter_value = 0; if (stats && YAJL_IS_ARRAY(stats)) - for (int i = 0; i < YAJL_GET_ARRAY(stats)->len; i++) { + for (size_t i = 0; i < YAJL_GET_ARRAY(stats)->len; i++) { stat = YAJL_GET_ARRAY(stats)->values[i]; + if (!YAJL_IS_ARRAY(stat)) + return (-1); counter_name = YAJL_GET_STRING(YAJL_GET_ARRAY(stat)->values[0]); counter_index = ovs_stats_counter_name_to_type(counter_name); counter_value = YAJL_GET_INTEGER(YAJL_GET_ARRAY(stat)->values[1]); - if (counter_index == not_supportred) + if (counter_index == not_supported) continue; port->stats[counter_index] = counter_value; } @@ -555,8 +559,10 @@ static int ovs_stats_update_iface_ext_ids(port_list_t *port, yajl_val ext_ids) { char *value; if (ext_ids && YAJL_IS_ARRAY(ext_ids)) - for (int i = 0; i < YAJL_GET_ARRAY(ext_ids)->len; i++) { + for (size_t i = 0; i < YAJL_GET_ARRAY(ext_ids)->len; i++) { ext_id = YAJL_GET_ARRAY(ext_ids)->values[i]; + if (!YAJL_IS_ARRAY(ext_id)) + return (-1); key = YAJL_GET_STRING(YAJL_GET_ARRAY(ext_id)->values[0]); value = YAJL_GET_STRING(YAJL_GET_ARRAY(ext_id)->values[1]); if (key && value) { @@ -681,7 +687,7 @@ static void ovs_stats_interface_table_change_cb(yajl_val jupdates) { yajl_val ports = yajl_tree_get(jupdates, path, yajl_t_object); pthread_mutex_lock(&g_stats_lock); if (ports && YAJL_IS_OBJECT(ports)) - for (int i = 0; i < YAJL_GET_OBJECT(ports)->len; i++) + for (size_t i = 0; i < YAJL_GET_OBJECT(ports)->len; i++) ovs_stats_update_iface(YAJL_GET_OBJECT(ports)->values[i]); pthread_mutex_unlock(&g_stats_lock); return; @@ -737,19 +743,21 @@ static void ovs_stats_initialize(ovs_db_t *pdb) { /* Check if bridge is configured to be monitored in config file */ static int ovs_stats_is_monitored_bridge(const char *br_name) { - int rc = 0; /* if no bridges are configured, return true */ - if (!(rc = (g_monitored_bridge_list_head == NULL))) - rc = (ovs_stats_get_bridge(g_monitored_bridge_list_head, br_name) != NULL); - return rc; + if (g_monitored_bridge_list_head == NULL) + return (1); + + /* check if given bridge exists */ + if (ovs_stats_get_bridge(g_monitored_bridge_list_head, br_name) != NULL) + return (1); + + return 0; } /* Delete all ports from port list */ static void ovs_stats_free_port_list(port_list_t *head) { - port_list_t *i, *del; - - for (i = head; i != NULL;) { - del = i; + for (port_list_t *i = head; i != NULL;) { + port_list_t *del = i; i = i->next; sfree(del); } @@ -757,10 +765,8 @@ static void ovs_stats_free_port_list(port_list_t *head) { /* Delete all bridges from bridge list */ static void ovs_stats_free_bridge_list(bridge_list_t *head) { - bridge_list_t *i, *del; - - for (i = head; i != NULL;) { - del = i; + for (bridge_list_t *i = head; i != NULL;) { + bridge_list_t *del = i; i = i->next; sfree(del->name); sfree(del); @@ -769,7 +775,6 @@ static void ovs_stats_free_bridge_list(bridge_list_t *head) { /* Handle OVSDB lost connection callback */ static void ovs_stats_conn_terminate() { - WARNING("Lost connection to OVSDB server"); pthread_mutex_lock(&g_stats_lock); ovs_stats_free_bridge_list(g_bridge_list_head); @@ -857,7 +862,7 @@ static int ovs_stats_plugin_init(void) { plugin_name, ovs_stats_cfg.ovs_db_node, ovs_stats_cfg.ovs_db_serv, ovs_stats_cfg.ovs_db_unix); /* connect to OvS DB */ - if ((ovs_db = ovs_db_init (ovs_stats_cfg.ovs_db_node, + if ((g_ovs_db = ovs_db_init (ovs_stats_cfg.ovs_db_node, ovs_stats_cfg.ovs_db_serv, ovs_stats_cfg.ovs_db_unix, &cb)) == NULL) { ERROR("%s: plugin: failed to connect to OvS DB server", plugin_name); @@ -866,7 +871,7 @@ static int ovs_stats_plugin_init(void) { int err = pthread_mutex_init(&g_stats_lock, NULL); if (err < 0) { ERROR("%s: plugin: failed to initialize cache lock", plugin_name); - ovs_db_destroy(ovs_db); + ovs_db_destroy(g_ovs_db); return (-1); } return (0); @@ -876,7 +881,7 @@ static int ovs_stats_plugin_init(void) { static int ovs_stats_plugin_read(__attribute__((unused)) user_data_t *ud) { bridge_list_t *bridge; port_list_t *port; - char devname[PORT_NAME_SIZE_MAX]; + char devname[PORT_NAME_SIZE_MAX * 2]; pthread_mutex_lock(&g_stats_lock); for (bridge = g_bridge_list_head; bridge != NULL; bridge = bridge->next) { @@ -927,6 +932,9 @@ static int ovs_stats_plugin_read(__attribute__((unused)) user_data_t *ud) { ovs_stats_submit_two(devname, "if_packets", "128_to_255_packets", port->stats[rx_128_to_255_packets], port->stats[tx_128_to_255_packets], meta); + ovs_stats_submit_two(devname, "if_packets", "256_to_511_packets", + port->stats[rx_256_to_511_packets], + port->stats[tx_256_to_511_packets], meta); ovs_stats_submit_two(devname, "if_packets", "512_to_1023_packets", port->stats[rx_512_to_1023_packets], port->stats[tx_512_to_1023_packets], meta); @@ -963,7 +971,7 @@ static int ovs_stats_plugin_read(__attribute__((unused)) user_data_t *ud) { static int ovs_stats_plugin_shutdown(void) { pthread_mutex_lock(&g_stats_lock); DEBUG("OvS Statistics plugin shutting down"); - ovs_db_destroy(ovs_db); + ovs_db_destroy(g_ovs_db); ovs_stats_free_bridge_list(g_bridge_list_head); ovs_stats_free_bridge_list(g_monitored_bridge_list_head); ovs_stats_free_port_list(g_port_list_head);