plugin_dispatch_values(&vl);
}
-static void ovs_stats_submit_interfaces(bridge_list_t *bridge,
- port_list_t *port) {
+static void ovs_stats_submit_interfaces(port_list_t *port) {
char devname[PORT_NAME_SIZE_MAX * 2];
+ bridge_list_t *bridge = port->br;
for (interface_list_t *iface = port->iface; iface != NULL;
iface = iface->next) {
meta_data_t *meta = meta_data_create();
return value;
}
-static void ovs_stats_submit_port(bridge_list_t *bridge, port_list_t *port) {
+static void ovs_stats_submit_port(port_list_t *port) {
char devname[PORT_NAME_SIZE_MAX * 2];
meta_data_t *meta = meta_data_create();
i++;
}
}
+ bridge_list_t *bridge = port->br;
snprintf(devname, sizeof(devname), "%s.%s", bridge->name, port->name);
ovs_stats_submit_one(devname, "if_collisions", NULL,
ovs_stats_get_port_stat_value(port, collisions), meta);
return NULL;
}
+/* Check if bridge is configured to be monitored in config file */
+static int ovs_stats_is_monitored_bridge(const char *br_name) {
+ /* if no bridges are configured, return true */
+ 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 bridge */
static int ovs_stats_del_bridge(yajl_val bridge) {
const char *old[] = {"old", NULL};
if (!br_name || !YAJL_IS_STRING(br_name))
return 0;
+ if (!ovs_stats_is_monitored_bridge(YAJL_GET_STRING(br_name)))
+ return 0;
+
bridge_list_t *br =
ovs_stats_get_bridge(g_bridge_list_head, YAJL_GET_STRING(br_name));
if (br == NULL) {
OVS_DB_TABLE_CB_FLAG_DELETE);
}
-/* Check if bridge is configured to be monitored in config file */
-static int ovs_stats_is_monitored_bridge(const char *br_name) {
- /* if no bridges are configured, return true */
- 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) {
for (port_list_t *i = head; i != NULL;) {
/* OvS stats read callback. Read bridge/port information and submit it*/
static int ovs_stats_plugin_read(__attribute__((unused)) user_data_t *ud) {
- bridge_list_t *bridge;
- port_list_t *port;
-
pthread_mutex_lock(&g_stats_lock);
- for (bridge = g_bridge_list_head; bridge != NULL; bridge = bridge->next) {
- if (!ovs_stats_is_monitored_bridge(bridge->name))
+ for (port_list_t *port = g_port_list_head; port != NULL; port = port->next) {
+ if (strlen(port->name) == 0)
+ /* Skip port w/o name. This is possible when read callback
+ * is called after Interface Table update callback but before
+ * Port table Update callback. Will add this port on next read */
continue;
- for (port = g_port_list_head; port != NULL; port = port->next) {
- if (port->br != bridge)
- continue;
-
- if (strlen(port->name) == 0)
- /* Skip port w/o name. This is possible when read callback
- * is called after Interface Table update callback but before
- * Port table Update callback. Will add this port on next read */
- continue;
+ /* Skip port if it has no bridge */
+ if (!port->br)
+ continue;
- ovs_stats_submit_port(bridge, port);
+ ovs_stats_submit_port(port);
- if (interface_stats)
- ovs_stats_submit_interfaces(bridge, port);
- }
+ if (interface_stats)
+ ovs_stats_submit_interfaces(port);
}
pthread_mutex_unlock(&g_stats_lock);
return 0;