ovs_stats: Locking reworked

[collectd.git] / src / ovs_stats.c

diff --git a/src/ovs_stats.c b/src/ovs_stats.c
index a75229c..9b958d8 100644 (file)
--- a/src/ovs_stats.c
+++ b/src/ovs_stats.c
@@ -80,7 +80,6 @@ typedef enum iface_counter {
 
 typedef struct interface_s {
   char name[PORT_NAME_SIZE_MAX];      /* Interface name */
-  char port_uuid[UUID_SIZE];          /* Port table _uuid */
   char iface_uuid[UUID_SIZE];         /* Interface table uuid */
   char ex_iface_id[UUID_SIZE];        /* External iface id */
   char ex_vm_id[UUID_SIZE];           /* External vm id */
@@ -489,12 +488,9 @@ static interface_list_t *ovs_stats_new_port_interface(port_list_t *port,
     }
     memset(iface->stats, -1, sizeof(int64_t[IFACE_COUNTER_COUNT]));
     sstrncpy(iface->iface_uuid, uuid, sizeof(iface->iface_uuid));
-    sstrncpy(iface->port_uuid, port->port_uuid, sizeof(iface->port_uuid));
-    pthread_mutex_lock(&g_stats_lock);
     interface_list_t *iface_head = port->iface;
     iface->next = iface_head;
     port->iface = iface;
-    pthread_mutex_unlock(&g_stats_lock);
   }
   return iface;
 }
@@ -514,15 +510,11 @@ static port_list_t *ovs_stats_new_port(bridge_list_t *bridge,
       return NULL;
     }
     sstrncpy(port->port_uuid, uuid, sizeof(port->port_uuid));
-    pthread_mutex_lock(&g_stats_lock);
     port->next = g_port_list_head;
     g_port_list_head = port;
-    pthread_mutex_unlock(&g_stats_lock);
   }
   if (bridge != NULL) {
-    pthread_mutex_lock(&g_stats_lock);
     port->br = bridge;
-    pthread_mutex_unlock(&g_stats_lock);
   }
   return port;
 }
@@ -581,7 +573,6 @@ static int ovs_stats_update_bridge(yajl_val bridge) {
   const char *new[] = {"new", NULL};
   const char *name[] = {"name", NULL};
   const char *ports[] = {"ports", NULL};
-  bridge_list_t *br = NULL;
 
   if (!bridge || !YAJL_IS_OBJECT(bridge))
     goto failure;
@@ -591,32 +582,30 @@ static int ovs_stats_update_bridge(yajl_val bridge) {
     return 0;
 
   yajl_val br_name = yajl_tree_get(row, name, yajl_t_string);
-  if (br_name && YAJL_IS_STRING(br_name)) {
-    br = ovs_stats_get_bridge(g_bridge_list_head, YAJL_GET_STRING(br_name));
-    pthread_mutex_lock(&g_stats_lock);
-    if (br == NULL) {
-      br = calloc(1, sizeof(*br));
-      if (!br) {
-        pthread_mutex_unlock(&g_stats_lock);
-        ERROR("%s: calloc(%zu) failed.", plugin_name, sizeof(*br));
-        return -1;
-      }
+  if (!br_name || !YAJL_IS_STRING(br_name))
+    return 0;
 
-      char *tmp = YAJL_GET_STRING(br_name);
-      if (tmp != NULL)
-        br->name = strdup(tmp);
+  bridge_list_t *br =
+      ovs_stats_get_bridge(g_bridge_list_head, YAJL_GET_STRING(br_name));
+  if (br == NULL) {
+    br = calloc(1, sizeof(*br));
+    if (!br) {
+      ERROR("%s: calloc(%zu) failed.", plugin_name, sizeof(*br));
+      return -1;
+    }
 
-      if (br->name == NULL) {
-        sfree(br);
-        pthread_mutex_unlock(&g_stats_lock);
-        ERROR("%s: strdup failed.", plugin_name);
-        return -1;
-      }
+    char *tmp = YAJL_GET_STRING(br_name);
+    if (tmp != NULL)
+      br->name = strdup(tmp);
 
-      br->next = g_bridge_list_head;
-      g_bridge_list_head = br;
+    if (br->name == NULL) {
+      sfree(br);
+      ERROR("%s: strdup failed.", plugin_name);
+      return -1;
     }
-    pthread_mutex_unlock(&g_stats_lock);
+
+    br->next = g_bridge_list_head;
+    g_bridge_list_head = br;
   }
 
   yajl_val br_ports = yajl_tree_get(row, ports, yajl_t_array);
@@ -684,10 +673,12 @@ static void ovs_stats_bridge_table_change_cb(yajl_val jupdates) {
   if (!bridges || !YAJL_IS_OBJECT(bridges))
     return;
 
+  pthread_mutex_lock(&g_stats_lock);
   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);
   }
+  pthread_mutex_unlock(&g_stats_lock);
 }
 
 /* Handle Bridge Table delete event */
@@ -738,10 +729,8 @@ static int ovs_stats_update_port(const char *uuid, yajl_val port) {
   if (!portentry)
     return 0;
 
-  pthread_mutex_lock(&g_stats_lock);
   sstrncpy(portentry->name, YAJL_GET_STRING(port_name),
            sizeof(portentry->name));
-  pthread_mutex_unlock(&g_stats_lock);
 
   yajl_val ifaces_root = ovs_utils_get_value_by_key(row, "interfaces");
   char *ifaces_root_key =
@@ -823,10 +812,12 @@ static void ovs_stats_port_table_change_cb(yajl_val jupdates) {
   if (!ports || !YAJL_IS_OBJECT(ports))
     return;
 
+  pthread_mutex_lock(&g_stats_lock);
   for (size_t i = 0; i < YAJL_GET_OBJECT(ports)->len; i++) {
     yajl_val port = YAJL_GET_OBJECT(ports)->values[i];
     ovs_stats_update_port(YAJL_GET_OBJECT(ports)->keys[i], port);
   }
+  pthread_mutex_unlock(&g_stats_lock);
   return;
 }