sensord: add log messages

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

diff --git a/src/client/sensor_listener.cpp b/src/client/sensor_listener.cpp
index 9eedd6d..7c62ea1 100644 (file)
--- a/src/client/sensor_listener.cpp
+++ b/src/client/sensor_listener.cpp
@@ -36,6 +36,7 @@ public:
        void connected(ipc::channel *ch) {}
        void disconnected(ipc::channel *ch)
        {
+               _D("Disconnected");
                /* If channel->disconnect() is not explicitly called,
                 * listener will be restored */
                m_listener->restore();
@@ -172,7 +173,7 @@ bool sensor_listener::connect(void)
 
        m_evt_channel->bind();
 
-       _D("Listener ID[%d]", get_id());
+       _I("Connected listener[%d] with sensor[%s]", get_id(), m_sensor->get_uri().c_str());
 
        return true;
 }
@@ -245,11 +246,15 @@ int sensor_listener::start(void)
        m_cmd_channel->send_sync(&msg);
        m_cmd_channel->read_sync(reply);
 
-       if (reply.header()->err < 0)
+       if (reply.header()->err < 0) {
+               _E("Failed to start listener[%d], sensor[%s]", get_id(), m_sensor->get_uri().c_str());
                return reply.header()->err;
+       }
 
        m_started.store(true);
 
+       _I("Listener[%d] started", get_id());
+
        return OP_SUCCESS;
 }
 
@@ -269,11 +274,15 @@ int sensor_listener::stop(void)
        m_cmd_channel->send_sync(&msg);
        m_cmd_channel->read_sync(reply);
 
-       if (reply.header()->err < 0)
+       if (reply.header()->err < 0) {
+               _E("Failed to stop listener[%d], sensor[%s]", get_id(), m_sensor->get_uri().c_str());
                return reply.header()->err;
+       }
 
        m_started.store(false);
 
+       _I("Listener[%d] stopped", get_id());
+
        return OP_SUCCESS;
 }
 
@@ -321,21 +330,29 @@ int sensor_listener::set_interval(unsigned int interval)
        else
                _interval = interval;
 
+       _I("Listener[%d] set interval[%u]", get_id(), _interval);
+
        return set_attribute(SENSORD_ATTRIBUTE_INTERVAL, _interval);
 }
 
 int sensor_listener::set_max_batch_latency(unsigned int max_batch_latency)
 {
+       _I("Listener[%d] set max batch latency[%u]", get_id(), max_batch_latency);
+
        return set_attribute(SENSORD_ATTRIBUTE_MAX_BATCH_LATENCY, max_batch_latency);
 }
 
 int sensor_listener::set_passive_mode(bool passive)
 {
+       _I("Listener[%d] set passive mode[%d]", get_id(), passive);
+
        return set_attribute(SENSORD_ATTRIBUTE_PASSIVE_MODE, passive);
 }
 
 int sensor_listener::flush(void)
 {
+       _I("Listener[%d] flushes", get_id());
+
        return set_attribute(SENSORD_ATTRIBUTE_FLUSH, 1);
 }
 
@@ -413,6 +430,8 @@ int sensor_listener::get_sensor_data(sensor_data_t *data)
 
        memcpy(data, &buf.data, buf.len);
 
+       _D("Listener[%d] read sensor data", get_id());
+
        return OP_SUCCESS;
 }
 

diff --git a/src/client/sensor_manager.cpp b/src/client/sensor_manager.cpp
index 101b833..2769668 100644 (file)
--- a/src/client/sensor_manager.cpp
+++ b/src/client/sensor_manager.cpp
@@ -119,6 +119,8 @@ int sensor_manager::add_sensor(sensor_info &info)
 
        m_sensors.push_back(info);
 
+       _I("Added sensor[%s]", info.get_uri().c_str());
+
        return OP_SUCCESS;
 }
 
