From: Ben Pfaff <blp@nicira.com>
Date: Fri, 26 Apr 2013 18:22:19 +0000 (-0700)
Subject: ofp-parse: Make parse_ofp_str() thread-safe.
X-Git-Tag: sliver-openvswitch-2.0.90-1~34^2~53
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=a944ef4079538b9a2ed9d754554314b1539bf304;p=sliver-openvswitch.git

ofp-parse: Make parse_ofp_str() thread-safe.

Signed-off-by: Ben Pfaff <blp@nicira.com>
Acked-by: Andy Zhou <azhou@nicira.com>
---

diff --git a/lib/ofp-parse.c b/lib/ofp-parse.c
index 618290b7a..4b8036db3 100644
--- a/lib/ofp-parse.c
+++ b/lib/ofp-parse.c
@@ -34,6 +34,7 @@
 #include "ofp-util.h"
 #include "ofpbuf.h"
 #include "openflow/openflow.h"
+#include "ovs-thread.h"
 #include "packets.h"
 #include "socket-util.h"
 #include "vconn.h"
@@ -1519,12 +1520,16 @@ static char * WARN_UNUSED_RESULT
 parse_flow_monitor_request__(struct ofputil_flow_monitor_request *fmr,
                              const char *str_, char *string)
 {
+    static pthread_mutex_t mutex = PTHREAD_ADAPTIVE_MUTEX_INITIALIZER;
     static uint32_t id;
 
     char *save_ptr = NULL;
     char *name;
 
+    xpthread_mutex_lock(&mutex);
     fmr->id = id++;
+    xpthread_mutex_unlock(&mutex);
+
     fmr->flags = (NXFMF_INITIAL | NXFMF_ADD | NXFMF_DELETE | NXFMF_MODIFY
                   | NXFMF_OWN | NXFMF_ACTIONS);
     fmr->out_port = OFPP_NONE;