Merge pull request #1569 from LitvinenkoIra/fix/crushes_with_DCHECK_set_sizes_equal

Make Size() function thread safe to avoid core dump

2 files changed, 8 insertions, 8 deletions

diff --git a/src/components/application_manager/include/application_manager/request_info.h b/src/components/application_manager/include/application_manager/request_info.h
index da1bd0a2ee..be28bad63c 100644
--- a/src/components/application_manager/include/application_manager/request_info.h
+++ b/src/components/application_manager/include/application_manager/request_info.h
@@ -264,8 +264,7 @@ class RequestInfoSet {
   TimeSortedRequestInfoSet time_sorted_pending_requests_;
   HashSortedRequestInfoSet hash_sorted_pending_requests_;
 
-  // the lock caled this_lock_, since the class represent collection by itself.
-  sync_primitives::Lock this_lock_;
+  sync_primitives::Lock pending_requests_lock_;
 };
 
 /**
diff --git a/src/components/application_manager/src/request_info.cc b/src/components/application_manager/src/request_info.cc
index cd99a42508..bbcda06b43 100644
--- a/src/components/application_manager/src/request_info.cc
+++ b/src/components/application_manager/src/request_info.cc
@@ -122,7 +122,7 @@ bool RequestInfoSet::Add(RequestInfoPtr request_info) {
       logger_,
       "Add request app_id = " << request_info->app_id()
                               << "; corr_id = " << request_info->requestId());
-  sync_primitives::AutoLock lock(this_lock_);
+  sync_primitives::AutoLock lock(pending_requests_lock_);
   CheckSetSizes();
   const std::pair<HashSortedRequestInfoSet::iterator, bool>& insert_resilt =
       hash_sorted_pending_requests_.insert(request_info);
@@ -153,7 +153,7 @@ RequestInfoPtr RequestInfoSet::Find(const uint32_t connection_key,
   std::shared_ptr<FakeRequestInfo> request_info_for_search(
       new FakeRequestInfo(connection_key, correlation_id));
 
-  sync_primitives::AutoLock lock(this_lock_);
+  sync_primitives::AutoLock lock(pending_requests_lock_);
   HashSortedRequestInfoSet::iterator it =
       hash_sorted_pending_requests_.find(request_info_for_search);
   if (it != hash_sorted_pending_requests_.end()) {
@@ -165,7 +165,7 @@ RequestInfoPtr RequestInfoSet::Find(const uint32_t connection_key,
 RequestInfoPtr RequestInfoSet::Front() {
   RequestInfoPtr result;
 
-  sync_primitives::AutoLock lock(this_lock_);
+  sync_primitives::AutoLock lock(pending_requests_lock_);
   TimeSortedRequestInfoSet::iterator it = time_sorted_pending_requests_.begin();
   if (it != time_sorted_pending_requests_.end()) {
     result = *it;
@@ -175,7 +175,7 @@ RequestInfoPtr RequestInfoSet::Front() {
 
 RequestInfoPtr RequestInfoSet::FrontWithNotNullTimeout() {
   LOG4CXX_AUTO_TRACE(logger_);
-  sync_primitives::AutoLock lock(this_lock_);
+  sync_primitives::AutoLock lock(pending_requests_lock_);
   RequestInfoPtr result;
   TimeSortedRequestInfoSet::iterator it = time_sorted_pending_requests_.begin();
   while (it != time_sorted_pending_requests_.end()) {
@@ -219,7 +219,7 @@ bool RequestInfoSet::Erase(const RequestInfoPtr request_info) {
 }
 
 bool RequestInfoSet::RemoveRequest(const RequestInfoPtr request_info) {
-  sync_primitives::AutoLock lock(this_lock_);
+  sync_primitives::AutoLock lock(pending_requests_lock_);
   return Erase(request_info);
 }
 
@@ -228,7 +228,7 @@ uint32_t RequestInfoSet::RemoveRequests(
   LOG4CXX_AUTO_TRACE(logger_);
   uint32_t erased = 0;
 
-  sync_primitives::AutoLock lock(this_lock_);
+  sync_primitives::AutoLock lock(pending_requests_lock_);
   HashSortedRequestInfoSet::iterator it =
       std::find_if(hash_sorted_pending_requests_.begin(),
                    hash_sorted_pending_requests_.end(),
@@ -256,6 +256,7 @@ uint32_t RequestInfoSet::RemoveMobileRequests() {
 }
 
 const size_t RequestInfoSet::Size() {
+  sync_primitives::AutoLock lock(pending_requests_lock_);
   CheckSetSizes();
   return time_sorted_pending_requests_.size();
 }