From 93ad2b1a71b67bebab8f7870642929248d2ed314 Mon Sep 17 00:00:00 2001 From: Marcin Masternak Date: Thu, 31 Mar 2016 12:57:42 +0200 Subject: [PATCH] [place-recognition] Redundant mutex protection remove. Change-Id: I437ead59b6c9dbf6577650d25dc1493c82c2abae Signed-off-by: Marcin Masternak --- src/place/recognition/user_places/places_detector.cpp | 13 ++++--------- src/place/recognition/user_places/places_detector.h | 2 -- 2 files changed, 4 insertions(+), 11 deletions(-) diff --git a/src/place/recognition/user_places/places_detector.cpp b/src/place/recognition/user_places/places_detector.cpp index 4890db1..a3ea9a5 100644 --- 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> &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> 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> 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 703f830..fb08ee4 100644 --- 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 -#include namespace ctx { @@ -56,7 +55,6 @@ namespace ctx { void db_insert_place(const Place &place); std::shared_ptr place_from_merged(visits_t &merged_visits); std::vector> detected_places; - std::mutex detected_places_access_mutex; void detected_places_update(std::vector> &new_places); public: -- 2.7.4