sensord: check whether client list is empty or not before using

std::find()

- if client list is empty, almost of functions in client_info_manager are unnecessary.

Change-Id: Ifce3bba890238bf8e2456362f41687111a00340b
Signed-off-by: kibak.yoon <kibak.yoon@samsung.com>

diff --git a/src/server/client_info_manager.cpp b/src/server/client_info_manager.cpp
index b42c9f58d0402558f93b378e1c8a0835e0c3f330..d4bb7c9c790b11a63013963ffe09521eb338eb95 100644 (file)
--- a/src/server/client_info_manager.cpp
+++ b/src/server/client_info_manager.cpp
@@ -31,6 +31,8 @@ client_info_manager::client_info_manager()
 
 client_info_manager::~client_info_manager()
 {
+       AUTOLOCK(m_mutex);
+
        m_clients.clear();
 }
 
@@ -44,6 +46,8 @@ bool client_info_manager::get_registered_events(int client_id, sensor_id_t senso
 {
        AUTOLOCK(m_mutex);
 
+       retvm_if(m_clients.empty(), false, "client list is empty");
+
        auto it_record = m_clients.find(client_id);
 
        if (it_record == m_clients.end()) {
@@ -61,6 +65,8 @@ bool client_info_manager::register_event(int client_id, sensor_id_t sensor_id, u
 {
        AUTOLOCK(m_mutex);
 
+       retvm_if(m_clients.empty(), false, "client list is empty");
+
        auto it_record = m_clients.find(client_id);
 
        if (it_record == m_clients.end()) {
@@ -78,6 +84,8 @@ bool client_info_manager::unregister_event(int client_id, sensor_id_t sensor_id,
 {
        AUTOLOCK(m_mutex);
 
+       retvm_if(m_clients.empty(), false, "client list is empty");
+
        auto it_record = m_clients.find(client_id);
 
        if (it_record == m_clients.end()) {
@@ -95,6 +103,8 @@ bool client_info_manager::set_batch(int client_id, sensor_id_t sensor_id, unsign
 {
        AUTOLOCK(m_mutex);
 
+       retvm_if(m_clients.empty(), false, "client list is empty");
+
        auto it_record = m_clients.find(client_id);
 
        if (it_record == m_clients.end()) {
@@ -109,6 +119,8 @@ bool client_info_manager::get_batch(int client_id, sensor_id_t sensor_id, unsign
 {
        AUTOLOCK(m_mutex);
 
+       retvm_if(m_clients.empty(), false, "client list is empty");
+
        auto it_record = m_clients.find(client_id);
 
        if (it_record == m_clients.end()) {
@@ -123,6 +135,8 @@ bool client_info_manager::set_option(int client_id, sensor_id_t sensor_id, int o
 {
        AUTOLOCK(m_mutex);
 
+       retvm_if(m_clients.empty(), false, "client list is empty");
+
        auto it_record = m_clients.find(client_id);
 
        if (it_record == m_clients.end()) {
@@ -140,6 +154,8 @@ bool client_info_manager::set_start(int client_id, sensor_id_t sensor_id, bool s
 {
        AUTOLOCK(m_mutex);
 
+       retvm_if(m_clients.empty(), false, "client list is empty");
+
        auto it_record = m_clients.find(client_id);
 
        if (it_record == m_clients.end()) {
@@ -157,6 +173,8 @@ bool client_info_manager::is_started(int client_id, sensor_id_t sensor_id)
 {
        AUTOLOCK(m_mutex);
 
+       retvm_if(m_clients.empty(), false, "client list is empty");
+
        auto it_record = m_clients.find(client_id);
 
        if (it_record == m_clients.end()) {
@@ -194,6 +212,8 @@ bool client_info_manager::remove_client_record(int client_id)
 {
        AUTOLOCK(m_mutex);
 
+       retvm_if(m_clients.empty(), false, "client list is empty");
+
        auto it_record = m_clients.find(client_id);
 
        if (it_record == m_clients.end()) {
@@ -212,6 +232,8 @@ bool client_info_manager::has_client_record(int client_id)
 {
        AUTOLOCK(m_mutex);
 
+       retvm_if(m_clients.empty(), false, "client list is empty");
+
        auto it_record = m_clients.find(client_id);
 
        return (it_record != m_clients.end());
@@ -237,6 +259,8 @@ const char* client_info_manager::get_client_info(int client_id)
 {
        AUTOLOCK(m_mutex);
 
+       retvm_if(m_clients.empty(), NULL, "client list is empty");
+
        auto it_record = m_clients.find(client_id);
 
        if (it_record == m_clients.end()) {
@@ -251,6 +275,8 @@ bool client_info_manager::set_permission(int client_id, int permission)
 {
        AUTOLOCK(m_mutex);
 
+       retvm_if(m_clients.empty(), false, "client list is empty");
+
        auto it_record = m_clients.find(client_id);
 
        if (it_record == m_clients.end()) {
@@ -266,6 +292,8 @@ bool client_info_manager::get_permission(int client_id, int &permission)
 {
        AUTOLOCK(m_mutex);
 
+       retvm_if(m_clients.empty(), false, "client list is empty");
+
        auto it_record = m_clients.find(client_id);
 
        if (it_record == m_clients.end()) {
@@ -281,6 +309,8 @@ bool client_info_manager::create_sensor_record(int client_id, sensor_id_t sensor
 {
        AUTOLOCK(m_mutex);
 
+       retvm_if(m_clients.empty(), false, "client list is empty");
+
        auto it_record = m_clients.find(client_id);
 
        if (it_record == m_clients.end()) {
@@ -297,6 +327,8 @@ bool client_info_manager::remove_sensor_record(int client_id, sensor_id_t sensor
 {
        AUTOLOCK(m_mutex);
 
+       retvm_if(m_clients.empty(), false, "client list is empty");
+
        auto it_record = m_clients.find(client_id);
 
        if (it_record == m_clients.end()) {
@@ -317,6 +349,8 @@ bool client_info_manager::has_sensor_record(int client_id, sensor_id_t sensor_id
 {
        AUTOLOCK(m_mutex);
 
+       retvm_if(m_clients.empty(), false, "client list is empty");
+
        auto it_record = m_clients.find(client_id);
 
        if (it_record == m_clients.end()) {
@@ -334,6 +368,8 @@ bool client_info_manager::has_sensor_record(int client_id)
 {
        AUTOLOCK(m_mutex);
 
+       retvm_if(m_clients.empty(), false, "client list is empty");
+
        auto it_record = m_clients.find(client_id);
 
        if (it_record == m_clients.end()) {
@@ -351,6 +387,8 @@ bool client_info_manager::get_listener_ids(sensor_id_t sensor_id, unsigned int e
 {
        AUTOLOCK(m_mutex);
 
+       retvm_if(m_clients.empty(), false, "client list is empty");
+
        auto it_record = m_clients.begin();
 
        while (it_record != m_clients.end()) {
@@ -367,6 +405,8 @@ bool client_info_manager::get_event_socket(int client_id, csocket &socket)
 {
        AUTOLOCK(m_mutex);
 
+       retvm_if(m_clients.empty(), false, "client list is empty");
+
        auto it_record = m_clients.find(client_id);
 
        if (it_record == m_clients.end()) {
@@ -383,6 +423,8 @@ bool client_info_manager::set_event_socket(int client_id, const csocket &socket)
 {
        AUTOLOCK(m_mutex);
 
+       retvm_if(m_clients.empty(), false, "client list is empty");
+
        auto it_record = m_clients.find(client_id);
 
        if (it_record == m_clients.end()) {