sensord: move common part to base sensor handler

- all of sensor handlers has sensor information as common part.

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

diff --git a/src/server/application_sensor_handler.cpp b/src/server/application_sensor_handler.cpp
index a6bd0bd53b9628c9614b65bdd5396875f52a92ea..4e4b96b4d1e7ed8b2e801fd1aa4c2abf8a05d531 100644 (file)
--- a/src/server/application_sensor_handler.cpp
+++ b/src/server/application_sensor_handler.cpp
@@ -27,7 +27,7 @@
 using namespace sensor;
 
 application_sensor_handler::application_sensor_handler(const sensor_info &info, ipc::channel *ch)
-: m_info(info)
+: sensor_handler(info)
 , m_ch(ch)
 , m_started(false)
 , m_prev_interval(0)

diff --git a/src/server/application_sensor_handler.h b/src/server/application_sensor_handler.h
index 2d2801e2ae92dba3c81eae21a25e16034957a31d..8560451a4e8009d4ebe4da6b502d99985f0a042d 100644 (file)
--- a/src/server/application_sensor_handler.h
+++ b/src/server/application_sensor_handler.h
@@ -52,7 +52,6 @@ public:
        int get_data(sensor_data_t **data, int *len);
 
 private:
-       sensor_info m_info;
        ipc::channel *m_ch;
        std::atomic<bool> m_started;
        int32_t m_prev_interval;

diff --git a/src/server/external_sensor_handler.cpp b/src/server/external_sensor_handler.cpp
index 15b8baee65e27d8182ca23965e39593236583b77..53381b95cec347119935cdda0feab09f85381f7d 100644 (file)
--- a/src/server/external_sensor_handler.cpp
+++ b/src/server/external_sensor_handler.cpp
@@ -58,7 +58,7 @@ int external_sensor_notifier::notify(void)
 
 external_sensor_handler::external_sensor_handler(const sensor_info &info,
                external_sensor *sensor)
