commit 72a0ffe9c18ec043c3c7f168ec211d206cfa1bd2
author Treehugger Robot <treehugger-gerrit@google.com> Tue Mar 26 05:07:50 2019 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Tue Mar 26 05:07:50 2019 +0000
tree b7f1b5486e6795d0cb1748af91c6e2f1eeb45879
parent dece12434dced6ba4b1bf2759f34c48fdaa08d14
parent 772a8de356ed0aff805e2c3a6a435f6e0eb35c69

Merge "Adding thread safety to proto uploader"

keystore/operation_proto_handler.cpp

diff --git a/keystore/operation_proto_handler.cpp b/keystore/operation_proto_handler.cpp
index 1833acb..dfc0692 100644
--- a/keystore/operation_proto_handler.cpp
+++ b/keystore/operation_proto_handler.cpp
@@ -106,6 +106,7 @@
 }
 
 void OperationProtoHandler::uploadOpAsProto(Operation& op, bool wasOpSuccessful) {
+    std::lock_guard<std::mutex> lock(op_upload_mutex);
     OperationConfig operationConfig;
     determinePurpose(op.purpose, &operationConfig);
     checkKeyCharacteristics(op.characteristics.softwareEnforced, &operationConfig);

keystore/operation_proto_handler.h

diff --git a/keystore/operation_proto_handler.h b/keystore/operation_proto_handler.h
index 838f3ec..64d0a59 100644
--- a/keystore/operation_proto_handler.h
+++ b/keystore/operation_proto_handler.h
@@ -20,6 +20,7 @@
 #include "operation_config.pb.h"
 #include "operation_struct.h"
 #include <chrono>
+#include <mutex>
 #include <unordered_map>
 #include <vector>
 
@@ -35,6 +36,7 @@
   private:
     std::unordered_map<std::string, int> protoMap;
     std::chrono::steady_clock::time_point start_time = std::chrono::steady_clock::now();
+    std::mutex op_upload_mutex;
 };
 
 }  // namespace keystore