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 a6bd0bd..4e4b96b 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 2d2801e..8560451 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 15b8bae..53381b9 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 6fe386a..753a80d 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 18ecd71..3215051 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 0bd1fa6..9feb67f 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 85a5515..bdc53b3 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 edb29dd..31ab410 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 e567c22..95701cc 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 a5e6fd5..37774e9 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;
 };