Address tsan warning: protecting flowmod changes with a mutex in test code

Signed-off-by: Gautam Venkataramanan <gautam.chennai@gmail.com>
Change-Id: I286fdef4029d02441a45a91383f45af534dabf32

Author: gautvenk

agent-ovs/ovs/test/MockFlowExecutor.cpp

@@ -51,6 +51,7 @@ MockFlowExecutor::MockFlowExecutor()
     : ignoreFlowMods(true), ignoreGroupMods(true), ignoreTlvMods(true) {}
 
 bool MockFlowExecutor::Execute(const FlowEdit& flowEdits) {
+    std::lock_guard<std::mutex> guard(flow_mod_mutex);
     if (ignoreFlowMods) return true;
 
     FlowEdit editCopy = flowEdits;
@@ -121,10 +122,12 @@ bool MockFlowExecutor::Execute(const TlvEdit& TlvEdits) {
     return true;
 }
 void MockFlowExecutor::Expect(FlowEdit::type mod, const string& fe) {
+    std::lock_guard<std::mutex> guard(flow_mod_mutex);
     ignoreFlowMods = false;
     flowMods.push_back(mod_t(mod, fe));
 }
 void MockFlowExecutor::Expect(FlowEdit::type mod, const vector<string>& fe) {
+    std::lock_guard<std::mutex> guard(flow_mod_mutex);
     ignoreFlowMods = false;
     for (const string& s : fe)
         flowMods.push_back(mod_t(mod, s));
@@ -145,6 +148,7 @@ void MockFlowExecutor::IgnoreTlvMods() {
     tlvMods.clear();
 }
 void MockFlowExecutor::IgnoreFlowMods() {
+    std::lock_guard<std::mutex> guard(flow_mod_mutex);
     ignoreFlowMods = true;
     flowMods.clear();
 }
@@ -153,16 +157,24 @@ void MockFlowExecutor::IgnoreGroupMods() {
     ignoreGroupMods = true;
     groupMods.clear();
 }
-bool MockFlowExecutor::IsEmpty() { return flowMods.empty() || ignoreFlowMods; }
+bool MockFlowExecutor::IsEmpty() {
+    std::lock_guard<std::mutex> guard(flow_mod_mutex);
+    return flowMods.empty() || ignoreFlowMods;
+}
 bool MockFlowExecutor::IsGroupEmpty() {
     std::lock_guard<std::mutex> guard(group_mod_mutex);
     return groupMods.empty() || ignoreGroupMods;
 }
 bool MockFlowExecutor::IsTlvEmpty() { return tlvMods.empty() || ignoreTlvMods; }
 void MockFlowExecutor::Clear() {
-    std::lock_guard<std::mutex> guard(group_mod_mutex);
-    flowMods.clear();
-    groupMods.clear();
+    {
+        std::lock_guard<std::mutex> guard(flow_mod_mutex);
+        flowMods.clear();
+    }
+    {
+        std::lock_guard<std::mutex> guard(group_mod_mutex);
+        groupMods.clear();
+    }
     tlvMods.clear();
 }
 

agent-ovs/ovs/test/include/MockFlowExecutor.h

@@ -51,6 +51,7 @@ class MockFlowExecutor : public FlowExecutor {
     bool ignoreFlowMods;
     std::unordered_set<int> ignoredFlowMods;
     std::mutex group_mod_mutex;
+    std::mutex flow_mod_mutex;
     bool ignoreGroupMods;
     bool ignoreTlvMods;
 };