-: m_info(info)
+: sensor_handler(info)
 , m_notifier(NULL)
 , m_policy(OP_DEFAULT)
 {

diff --git a/src/server/external_sensor_handler.h b/src/server/external_sensor_handler.h
index 6fe386a977b20d5599cd9dad7b3cf8c0c3acc425..753a80d23415ffc4eb6ecd81c7c3924a427163c0 100644 (file)
--- a/src/server/external_sensor_handler.h
+++ b/src/server/external_sensor_handler.h
@@ -55,7 +55,6 @@ private:
        int get_min_interval(void);
        int get_min_batch_latency(void);
 
-       sensor_info m_info;
        external_sensor *m_sensor;
        sensor_notifier *m_notifier;
        int m_policy;

diff --git a/src/server/fusion_sensor_handler.cpp b/src/server/fusion_sensor_handler.cpp
index 18ecd71686000e3d74180dc71856f2754e439f9f..32150514edda69c1e72766e64640970f74f9aa08 100644 (file)
--- a/src/server/fusion_sensor_handler.cpp
+++ b/src/server/fusion_sensor_handler.cpp
@@ -27,7 +27,7 @@ using namespace sensor;
 
 fusion_sensor_handler::fusion_sensor_handler(const sensor_info &info,
                fusion_sensor *sensor)
-: m_info(info)
+: sensor_handler(info)
 , m_sensor(sensor)
 {
 }

diff --git a/src/server/fusion_sensor_handler.h b/src/server/fusion_sensor_handler.h
index 0bd1fa62e71692b1d14f64de3f9040890ceda19f..9feb67f9ee1c349c25bc5d91c82fcc23bfd3e0d0 100644 (file)
--- a/src/server/fusion_sensor_handler.h
+++ b/src/server/fusion_sensor_handler.h
@@ -76,7 +76,6 @@ private:
        int get_min_interval(void);
        int get_min_batch_latency(void);
 
-       sensor_info m_info;
        fusion_sensor *m_sensor;
        std::unordered_map<std::string, required_sensor> m_required_sensors;
 

diff --git a/src/server/physical_sensor_handler.cpp b/src/server/physical_sensor_handler.cpp
index 85a551546b7f55d2caf74d0beaefecd221b4b57b..bdc53b3c090e0603dd8dd96517ab203d0880b669 100644 (file)
--- a/src/server/physical_sensor_handler.cpp
+++ b/src/server/physical_sensor_handler.cpp
@@ -29,27 +29,12 @@ using namespace sensor;
 physical_sensor_handler::physical_sensor_handler(const sensor_info &info,
                sensor_device *device, int hal_id,
                physical_sensor *sensor)
-: m_info(info)
+: sensor_handler(info)
 , m_device(device)
 , m_sensor(sensor)
 , m_hal_id(hal_id)
 , m_prev_interval(0)
 {
-       /* TODO: temporary walkaround */
-       switch (m_info.get_type()) {
-       case HRM_SENSOR:
-       case HRM_LED_GREEN_SENSOR:
-       case HRM_LED_IR_SENSOR:
-       case HRM_LED_RED_SENSOR:
-       case HUMAN_PEDOMETER_SENSOR:
-       case HUMAN_SLEEP_MONITOR_SENSOR:
-       case HUMAN_SLEEP_DETECTOR_SENSOR:
-       case HUMAN_STRESS_MONITOR_SENSOR:
-               m_info.set_privilege("http://tizen.org/privilege/healthinfo");
-               break;
-       default:
-               break;
-       };
 }
 
 physical_sensor_handler::~physical_sensor_handler()

diff --git a/src/server/physical_sensor_handler.h b/src/server/physical_sensor_handler.h
index edb29dd109a469ac73272be26bcebbaa7bf3af28..31ab41072c8fa6b0aaedb7870e2717b3416b159b 100644 (file)
--- a/src/server/physical_sensor_handler.h
+++ b/src/server/physical_sensor_handler.h
@@ -59,7 +59,6 @@ private:
        int get_min_interval(void);
        int get_min_batch_latency(void);
 
-       sensor_info m_info;
        sensor_device *m_device;
        physical_sensor *m_sensor;
        uint32_t m_hal_id;

diff --git a/src/server/sensor_handler.cpp b/src/server/sensor_handler.cpp
index e567c2232162a3cf47e2ec42e1c2c94f715bb2af..95701cc3ebb27f676fd5a00705b8230ed6a4913d 100644 (file)
--- a/src/server/sensor_handler.cpp
+++ b/src/server/sensor_handler.cpp
@@ -17,12 +17,18 @@
  *
  */
 
+#include "sensor_handler.h"
+
 #include <message.h>
 #include <sensor_log.h>
-#include "sensor_handler.h"
 
 using namespace sensor;
 
+sensor_handler::sensor_handler(const sensor_info &info)
+: m_info(info)
+{
+}
+
 bool sensor_handler::has_observer(sensor_observer *ob)
 {
        for (auto it = m_observers.begin(); it != m_observers.end(); ++it) {

diff --git a/src/server/sensor_handler.h b/src/server/sensor_handler.h
index a5e6fd5ae10dbe834bb22cfbf90b4f8b9d997f59..37774e9498e3f6b7d69b8383250537e8f5e6a8df 100644 (file)
--- a/src/server/sensor_handler.h
+++ b/src/server/sensor_handler.h
@@ -30,6 +30,7 @@ namespace sensor {
 
 class sensor_handler : public sensor_publisher {
 public:
+       sensor_handler(const sensor_info &info);
        virtual ~sensor_handler() {}
 
        /* publisher */
@@ -51,6 +52,9 @@ public:
        virtual int flush(sensor_observer *ob) = 0;
        virtual int get_data(sensor_data_t **data, int *len) = 0;
 
+protected:
+       sensor_info m_info;
+
 private:
        std::list<sensor_observer *> m_observers;
 };