@@ -133,6 +135,8 @@ int sensor_manager::remove_sensor(const char *uri)
        for (auto it = m_sensors.begin(); it != m_sensors.end(); ++it) {
                if ((*it).get_uri() == uri) {
                        m_sensors.erase(it);
+                       _I("Removed sensor[%s]", (*it).get_uri().c_str());
+
                        return OP_SUCCESS;
                }
        }
@@ -321,6 +325,8 @@ bool sensor_manager::has_privilege(std::string &uri)
        if (reply.header()->err == OP_SUCCESS)
                return true;
 
+       _W("This client doesn't have the privilege for sensor[%s]", uri.c_str());
+
        return false;
 }
 

diff --git a/src/server/application_sensor_handler.cpp b/src/server/application_sensor_handler.cpp
index 4e4b96b..a5f9c0f 100644 (file)
--- a/src/server/application_sensor_handler.cpp
+++ b/src/server/application_sensor_handler.cpp
@@ -61,6 +61,8 @@ int application_sensor_handler::start(sensor_observer *ob)
        m_ch->send_sync(&msg);
        m_started.store(true);
 
+       _I("Started[%s]", m_info.get_uri().c_str());
+
        return OP_SUCCESS;
 }
 
@@ -76,6 +78,8 @@ int application_sensor_handler::stop(sensor_observer *ob)
        m_ch->send_sync(&msg);
        m_started.store(false);
 
+       _I("Stopped[%s]", m_info.get_uri().c_str());
+
        return OP_SUCCESS;
 }
 
@@ -119,6 +123,8 @@ int application_sensor_handler::set_interval(sensor_observer *ob, int32_t interv
 
        m_prev_interval = cur_interval;
 
+       _I("Set interval[%d] to sensor[%s]", cur_interval, m_info.get_uri().c_str());
+
        return OP_SUCCESS;
 }
 

diff --git a/src/server/external_sensor_handler.cpp b/src/server/external_sensor_handler.cpp
index 7b3e7da..474f764 100644 (file)
--- a/src/server/external_sensor_handler.cpp
+++ b/src/server/external_sensor_handler.cpp
@@ -100,6 +100,8 @@ int external_sensor_handler::start(sensor_observer *ob)
 
        add_observer(ob);
 
+       _I("Started[%s]", m_info.get_uri().c_str());
+
        return OP_SUCCESS;
 }
 
@@ -112,6 +114,8 @@ int external_sensor_handler::stop(sensor_observer *ob)
 
        remove_observer(ob);
 
+       _I("Stopped[%s]", m_info.get_uri().c_str());
+
        return OP_SUCCESS;
 }
 
@@ -153,6 +157,8 @@ int external_sensor_handler::set_interval(sensor_observer *ob, int32_t interval)
                return m_sensor->set_interval(ob, _interval);
        }
 
+       _I("Set interval[%d] to sensor[%s]", _interval, m_info.get_uri().c_str());
+
        return OP_SUCCESS;
 }
 

diff --git a/src/server/fusion_sensor_handler.cpp b/src/server/fusion_sensor_handler.cpp
index 3215051..6cbc692 100644 (file)
--- a/src/server/fusion_sensor_handler.cpp
+++ b/src/server/fusion_sensor_handler.cpp
@@ -83,6 +83,8 @@ int fusion_sensor_handler::start(sensor_observer *ob)
                        return OP_SUCCESS;
        }
 
+       _I("Started[%s]", m_info.get_uri().c_str());
+
        return start_internal();
 }
 
@@ -102,6 +104,8 @@ int fusion_sensor_handler::stop(sensor_observer *ob)
                        return OP_SUCCESS; /* already started */
        }
 
+       _I("Stopped[%s]", m_info.get_uri().c_str());
+
        return stop_internal();
 }
 
@@ -140,6 +144,8 @@ int fusion_sensor_handler::set_interval(sensor_observer *ob, int32_t interval)
        if (policy == OP_DEFAULT)
                _interval = get_min_interval();
 
+       _I("Set interval[%d] to sensor[%s]", _interval, m_info.get_uri().c_str());
+
        return set_interval_internal(_interval);
 }
 

diff --git a/src/server/physical_sensor_handler.cpp b/src/server/physical_sensor_handler.cpp
index bdc53b3..f73ee5d 100644 (file)
--- a/src/server/physical_sensor_handler.cpp
+++ b/src/server/physical_sensor_handler.cpp
@@ -104,6 +104,8 @@ int physical_sensor_handler::start(sensor_observer *ob)
                        return OP_SUCCESS; /* already started */
        }
 
+       _I("Started[%s]", m_info.get_uri().c_str());
+
        return m_device->enable(m_hal_id);
 }
 
@@ -125,6 +127,8 @@ int physical_sensor_handler::stop(sensor_observer *ob)
                        return OP_SUCCESS; /* already stopped */
        }
 
+       _I("Stopped[%s]", m_info.get_uri().c_str());
+
        return m_device->disable(m_hal_id);
 }
 
@@ -172,6 +176,8 @@ int physical_sensor_handler::set_interval(sensor_observer *ob, int32_t interval)
 
        m_prev_interval = cur_interval;
 
+       _I("Set interval[%d] to sensor[%s]", cur_interval, m_info.get_uri().c_str());
+
        return (ret ? OP_SUCCESS : OP_ERROR);
 }
 

diff --git a/src/server/sensor_listener_proxy.cpp b/src/server/sensor_listener_proxy.cpp
index 51b38a9..a850018 100644 (file)
--- a/src/server/sensor_listener_proxy.cpp
+++ b/src/server/sensor_listener_proxy.cpp
@@ -98,6 +98,8 @@ int sensor_listener_proxy::start(void)
        sensor_handler *sensor = m_manager->get_sensor(m_uri);
        retv_if(!sensor, -EINVAL);
 
+       _D("Listener[%d] try to start", get_id());
+
        /* TODO: listen pause policy */
        return sensor->start(this);
 }
@@ -108,9 +110,10 @@ int sensor_listener_proxy::stop(void)
        retv_if(!sensor, -EINVAL);
 
        /* TODO: listen pause policy */
-       int ret;
 
-       ret = sensor->stop(this);
+       _D("Listener[%d] try to stop", get_id());
+
+       int ret = sensor->stop(this);
        retv_if(ret < 0, OP_ERROR);
 
        /* unset attributes */
@@ -125,6 +128,8 @@ int sensor_listener_proxy::set_interval(unsigned int interval)
        sensor_handler *sensor = m_manager->get_sensor(m_uri);
        retv_if(!sensor, -EINVAL);
 
+       _D("Listener[%d] try to set interval[%d]", get_id(), interval);
+
        return sensor->set_interval(this, interval);
 }
 
@@ -133,6 +138,8 @@ int sensor_listener_proxy::set_max_batch_latency(unsigned int max_batch_latency)
        sensor_handler *sensor = m_manager->get_sensor(m_uri);
        retv_if(!sensor, -EINVAL);
 
+       _D("Listener[%d] try to set max batch latency[%d]", get_id(), max_batch_latency);
+
        return sensor->set_batch_latency(this, max_batch_latency);
 }
 
@@ -148,6 +155,8 @@ int sensor_listener_proxy::set_attribute(int attribute, int value)
        sensor_handler *sensor = m_manager->get_sensor(m_uri);
        retv_if(!sensor, -EINVAL);
 
+       _D("Listener[%d] try to set attribute[%d, %d]", get_id(), attribute, value);
+
        if (attribute == SENSORD_ATTRIBUTE_PAUSE_POLICY) {
                m_pause_policy = value;
                return OP_SUCCESS;
@@ -164,6 +173,8 @@ int sensor_listener_proxy::set_attribute(int attribute, const char *value, int l
        sensor_handler *sensor = m_manager->get_sensor(m_uri);
        retv_if(!sensor, -EINVAL);
 
+       _D("Listener[%d] try to set attribute[%d, %s]", get_id(), attribute, value);
+
        return sensor->set_attribute(this, attribute, value, len);
 }
 

diff --git a/src/server/server_channel_handler.cpp b/src/server/server_channel_handler.cpp
index fbcb6cb..2188c61 100644 (file)
--- a/src/server/server_channel_handler.cpp
+++ b/src/server/server_channel_handler.cpp
@@ -146,7 +146,8 @@ int server_channel_handler::listener_connect(channel *ch, message &msg)
                                buf.sensor, m_manager, ch);
        retvm_if(!listener, OP_ERROR, "Failed to allocate memory");
        retvm_if(!has_privileges(ch->get_fd(), listener->get_required_privileges()),
-                       -EACCES, "Permission denied");
+                       -EACCES, "Permission denied[%d, %s]",
+                       listener_id, m_listeners[listener_id]->get_required_privileges().c_str());
 
        buf.listener_id = listener_id;
 
@@ -174,10 +175,11 @@ int server_channel_handler::listener_start(channel *ch, message &msg)
        auto it = m_listeners.find(id);
        retv_if(it == m_listeners.end(), -EINVAL);
        retvm_if(!has_privileges(ch->get_fd(), m_listeners[id]->get_required_privileges()),
-                       -EACCES, "Permission denied");
+                       -EACCES, "Permission denied[%d, %s]",
+                       id, m_listeners[id]->get_required_privileges().c_str());
 
        int ret = m_listeners[id]->start();
-       retv_if(ret < 0, ret);
+       retvm_if(ret < 0, ret, "Failed to start listener[%d]", id);
 
        return send_reply(ch, OP_SUCCESS);
 }
@@ -191,10 +193,11 @@ int server_channel_handler::listener_stop(channel *ch, message &msg)
        auto it = m_listeners.find(id);
        retv_if(it == m_listeners.end(), -EINVAL);
        retvm_if(!has_privileges(ch->get_fd(), m_listeners[id]->get_required_privileges()),
-                       -EACCES, "Permission denied");
+                       -EACCES, "Permission denied[%d, %s]",
+                       id, m_listeners[id]->get_required_privileges().c_str());
 
        int ret = m_listeners[id]->stop();
-       retv_if(ret < 0, ret);
+       retvm_if(ret < 0, ret, "Failed to stop listener[%d]", id);
 
        return send_reply(ch, OP_SUCCESS);
 }
@@ -210,7 +213,8 @@ int server_channel_handler::listener_attr_int(channel *ch, message &msg)
        auto it = m_listeners.find(id);
        retv_if(it == m_listeners.end(), -EINVAL);
        retvm_if(!has_privileges(ch->get_fd(), m_listeners[id]->get_required_privileges()),
-                       -EACCES, "Permission denied");
+                       -EACCES, "Permission denied[%d, %s]",
+                       id, m_listeners[id]->get_required_privileges().c_str());
 
        switch (buf.attribute) {
        case SENSORD_ATTRIBUTE_INTERVAL:
@@ -240,7 +244,8 @@ int server_channel_handler::listener_attr_str(channel *ch, message &msg)
        auto it = m_listeners.find(id);
        retv_if(it == m_listeners.end(), -EINVAL);
        retvm_if(!has_privileges(ch->get_fd(), m_listeners[id]->get_required_privileges()),
-                       -EACCES, "Permission denied");
+                       -EACCES, "Permission denied[%d, %s]",
+                       id, m_listeners[id]->get_required_privileges().c_str());
 
        int ret = m_listeners[id]->set_attribute(buf.attribute, buf.value, buf.len);
        retv_if(ret < 0, ret);
@@ -262,7 +267,8 @@ int server_channel_handler::listener_get_data(channel *ch, message &msg)
        auto it = m_listeners.find(id);
        retv_if(it == m_listeners.end(), -EINVAL);
        retvm_if(!has_privileges(ch->get_fd(), m_listeners[id]->get_required_privileges()),
-                       -EACCES, "Permission denied");
+                       -EACCES, "Permission denied[%d, %s]",
+                       id, m_listeners[id]->get_required_privileges().c_str());
 
        int ret = m_listeners[id]->get_data(&data, &len);
        retv_if(ret < 0, ret);