From ce2f8a85fac61ca53602526cdc7560e8b5d194e4 Mon Sep 17 00:00:00 2001 From: "Hongkuk, Son" Date: Tue, 15 Dec 2015 13:58:07 +0900 Subject: [PATCH 01/16] sensord: modify proxi_change_state enum values NEAR 1 -> 0 FAR 0 -> 1 (tested on 3.0 reference target TM1) Signed-off-by: Hongkuk, Son Change-Id: I258537f0468d83f883e8372e2f0a2f95dc2bc6ae --- src/shared/sensor_types.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/shared/sensor_types.h b/src/shared/sensor_types.h index f1e3778..6ac6aef 100644 --- a/src/shared/sensor_types.h +++ b/src/shared/sensor_types.h @@ -120,8 +120,8 @@ enum event_types_t { }; enum proxi_change_state { - PROXIMITY_STATE_FAR = 0, - PROXIMITY_STATE_NEAR = 1, + PROXIMITY_STATE_NEAR = 0, + PROXIMITY_STATE_FAR = 1, }; enum auto_rotation_state { -- 2.7.4 From b1f948963a0af894e608175d52a4ac8a5f43983b Mon Sep 17 00:00:00 2001 From: "kibak.yoon" Date: Fri, 18 Dec 2015 10:30:46 +0900 Subject: [PATCH 02/16] Revert "sensord: extra data embedding" This reverts commit 8baf020bc0e5ecff210e01a362560111edbefd4c. Signed-off-by: kibak.yoon Change-Id: I8ad082398dac42728e1ea321972527ab663e4804 --- src/client/csensor_event_listener.cpp | 3 --- src/server/csensor_event_dispatcher.cpp | 16 ++-------------- src/shared/sensor_common.h | 7 ------- src/shared/sensor_logs.cpp | 3 --- 4 files changed, 2 insertions(+), 27 deletions(-) mode change 100644 => 100755 src/server/csensor_event_dispatcher.cpp mode change 100644 => 100755 src/shared/sensor_common.h diff --git a/src/client/csensor_event_listener.cpp b/src/client/csensor_event_listener.cpp index 053ae17..aad9c89 100644 --- a/src/client/csensor_event_listener.cpp +++ b/src/client/csensor_event_listener.cpp @@ -196,9 +196,6 @@ void csensor_event_listener::handle_events(void* event) event_data.event_data = &(sensor_event->data); event_data.event_data_size = sizeof(sensor_event->data); } - - if (sensor_event->data.extra_data_size > 0) - sensor_event->data.extra_data = (void *)event + sizeof(sensor_event_t); } { /* scope for the lock */ diff --git a/src/server/csensor_event_dispatcher.cpp b/src/server/csensor_event_dispatcher.cpp old mode 100644 new mode 100755 index e82b6e2..605b9e7 --- a/src/server/csensor_event_dispatcher.cpp +++ b/src/server/csensor_event_dispatcher.cpp @@ -227,22 +227,10 @@ void csensor_event_dispatcher::send_sensor_events(void* events, int event_cnt, b bool ret; - if (is_hub_event) { + if (is_hub_event) ret = (client_socket.send(sensor_hub_events + i, sizeof(sensorhub_event_t)) > 0); - } else if (sensor_events[i].data.extra_data_size > 0) { - void *extended_event; - int extended_size = sizeof(sensor_event_t) + sensor_events[i].data.extra_data_size; - - extended_event = (void *)malloc(extended_size); - memcpy(extended_event, sensor_events + i, sizeof(sensor_event_t)); - memcpy(extended_event + sizeof(sensor_event_t), sensor_events[i].data.extra_data, sensor_events[i].data.extra_data_size); - - ret = (client_socket.send(extended_event, extended_size) > 0); - - free(extended_event); - } else { + else ret = (client_socket.send(sensor_events + i, sizeof(sensor_event_t)) > 0); - } if (ret) DBG("Event[0x%x] sent to %s on socket[%d]", event_type, client_info_manager.get_client_info(*it_client_id), client_socket.get_socket_fd()); diff --git a/src/shared/sensor_common.h b/src/shared/sensor_common.h old mode 100644 new mode 100755 index 170c26e..02cbfd3 --- a/src/shared/sensor_common.h +++ b/src/shared/sensor_common.h @@ -82,13 +82,6 @@ typedef struct sensor_data_t { }; float values[SENSOR_DATA_VALUE_SIZE]; - -/* - * If extra_data_size > 0, - * then use extra_data. - */ - int extra_data_size; - void *extra_data; } sensor_data_t; #define SENSOR_HUB_DATA_SIZE 4096 diff --git a/src/shared/sensor_logs.cpp b/src/shared/sensor_logs.cpp index 28e19bb..4be987f 100644 --- a/src/shared/sensor_logs.cpp +++ b/src/shared/sensor_logs.cpp @@ -185,9 +185,6 @@ void copy_sensor_data(sensor_data_t *dest, sensor_data_t *src) { memcpy(dest, src, offsetof(sensor_data_t, values)); memcpy(dest->values, src->values, src->value_count * sizeof(src->values[0])); - - dest->extra_data_size = src->extra_data_size; - dest->extra_data = src->extra_data; } void copy_sensorhub_data(sensorhub_data_t *dest, sensorhub_data_t *src) -- 2.7.4 From 6c69885ea6bf28c4047f83c34b6221ce42b8c0bb Mon Sep 17 00:00:00 2001 From: "kibak.yoon" Date: Fri, 18 Dec 2015 10:31:23 +0900 Subject: [PATCH 03/16] sensord: sensord version up to 2.0.0 Change-Id: I27fba64208605daeeb0423c65ebf6af2bb4add4c Signed-off-by: kibak.yoon --- packaging/sensord.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packaging/sensord.spec b/packaging/sensord.spec index 8bba933..a2e4709 100755 --- a/packaging/sensord.spec +++ b/packaging/sensord.spec @@ -1,6 +1,6 @@ Name: sensord Summary: Sensor daemon -Version: 1.0.0 +Version: 2.0.0 Release: 0 Group: System/Sensor Framework License: Apache-2.0 -- 2.7.4 From 4d8c46c48f5d04b8a3355714ccc2d42154ca836e Mon Sep 17 00:00:00 2001 From: Mu-Woong Lee Date: Fri, 18 Dec 2015 15:21:47 +0900 Subject: [PATCH 04/16] Cleanup internal package dependencies and so file path Change-Id: Ibb415514bce593ca96f812e4b021278114b54375 Signed-off-by: Mu-Woong Lee --- .gitignore | 3 ++- packaging/sensord.manifest | 0 packaging/sensord.spec | 15 +++------------ src/server/sensor_plugin_loader.cpp.in | 2 +- 4 files changed, 6 insertions(+), 14 deletions(-) mode change 100755 => 100644 packaging/sensord.manifest mode change 100755 => 100644 packaging/sensord.spec diff --git a/.gitignore b/.gitignore index 47bd4b3..8b1529d 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ .project -.cproject \ No newline at end of file +.cproject +.*.swp diff --git a/packaging/sensord.manifest b/packaging/sensord.manifest old mode 100755 new mode 100644 diff --git a/packaging/sensord.spec b/packaging/sensord.spec old mode 100755 new mode 100644 index a2e4709..8ae48ac --- a/packaging/sensord.spec +++ b/packaging/sensord.spec @@ -19,6 +19,7 @@ BuildRequires: pkgconfig(capi-system-info) BuildRequires: pkgconfig(cynara-creds-socket) BuildRequires: pkgconfig(cynara-client) BuildRequires: pkgconfig(cynara-session) +Requires: libsensord = %{version}-%{release} %define auto_rotation_state OFF %define orientation_state OFF @@ -34,18 +35,9 @@ BuildRequires: pkgconfig(cynara-session) %description Sensor daemon -%package sensord -Summary: Sensor daemon -Group: System/Sensor Framework -Requires: %{name} = %{version}-%{release} - -%description sensord -Sensor daemon - %package -n libsensord Summary: Sensord library Group: System/Libraries -Requires: %{name} = %{version}-%{release} %description -n libsensord Sensord library @@ -53,7 +45,7 @@ Sensord library %package -n libsensord-devel Summary: Sensord shared library Group: System/Development -Requires: %{name} = %{version}-%{release} +Requires: libsensord = %{version}-%{release} %description -n libsensord-devel Sensord shared library @@ -62,7 +54,6 @@ Sensord shared library %package -n sensor-test Summary: Sensord library Group: System/Testing -Requires: %{name} = %{version}-%{release} %description -n sensor-test Sensor functional testing @@ -102,7 +93,7 @@ systemctl daemon-reload %postun -n libsensord -p /sbin/ldconfig -%files -n sensord +%files %attr(0644,root,root)/usr/etc/virtual_sensors.xml %manifest sensord.manifest %{_bindir}/sensord diff --git a/src/server/sensor_plugin_loader.cpp.in b/src/server/sensor_plugin_loader.cpp.in index eb622aa..d370c14 100644 --- a/src/server/sensor_plugin_loader.cpp.in +++ b/src/server/sensor_plugin_loader.cpp.in @@ -99,7 +99,7 @@ using std::static_pointer_cast; #define LINEAR_ACCEL_ENABLED 7 #define ORIENTATION_ENABLED 7 -#define HAL_PLUGINS_DIR_PATH "/usr/lib/sensor-hal" +#define HAL_PLUGINS_DIR_PATH "/usr/lib/sensor" #define SENSOR_INDEX_SHIFT 16 -- 2.7.4 From 348b35c2355abf89040e6e12654283f710ae832c Mon Sep 17 00:00:00 2001 From: Mu-Woong Lee Date: Fri, 18 Dec 2015 16:56:05 +0900 Subject: [PATCH 05/16] Restore dependency from libsensord to sensord Change-Id: I2389a2ba8d30c1f82b967f134a5e928a73f2439f Signed-off-by: Mu-Woong Lee --- packaging/sensord.spec | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/packaging/sensord.spec b/packaging/sensord.spec index 8ae48ac..b907dd6 100644 --- a/packaging/sensord.spec +++ b/packaging/sensord.spec @@ -2,7 +2,7 @@ Name: sensord Summary: Sensor daemon Version: 2.0.0 Release: 0 -Group: System/Sensor Framework +Group: System/Sensor Framework License: Apache-2.0 Source0: %{name}-%{version}.tar.gz Source1: sensord.manifest @@ -38,6 +38,7 @@ Sensor daemon %package -n libsensord Summary: Sensord library Group: System/Libraries +Requires: %{name} = %{version}-%{release} %description -n libsensord Sensord library -- 2.7.4 From d0262b12cbddd8aef62cee4c572dd9a282a925ad Mon Sep 17 00:00:00 2001 From: "kibak.yoon" Date: Fri, 18 Dec 2015 16:20:04 +0900 Subject: [PATCH 06/16] sensord: initialize member variables in csocket constructors Change-Id: I98156912b4dba0d68bba76b48e652366828b3b4c Signed-off-by: kibak.yoon --- src/shared/csocket.cpp | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/src/shared/csocket.cpp b/src/shared/csocket.cpp index 9845b5f..dfb8ce1 100644 --- a/src/shared/csocket.cpp +++ b/src/shared/csocket.cpp @@ -33,7 +33,9 @@ csocket::csocket() csocket::csocket(int sock_fd) -: m_send_flags(MSG_NOSIGNAL) +: m_sock_fd(-1) +, m_sock_type(SOCK_STREAM) +, m_send_flags(MSG_NOSIGNAL) , m_recv_flags(MSG_NOSIGNAL) { m_sock_fd = sock_fd; @@ -43,6 +45,10 @@ csocket::csocket(int sock_fd) csocket::csocket(const csocket &sock) +: m_sock_fd(-1) +, m_sock_type(SOCK_STREAM) +, m_send_flags(MSG_NOSIGNAL) +, m_recv_flags(MSG_NOSIGNAL) { if (this == &sock) return; -- 2.7.4 From ed3b24c35f19cbbdd9fa4136312d6ec164f66d40 Mon Sep 17 00:00:00 2001 From: Mu-Woong Lee Date: Fri, 18 Dec 2015 17:16:50 +0900 Subject: [PATCH 07/16] Rename libsensord-devel.so to libsensord-shared.so Change-Id: Idb2476ee1bc85be9fc4040cc1d74e56ae39492f3 Signed-off-by: Mu-Woong Lee --- packaging/sensord.spec | 4 ++-- src/client/CMakeLists.txt | 2 +- src/server/CMakeLists.txt | 4 ++-- src/shared/CMakeLists.txt | 3 +-- 4 files changed, 6 insertions(+), 7 deletions(-) diff --git a/packaging/sensord.spec b/packaging/sensord.spec index b907dd6..4b56aa6 100644 --- a/packaging/sensord.spec +++ b/packaging/sensord.spec @@ -108,13 +108,13 @@ systemctl daemon-reload %defattr(-,root,root,-) %manifest libsensord.manifest %{_libdir}/libsensor.so.* -%{_libdir}/libsensord-devel.so +%{_libdir}/libsensord-shared.so %license LICENSE.APLv2 %files -n libsensord-devel %defattr(-,root,root,-) %{_includedir}/sensor/*.h -%{_includedir}/sensord-devel/*.h +%{_includedir}/sensord-shared/*.h %{_libdir}/libsensor.so %{_libdir}/pkgconfig/sensor.pc %license LICENSE.APLv2 diff --git a/src/client/CMakeLists.txt b/src/client/CMakeLists.txt index 0a404d3..e949a05 100755 --- a/src/client/CMakeLists.txt +++ b/src/client/CMakeLists.txt @@ -37,7 +37,7 @@ add_library(${PROJECT_NAME} SHARED poller.cpp ) -target_link_libraries(${PROJECT_NAME} ${lib_pkgs_LDFLAGS} "sensord-devel") +target_link_libraries(${PROJECT_NAME} ${lib_pkgs_LDFLAGS} "sensord-shared") SET_TARGET_PROPERTIES(${PROJECT_NAME} PROPERTIES SOVERSION ${VERSION_MAJOR}) SET_TARGET_PROPERTIES(${PROJECT_NAME} PROPERTIES VERSION ${VERSION}) diff --git a/src/server/CMakeLists.txt b/src/server/CMakeLists.txt index 30a5eff..a17facd 100755 --- a/src/server/CMakeLists.txt +++ b/src/server/CMakeLists.txt @@ -31,6 +31,6 @@ SET(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -pie") add_executable(${PROJECT_NAME} ${SERVER_SRCS} ${PLUGIN_SRCS}) -target_link_libraries(${PROJECT_NAME} ${lib_pkgs_LDFLAGS} "sensord-devel") +target_link_libraries(${PROJECT_NAME} ${lib_pkgs_LDFLAGS} "sensord-shared") -install(TARGETS ${PROJECT_NAME} DESTINATION bin) \ No newline at end of file +install(TARGETS ${PROJECT_NAME} DESTINATION bin) diff --git a/src/shared/CMakeLists.txt b/src/shared/CMakeLists.txt index df5670c..cc46347 100644 --- a/src/shared/CMakeLists.txt +++ b/src/shared/CMakeLists.txt @@ -1,5 +1,5 @@ cmake_minimum_required(VERSION 2.6) -project(sensord-devel CXX) +project(sensord-shared CXX) INCLUDE(FindPkgConfig) PKG_CHECK_MODULES(shared_pkgs REQUIRED dlog libxml-2.0) @@ -43,4 +43,3 @@ install(FILES sensor_types.h DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/sensor/) install(FILES sensor_internal_deprecated.h DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/sensor/) install(FILES sensor_internal.h DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/sensor/) install(FILES sensor_common.h DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/sensor/) - -- 2.7.4 From 6b3026329d731d869f779187b6ef076c94f2f37b Mon Sep 17 00:00:00 2001 From: "kibak.yoon" Date: Fri, 18 Dec 2015 19:29:33 +0900 Subject: [PATCH 08/16] sensord: add checking code whether socket is valid or not Change-Id: I666e46a69e23e1471b92764917612ef77baf4656 Signed-off-by: kibak.yoon --- src/client/csensor_event_listener.cpp | 5 ++++- src/server/csensor_event_dispatcher.cpp | 15 ++++++++++----- 2 files changed, 14 insertions(+), 6 deletions(-) diff --git a/src/client/csensor_event_listener.cpp b/src/client/csensor_event_listener.cpp index aad9c89..8c298dc 100644 --- a/src/client/csensor_event_listener.cpp +++ b/src/client/csensor_event_listener.cpp @@ -464,7 +464,10 @@ bool csensor_event_listener::create_event_channel(void) return false; } - m_event_socket.set_connection_mode(); + if (!m_event_socket.set_connection_mode()) { + ERR("Failed to set connection mode for client %s", get_client_name()); + return false; + } client_id = m_client_info.get_client_id(); diff --git a/src/server/csensor_event_dispatcher.cpp b/src/server/csensor_event_dispatcher.cpp index 605b9e7..970d776 100755 --- a/src/server/csensor_event_dispatcher.cpp +++ b/src/server/csensor_event_dispatcher.cpp @@ -222,11 +222,13 @@ void csensor_event_dispatcher::send_sensor_events(void* events, int event_cnt, b while (it_client_id != id_vec.end()) { csocket client_socket; - - client_info_manager.get_event_socket(*it_client_id, client_socket); - bool ret; + if (!client_info_manager.get_event_socket(*it_client_id, client_socket)) { + ++it_client_id; + continue; + } + if (is_hub_event) ret = (client_socket.send(sensor_hub_events + i, sizeof(sensorhub_event_t)) > 0); else @@ -240,7 +242,6 @@ void csensor_event_dispatcher::send_sensor_events(void* events, int event_cnt, b ++it_client_id; } } - } cclient_info_manager& csensor_event_dispatcher::get_client_info_manager(void) @@ -311,7 +312,11 @@ void csensor_event_dispatcher::request_last_event(int client_id, sensor_id_t sen csocket client_socket; if (client_info_manager.get_registered_events(client_id, sensor_id, event_vec)) { - client_info_manager.get_event_socket(client_id, client_socket); + if (!client_info_manager.get_event_socket(client_id, client_socket)) { + ERR("Failed to get event socket from %s", + client_info_manager.get_client_info(client_id)); + return; + } auto it_event = event_vec.begin(); while (it_event != event_vec.end()) { -- 2.7.4 From 86fb91cb73cb7f76220f029713cfd53a4b41b2ac Mon Sep 17 00:00:00 2001 From: "kibak.yoon" Date: Fri, 18 Dec 2015 19:35:38 +0900 Subject: [PATCH 09/16] sensord: initialize member variables Change-Id: Idbc272167bf9330d08d15d36e039372b8050f935 Signed-off-by: kibak.yoon --- src/server/plugins/pressure/pressure_sensor.cpp | 1 + src/server/virtual_sensor.cpp | 1 + 2 files changed, 2 insertions(+) diff --git a/src/server/plugins/pressure/pressure_sensor.cpp b/src/server/plugins/pressure/pressure_sensor.cpp index 8352f5b..533bb71 100755 --- a/src/server/plugins/pressure/pressure_sensor.cpp +++ b/src/server/plugins/pressure/pressure_sensor.cpp @@ -35,6 +35,7 @@ using std::vector; pressure_sensor::pressure_sensor() : m_sensor_hal(NULL) +, m_pressure(0.0f) , m_resolution(0.0f) { m_name = string(SENSOR_NAME); diff --git a/src/server/virtual_sensor.cpp b/src/server/virtual_sensor.cpp index bd0aa84..9a9aabb 100755 --- a/src/server/virtual_sensor.cpp +++ b/src/server/virtual_sensor.cpp @@ -22,6 +22,7 @@ virtual_sensor::virtual_sensor() +: m_hardware_fusion(false) { } -- 2.7.4 From c93d4c349250a092a24bb836e60a2c99084e23c1 Mon Sep 17 00:00:00 2001 From: "kibak.yoon" Date: Fri, 18 Dec 2015 19:39:32 +0900 Subject: [PATCH 10/16] sensord: change sprintf to snprintf Change-Id: I2675f9d10a0e01ef334c68052e488fadec658a2d Signed-off-by: kibak.yoon --- src/shared/sensor_logs.cpp | 2 +- test/src/fusion-data-collection.c | 2 +- test/src/multi-process-performance-test.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/shared/sensor_logs.cpp b/src/shared/sensor_logs.cpp index 4be987f..6af6cc5 100644 --- a/src/shared/sensor_logs.cpp +++ b/src/shared/sensor_logs.cpp @@ -143,7 +143,7 @@ bool get_proc_name(pid_t pid, char *process_name) { char buf[NAME_MAX]; - if (sprintf(buf, "%d process", pid) < 1) { + if (snprintf(buf, sizeof(buf), "%d process", pid) < 1) { return false; } diff --git a/test/src/fusion-data-collection.c b/test/src/fusion-data-collection.c index 86e9a0f..10c1091 100755 --- a/test/src/fusion-data-collection.c +++ b/test/src/fusion-data-collection.c @@ -95,7 +95,7 @@ int main(int argc, char **argv) char file_name[50]; for (i = 0; i < MAXSIZE; i++) { - sprintf(file_name, "output_%d", sensors[i]); + snprintf(file_name, sizeof(file_name), "output_%d", sensors[i]); file_output[i] = fopen(file_name, "w+"); sensor_t sensor = sensord_get_sensor(sensors[i]); handle[i] = sensord_connect(sensor); diff --git a/test/src/multi-process-performance-test.c b/test/src/multi-process-performance-test.c index c3555e2..c9b02ec 100755 --- a/test/src/multi-process-performance-test.c +++ b/test/src/multi-process-performance-test.c @@ -107,7 +107,7 @@ int main(int argc, char** argv) for (j = 0; j < MAX; j++) { char command[100]; - sprintf(command, "kill %d", pids[j]); + snprintf(command, sizeof(command), "kill %d", pids[j]); if (system(command) == -1) return -1; } -- 2.7.4 From 49826bd83f3d0a5aed484ab106c39f1a3453fddc Mon Sep 17 00:00:00 2001 From: "kibak.yoon" Date: Fri, 18 Dec 2015 19:47:07 +0900 Subject: [PATCH 11/16] sensord: fix the bug which returns true although there is an error Change-Id: I0ba655602ff782bd947fca3f10e66df4865d5c1c Signed-off-by: kibak.yoon --- src/shared/csocket.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/shared/csocket.cpp b/src/shared/csocket.cpp index dfb8ce1..9d80138 100644 --- a/src/shared/csocket.cpp +++ b/src/shared/csocket.cpp @@ -336,7 +336,7 @@ bool csocket::connect(const char *sock_path) } else if (!ret) { ERR("select timeout: %d seconds elapsed for %s", tv.tv_sec, get_client_name()); close(); - return true; + return false; } if (!FD_ISSET(m_sock_fd, &write_fds)) { -- 2.7.4 From 575e3ccc29853fefcf091812afc77e6175fe91aa Mon Sep 17 00:00:00 2001 From: "Hongkuk, Son" Date: Fri, 18 Dec 2015 20:00:44 +0900 Subject: [PATCH 12/16] sensord: initialize member variables 2 csensor_event_dispatcher/accel/temperature Signed-off-by: Hongkuk, Son Change-Id: If4214b2e19dcf04fd9fe7031c22d72c7cecef3d7 --- src/server/csensor_event_dispatcher.cpp | 1 + src/server/plugins/accel/accel_sensor.cpp | 1 + src/server/plugins/temperature/temperature_sensor.cpp | 1 + 3 files changed, 3 insertions(+) diff --git a/src/server/csensor_event_dispatcher.cpp b/src/server/csensor_event_dispatcher.cpp index 970d776..7408520 100755 --- a/src/server/csensor_event_dispatcher.cpp +++ b/src/server/csensor_event_dispatcher.cpp @@ -30,6 +30,7 @@ using std::vector; #define MAX_PENDING_CONNECTION 32 csensor_event_dispatcher::csensor_event_dispatcher() +: m_lcd_on(false) { } diff --git a/src/server/plugins/accel/accel_sensor.cpp b/src/server/plugins/accel/accel_sensor.cpp index 9652fd4..b122f50 100755 --- a/src/server/plugins/accel/accel_sensor.cpp +++ b/src/server/plugins/accel/accel_sensor.cpp @@ -39,6 +39,7 @@ using std::vector; accel_sensor::accel_sensor() : m_sensor_hal(NULL) +, m_raw_data_unit(0.0f) , m_interval(POLL_1HZ_MS) { m_name = string(SENSOR_NAME); diff --git a/src/server/plugins/temperature/temperature_sensor.cpp b/src/server/plugins/temperature/temperature_sensor.cpp index 533dcca..5b18a5b 100755 --- a/src/server/plugins/temperature/temperature_sensor.cpp +++ b/src/server/plugins/temperature/temperature_sensor.cpp @@ -29,6 +29,7 @@ using std::vector; temperature_sensor::temperature_sensor() : m_sensor_hal(NULL) +, m_temperature(0.0f) , m_resolution(0.0f) { m_name = string(SENSOR_NAME); -- 2.7.4 From 5afcaf8ad0b140a6169486a29390a592c853c265 Mon Sep 17 00:00:00 2001 From: Mu-Woong Lee Date: Mon, 21 Dec 2015 10:41:19 +0900 Subject: [PATCH 13/16] Fix for build errors of packages that are using deprecated sensor api Change-Id: I16348de21848f571b77d24e15420e79b04cd7593 Signed-off-by: Mu-Woong Lee (cherry picked from commit 104ea8470b8dba2b6ee4990efcb10b6923ab540b) --- src/shared/sensor_internal_deprecated.h | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/shared/sensor_internal_deprecated.h b/src/shared/sensor_internal_deprecated.h index 38665f7..cdf3084 100755 --- a/src/shared/sensor_internal_deprecated.h +++ b/src/shared/sensor_internal_deprecated.h @@ -39,6 +39,8 @@ extern "C" /*header for each sensor type*/ #include +#include + #define MAX_KEY_LEN 30 typedef struct { -- 2.7.4 From 9e0d4de2aa01f4e1f015c8a1df2797523e575c70 Mon Sep 17 00:00:00 2001 From: "kibak.yoon" Date: Mon, 21 Dec 2015 12:01:55 +0900 Subject: [PATCH 14/16] sensord: close socket fd if accept() is failed Change-Id: I93093632a3f9bcbcbcf4007564bb6c7d9512bd7a Signed-off-by: kibak.yoon --- src/shared/csocket.cpp | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/shared/csocket.cpp b/src/shared/csocket.cpp index 9d80138..5fbb2c1 100644 --- a/src/shared/csocket.cpp +++ b/src/shared/csocket.cpp @@ -154,8 +154,10 @@ bool csocket::accept(csocket& client_socket) const do { client_socket.m_sock_fd = ::accept(m_sock_fd, (sockaddr *)&m_addr, (socklen_t *)&addr_length); - if (!client_socket.is_valid()) + if (!client_socket.is_valid()) { err = errno; + ::close(client_socket.m_sock_fd); + } } while (err == EINTR); if (!client_socket.is_valid()) { -- 2.7.4 From c9a346716ee3ec1a8c0345338a9dd72757953f90 Mon Sep 17 00:00:00 2001 From: "Hongkuk, Son" Date: Tue, 22 Dec 2015 15:07:23 +0900 Subject: [PATCH 15/16] sensord: choose "Default" device when no matching device in virtual_sensors.xml -add "Default" device in virtual_sensors.xml file -when device id does not match with devices in virtual_sensors.xml, choose "Default" device Signed-off-by: Hongkuk, Son Change-Id: I37526479de706eccda36127e6d93ee66a1b32d55 --- src/server/cvirtual_sensor_config.cpp | 13 +++++++++++-- virtual_sensors.xml | 9 +++++++++ 2 files changed, 20 insertions(+), 2 deletions(-) diff --git a/src/server/cvirtual_sensor_config.cpp b/src/server/cvirtual_sensor_config.cpp index 25538ce..c963d48 100755 --- a/src/server/cvirtual_sensor_config.cpp +++ b/src/server/cvirtual_sensor_config.cpp @@ -35,6 +35,7 @@ using std::stringstream; #define DEFAULT_ATTR1 "value1" #define DEFAULT_ATTR2 "value2" #define DEFAULT_ATTR3 "value3" +#define DEFAULT_DEVICE "Default" cvirtual_sensor_config::cvirtual_sensor_config() { @@ -148,7 +149,6 @@ bool cvirtual_sensor_config::load_config(const string& config_path) attr_ptr = attr_ptr->next; } - element_node_ptr = element_node_ptr->next; } @@ -169,7 +169,16 @@ bool cvirtual_sensor_config::get(const string& sensor_type, const string& elemen if (it_device_list == m_virtual_sensor_config.end()) { ERR("There is no <%s> device\n",m_device_id.c_str()); - return false; + + m_device_id = DEFAULT_DEVICE; + it_device_list = m_virtual_sensor_config.find(m_device_id); + + if (it_device_list == m_virtual_sensor_config.end()) { + ERR("There is no Default device\n"); + return false; + } + + INFO("m_device_id is set to Default\n"); } auto it_virtual_sensor_list = it_device_list->second.find(sensor_type); diff --git a/virtual_sensors.xml b/virtual_sensors.xml index 68282e8..c0c08f5 100755 --- a/virtual_sensors.xml +++ b/virtual_sensors.xml @@ -1,5 +1,14 @@ + + + + + + + + + -- 2.7.4 From 4846fc6c5071e734e99de9ec4ae0cb0f5d4f91d2 Mon Sep 17 00:00:00 2001 From: "Hongkuk, Son" Date: Tue, 22 Dec 2015 15:34:55 +0900 Subject: [PATCH 16/16] sensord: enable auto_rotation sensor Signed-off-by: Hongkuk, Son Change-Id: Ibce2bc591af30465c6511535a1aa1f198ebf11a9 --- packaging/sensord.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packaging/sensord.spec b/packaging/sensord.spec index 4b56aa6..d7516ed 100644 --- a/packaging/sensord.spec +++ b/packaging/sensord.spec @@ -21,7 +21,7 @@ BuildRequires: pkgconfig(cynara-client) BuildRequires: pkgconfig(cynara-session) Requires: libsensord = %{version}-%{release} -%define auto_rotation_state OFF +%define auto_rotation_state ON %define orientation_state OFF %define gravity_state OFF %define linear_accel_state OFF -- 2.7.4