netdev-vport: Use ovs_mutex rather than a raw pthread_mutex_t.
authorBen Pfaff <blp@nicira.com>
Wed, 31 Jul 2013 21:15:05 +0000 (14:15 -0700)
committerBen Pfaff <blp@nicira.com>
Thu, 8 Aug 2013 06:40:31 +0000 (23:40 -0700)
I'd forgotten even to use the xpthread variants here.

Signed-off-by: Ben Pfaff <blp@nicira.com>
Acked-by: Andy Zhou <azhou@nicira.com>
lib/netdev-vport.c

index 4214b38..14b3347 100644 (file)
@@ -413,17 +413,17 @@ set_tunnel_config(struct netdev *dev_, const struct smap *args)
     }
 
     if (tnl_cfg.ipsec) {
-        static pthread_mutex_t mutex = PTHREAD_MUTEX_INITIALIZER;
+        static struct ovs_mutex mutex = OVS_MUTEX_INITIALIZER;
         static pid_t pid = 0;
 
-        pthread_mutex_lock(&mutex);
+        ovs_mutex_lock(&mutex);
         if (pid <= 0) {
             char *file_name = xasprintf("%s/%s", ovs_rundir(),
                                         "ovs-monitor-ipsec.pid");
             pid = read_pidfile(file_name);
             free(file_name);
         }
-        pthread_mutex_unlock(&mutex);
+        ovs_mutex_unlock(&mutex);
 
         if (pid < 0) {
             VLOG_ERR("%s: IPsec requires the ovs-monitor-ipsec daemon",