[place-recognition] Redundant mutex protection remove.

Change-Id: I437ead59b6c9dbf6577650d25dc1493c82c2abae
Signed-off-by: Marcin Masternak <m.masternak@samsung.com>

diff --git a/src/place/recognition/user_places/places_detector.cpp b/src/place/recognition/user_places/places_detector.cpp
index 4890db155d1cf38feecf65ab0735c783dd53d85e..a3ea9a53e6b07d8a88cfd169c67a014845a7e661 100644 (file)
--- a/src/place/recognition/user_places/places_detector.cpp
+++ b/src/place/recognition/user_places/places_detector.cpp
@@ -301,15 +301,13 @@ void ctx::PlacesDetector::process_visits(ctx::visits_t &visits)
 }
 
 /*
- * Pseudo-atomic operation of old places replacement by new ones.
+ * Replace old places by new ones.
  */
 void ctx::PlacesDetector::detected_places_update(std::vector<std::shared_ptr<Place>> &new_places)
 {
        _D("");
-       detected_places_access_mutex.lock();
+       // XXX: In case of thread safety issues use std::mutex to protect places list.
        detected_places = new_places;
-       new_places.clear();
-       detected_places_access_mutex.unlock();
 }
 
 void ctx::PlacesDetector::merge_location(const visits_t &visits, Place &place)
@@ -450,9 +448,6 @@ void ctx::PlacesDetector::db_insert_place(const Place &place)
 
 std::vector<std::shared_ptr<ctx::Place>> ctx::PlacesDetector::get_places()
 {
-       detected_places_access_mutex.lock();
-       // indirect ret vector usage due to limit the scope of a mutex to only this single file / class
-       std::vector<std::shared_ptr<Place>> ret = detected_places;
-       detected_places_access_mutex.unlock();
-       return ret;
+       // XXX: In case of thread safety issues use std::mutex to protect places list.
+       return detected_places;
 }

diff --git a/src/place/recognition/user_places/places_detector.h b/src/place/recognition/user_places/places_detector.h
index 703f8306acd108b8b4ab2df49817e8589480ce29..fb08ee4597f6f3ff23eaee60e12828065dab9c6f 100644 (file)
--- a/src/place/recognition/user_places/places_detector.h
+++ b/src/place/recognition/user_places/places_detector.h
@@ -23,7 +23,6 @@
 #include "db_listener_iface.h"
 #include "user_places_types.h"
 #include <vector>
-#include <mutex>
 
 namespace ctx {
 
@@ -56,7 +55,6 @@ namespace ctx {
                void db_insert_place(const Place &place);
                std::shared_ptr<Place> place_from_merged(visits_t &merged_visits);
                std::vector<std::shared_ptr<Place>> detected_places;
-               std::mutex detected_places_access_mutex;
                void detected_places_update(std::vector<std::shared_ptr<Place>> &new_places);
 
        public: