sensord: change unclear classes to inner class

- sensor_manager_handler  -> sensor_manager::channel_handler
- sensor_provider_handler -> sensor_provider::channel_handler

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

diff --git a/src/client/sensor_manager.cpp b/src/client/sensor_manager.cpp
index b2917b2..ee783f0 100644 (file)
--- a/src/client/sensor_manager.cpp
+++ b/src/client/sensor_manager.cpp
@@ -27,6 +27,8 @@
 #include <message.h>
 #include <channel.h>
 
+#include "sensor_manager_channel_handler.h"
+
 #define SIZE_STR_SENSOR_ALL 27
 
 using namespace sensor;
@@ -170,7 +172,7 @@ bool sensor_manager::init(void)
        m_client = new(std::nothrow) ipc::ipc_client(SENSOR_CHANNEL_PATH);
        retvm_if(!m_client, false, "Failed to allocate memory");
 
-       m_handler = new(std::nothrow) sensor_manager_handler(this);
+       m_handler = new(std::nothrow) channel_handler(this);
        if (!m_handler) {
                delete m_client;
                m_client = NULL;

diff --git a/src/client/sensor_manager.h b/src/client/sensor_manager.h
index d0fabf8..a2409b4 100644 (file)
--- a/src/client/sensor_manager.h
+++ b/src/client/sensor_manager.h
@@ -29,7 +29,6 @@
 
 #include "sensor_internal.h"
 #include "sensor_provider.h"
-#include "sensor_manager_handler.h"
 
 namespace sensor {
 
@@ -61,7 +60,7 @@ public:
        void remove_sensor_removed_cb(sensord_removed_cb cb);
 
 private:
-       typedef std::vector<sensor_info> sensor_list_t;
+       class channel_handler;
 
        bool init(void);
        void deinit(void);
@@ -80,9 +79,9 @@ private:
        ipc::channel *m_channel;
        ipc::event_loop m_loop;
        std::atomic<bool> m_connected;
-       sensor_manager_handler *m_handler;
+       channel_handler *m_handler;
 
-       sensor_list_t m_sensors;
+       std::vector<sensor_info> m_sensors;
 };
 
 }

diff --git a/src/client/sensor_manager_handler.cpp b/src/client/sensor_manager_channel_handler.cpp
similarity index 63%
rename from src/client/sensor_manager_handler.cpp
rename to src/client/sensor_manager_channel_handler.cpp
index 5ba2acb..97ffd7b 100644 (file)
--- a/src/client/sensor_manager_handler.cpp
+++ b/src/client/sensor_manager_channel_handler.cpp
@@ -17,7 +17,7 @@
  *
  */
 
-#include "sensor_manager_handler.h"
+#include "sensor_manager_channel_handler.h"
 
 #include <sensor_log.h>
 #include <command_types.h>
@@ -25,22 +25,22 @@
 
 using namespace sensor;
 
-sensor_manager_handler::sensor_manager_handler(sensor_manager *manager)
+sensor_manager::channel_handler::channel_handler(sensor_manager *manager)
 : m_manager(manager)
 {
 }
 
-void sensor_manager_handler::connected(ipc::channel *ch)
+void sensor_manager::channel_handler::connected(ipc::channel *ch)
 {
 }
 
-void sensor_manager_handler::disconnected(ipc::channel *ch)
+void sensor_manager::channel_handler::disconnected(ipc::channel *ch)
 {
        /* If channel->disconnect() is not explicitly called, it will be restored */
        m_manager->restore();
 }
 
-void sensor_manager_handler::read(ipc::channel *ch, ipc::message &msg)
+void sensor_manager::channel_handler::read(ipc::channel *ch, ipc::message &msg)
 {
        switch (msg.header()->type) {
        case CMD_MANAGER_SENSOR_ADDED:
@@ -52,15 +52,15 @@ void sensor_manager_handler::read(ipc::channel *ch, ipc::message &msg)
        }
 }
 
-void sensor_manager_handler::read_complete(ipc::channel *ch)
+void sensor_manager::channel_handler::read_complete(ipc::channel *ch)
 {
 }
 
-void sensor_manager_handler::error_caught(ipc::channel *ch, int error)
+void sensor_manager::channel_handler::error_caught(ipc::channel *ch, int error)
 {
 }
 
-void sensor_manager_handler::on_sensor_added(ipc::channel *ch, ipc::message &msg)
+void sensor_manager::channel_handler::on_sensor_added(ipc::channel *ch, ipc::message &msg)
 {
        ret_if(msg.header()->err < OP_SUCCESS);
 
@@ -77,7 +77,7 @@ void sensor_manager_handler::on_sensor_added(ipc::channel *ch, ipc::message &msg
        }
 }
 
-void sensor_manager_handler::on_sensor_removed(ipc::channel *ch, ipc::message &msg)
+void sensor_manager::channel_handler::on_sensor_removed(ipc::channel *ch, ipc::message &msg)
 {
        ret_if(msg.header()->err < 0);
        char uri[NAME_MAX] = {0, };
@@ -92,22 +92,22 @@ void sensor_manager_handler::on_sensor_removed(ipc::channel *ch, ipc::message &m
        }
 }
 
-void sensor_manager_handler::add_sensor_added_cb(sensord_added_cb cb, void *user_data)
+void sensor_manager::channel_handler::add_sensor_added_cb(sensord_added_cb cb, void *user_data)
 {
        m_sensor_added_callbacks.emplace(cb, user_data);
 }
 
-void sensor_manager_handler::remove_sensor_added_cb(sensord_added_cb cb)
+void sensor_manager::channel_handler::remove_sensor_added_cb(sensord_added_cb cb)
 {
        m_sensor_added_callbacks.erase(cb);
 }
 
-void sensor_manager_handler::add_sensor_removed_cb(sensord_removed_cb cb, void *user_data)
+void sensor_manager::channel_handler::add_sensor_removed_cb(sensord_removed_cb cb, void *user_data)
 {
        m_sensor_removed_callbacks.emplace(cb, user_data);
 }
 
-void sensor_manager_handler::remove_sensor_removed_cb(sensord_removed_cb cb)
+void sensor_manager::channel_handler::remove_sensor_removed_cb(sensord_removed_cb cb)
 {
        m_sensor_removed_callbacks.erase(cb);
 }

diff --git a/src/client/sensor_manager_handler.h b/src/client/sensor_manager_channel_handler.h
similarity index 85%
rename from src/client/sensor_manager_handler.h
rename to src/client/sensor_manager_channel_handler.h
index 4f1ac73..2bbc4c2 100644 (file)
--- a/src/client/sensor_manager_handler.h
+++ b/src/client/sensor_manager_channel_handler.h
@@ -17,21 +17,21 @@
  *
  */
 
-#ifndef __SENSOR_MANAGER_HANDLER__
-#define __SENSOR_MANAGER_HANDLER__
+#ifndef __SENSOR_MANAGER_CHANNEL_HANDLER__
+#define __SENSOR_MANAGER_CHANNEL_HANDLER__
 
 #include <sensor_internal.h>
+#include <sensor_manager.h>
 #include <channel_handler.h>
 #include <map>
 
 namespace sensor {
 
-class sensor_manager;
-
-class sensor_manager_handler : public ipc::channel_handler
+class sensor_manager::channel_handler : public ipc::channel_handler
 {
 public:
-       sensor_manager_handler(sensor_manager *manager);
+       channel_handler(sensor_manager *manager);
+
        void connected(ipc::channel *ch);
        void disconnected(ipc::channel *ch);
        void read(ipc::channel *ch, ipc::message &msg);
@@ -58,4 +58,4 @@ private:
 
 }
 
-#endif /* __SENSOR_MANAGER_HANDLER__ */
+#endif /* __SENSOR_MANAGER_CHANNEL_HANDLER__ */

diff --git a/src/client/sensor_provider.cpp b/src/client/sensor_provider.cpp
index b07fec5..d38049a 100644 (file)
--- a/src/client/sensor_provider.cpp
+++ b/src/client/sensor_provider.cpp
@@ -26,7 +26,7 @@
 #include <ipc_client.h>
 #include <command_types.h>
 
-#include "sensor_provider_handler.h"
+#include "sensor_provider_channel_handler.h"
 
 using namespace sensor;
 
@@ -49,7 +49,7 @@ bool sensor_provider::init(const char *uri)
        m_client = new(std::nothrow) ipc::ipc_client(SENSOR_CHANNEL_PATH);
        retvm_if(!m_client, false, "Failed to allocate memory");
 
-       m_handler = new(std::nothrow) sensor_provider_handler(this);
+       m_handler = new(std::nothrow) channel_handler(this);
        if (!m_handler) {
                delete m_client;
                return false;

diff --git a/src/client/sensor_provider.h b/src/client/sensor_provider.h
index 7fc4429..e30e617 100644 (file)
--- a/src/client/sensor_provider.h
+++ b/src/client/sensor_provider.h
@@ -30,8 +30,6 @@
 #include <map>
 #include <atomic>
 
-#include "sensor_provider_handler.h"
-
 namespace sensor {
 
 class sensor_provider {
@@ -53,6 +51,8 @@ public:
        int publish(sensor_data_t *data, int len);
 
 private:
+       class channel_handler;
+
        bool init(const char *uri);
        void deinit(void);
 
@@ -66,7 +66,7 @@ private:
        ipc::ipc_client *m_client;
        ipc::channel *m_channel;
        ipc::event_loop m_loop;
-       sensor_provider_handler *m_handler;
+       channel_handler *m_handler;
        std::atomic<bool> m_connected;
 };
 

diff --git a/src/client/sensor_provider_handler.cpp b/src/client/sensor_provider_channel_handler.cpp
similarity index 66%
rename from src/client/sensor_provider_handler.cpp
rename to src/client/sensor_provider_channel_handler.cpp
index 14fa3a1..a537546 100644 (file)
--- a/src/client/sensor_provider_handler.cpp
+++ b/src/client/sensor_provider_channel_handler.cpp
@@ -17,7 +17,7 @@
  *
  */
 
-#include "sensor_provider_handler.h"
+#include "sensor_provider_channel_handler.h"
 
 #include <command_types.h>
 #include <sensor_log.h>
@@ -25,7 +25,7 @@
 
 using namespace sensor;
 
-sensor_provider_handler::sensor_provider_handler(sensor_provider *provider)
+sensor_provider::channel_handler::channel_handler(sensor_provider *provider)
 : m_provider(provider)
 , m_start_cb(NULL)
 , m_stop_cb(NULL)
@@ -36,18 +36,18 @@ sensor_provider_handler::sensor_provider_handler(sensor_provider *provider)
 {
 }
 
-void sensor_provider_handler::connected(ipc::channel *ch)
+void sensor_provider::channel_handler::connected(ipc::channel *ch)
 {
        _I("Connected");
 }
 
-void sensor_provider_handler::disconnected(ipc::channel *ch)
+void sensor_provider::channel_handler::disconnected(ipc::channel *ch)
 {
        /* TODO */
        /* m_provider->restore(); */
 }
 
-void sensor_provider_handler::read(ipc::channel *ch, ipc::message &msg)
+void sensor_provider::channel_handler::read(ipc::channel *ch, ipc::message &msg)
 {
        switch (msg.type()) {
        case CMD_PROVIDER_START:
@@ -66,27 +66,27 @@ void sensor_provider_handler::read(ipc::channel *ch, ipc::message &msg)
        }
 }
 
-void sensor_provider_handler::read_complete(ipc::channel *ch)
+void sensor_provider::channel_handler::read_complete(ipc::channel *ch)
 {
 }
 
-void sensor_provider_handler::error_caught(ipc::channel *ch, int error)
+void sensor_provider::channel_handler::error_caught(ipc::channel *ch, int error)
 {
 }
 
-void sensor_provider_handler::set_start_cb(sensord_provider_start_cb cb, void *user_data)
+void sensor_provider::channel_handler::set_start_cb(sensord_provider_start_cb cb, void *user_data)
 {
        m_start_cb = cb;
        m_start_user_data = user_data;
 }
 
-void sensor_provider_handler::set_stop_cb(sensord_provider_stop_cb cb, void *user_data)
+void sensor_provider::channel_handler::set_stop_cb(sensord_provider_stop_cb cb, void *user_data)
 {
        m_stop_cb = cb;
        m_stop_user_data = user_data;
 }
 
-void sensor_provider_handler::set_interval_cb(sensord_provider_set_interval_cb cb, void *user_data)
+void sensor_provider::channel_handler::set_interval_cb(sensord_provider_set_interval_cb cb, void *user_data)
 {
        m_set_interval_cb = cb;
        m_set_interval_user_data = user_data;

diff --git a/src/client/sensor_provider_handler.h b/src/client/sensor_provider_channel_handler.h
similarity index 83%
rename from src/client/sensor_provider_handler.h
rename to src/client/sensor_provider_channel_handler.h
index 16bf479..efe5ce5 100644 (file)
--- a/src/client/sensor_provider_handler.h
+++ b/src/client/sensor_provider_channel_handler.h
@@ -17,20 +17,19 @@
  *
  */
 
-#ifndef __SENSOR_PROVIDER_HANDLER__
-#define __SENSOR_PROVIDER_HANDLER__
+#ifndef __SENSOR_PROVIDER_CHANNEL_HANDLER__
+#define __SENSOR_PROVIDER_CHANNEL_HANDLER__
 
-#include <sensor_internal.h>
 #include <channel_handler.h>
+#include <sensor_internal.h>
+#include "sensor_provider.h"
 
 namespace sensor {
 
-class sensor_provider;
-
-class sensor_provider_handler : public ipc::channel_handler
+class sensor_provider::channel_handler : public ipc::channel_handler
 {
 public:
-       sensor_provider_handler(sensor_provider *provider);
+       channel_handler(sensor_provider *provider);
 
        void connected(ipc::channel *ch);
        void disconnected(ipc::channel *ch);
@@ -57,4 +56,4 @@ private:
 
 }
 
-#endif /* __SENSOR_PROVIDER_HANDLER__ */
+#endif /* __SENSOR_PROVIDER_CHANNEL_HANDLER__ */