From 68ed35f9adc3849c53cc919cec5cb310f9b47a67 Mon Sep 17 00:00:00 2001 From: Mu-Woong Lee Date: Mon, 6 Feb 2017 16:51:49 +0900 Subject: [PATCH 2/4] Add the code skeleton of sensor recorder server & client Change-Id: Ic4e0d43f43f91565921f83675277f6e07fabd022 Signed-off-by: Mu-Woong Lee --- .gitignore | 1 + AUTHORS | 3 + CMakeLists.txt | 32 +++++ LICENSE | 204 +++++++++++++++++++++++++++++ include/SensorRecorder.h | 33 +++++ include/SensorRecorderService.h | 39 ++++++ include/SensorRecorderTypes.h | 23 ++++ packaging/sensor-recorder.manifest | 5 + packaging/sensor-recorder.spec | 97 ++++++++++++++ sensor-recorder.pc.in | 13 ++ src/client-dummy/CMakeLists.txt | 34 +++++ src/client-dummy/SensorRecorder.cpp | 26 ++++ src/client/CMakeLists.txt | 19 +++ src/client/SensorRecorder.cpp | 36 +++++ src/server-dummy/CMakeLists.txt | 34 +++++ src/server-dummy/SensorRecorderService.cpp | 39 ++++++ src/server/CMakeLists.txt | 19 +++ src/server/SensorRecorderClientProxy.cpp | 45 +++++++ src/server/SensorRecorderClientProxy.h | 35 +++++ src/server/SensorRecorderService.cpp | 40 ++++++ src/shared/SensorRecorderTypesPrivate.h | 29 ++++ 21 files changed, 806 insertions(+) create mode 100644 .gitignore create mode 100644 AUTHORS create mode 100644 CMakeLists.txt create mode 100644 LICENSE create mode 100644 include/SensorRecorder.h create mode 100644 include/SensorRecorderService.h create mode 100644 include/SensorRecorderTypes.h create mode 100644 packaging/sensor-recorder.manifest create mode 100644 packaging/sensor-recorder.spec create mode 100644 sensor-recorder.pc.in create mode 100644 src/client-dummy/CMakeLists.txt create mode 100644 src/client-dummy/SensorRecorder.cpp create mode 100644 src/client/CMakeLists.txt create mode 100644 src/client/SensorRecorder.cpp create mode 100644 src/server-dummy/CMakeLists.txt create mode 100644 src/server-dummy/SensorRecorderService.cpp create mode 100644 src/server/CMakeLists.txt create mode 100644 src/server/SensorRecorderClientProxy.cpp create mode 100644 src/server/SensorRecorderClientProxy.h create mode 100644 src/server/SensorRecorderService.cpp create mode 100644 src/shared/SensorRecorderTypesPrivate.h diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..a01ee28 --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +.*.swp diff --git a/AUTHORS b/AUTHORS new file mode 100644 index 0000000..44b24d6 --- /dev/null +++ b/AUTHORS @@ -0,0 +1,3 @@ +Mu-Woong Lee +Somin Kim +Kibak Yoon diff --git a/CMakeLists.txt b/CMakeLists.txt new file mode 100644 index 0000000..9383730 --- /dev/null +++ b/CMakeLists.txt @@ -0,0 +1,32 @@ +CMAKE_MINIMUM_REQUIRED(VERSION 2.6) +PROJECT(sensor-recorder) +INCLUDE(GNUInstallDirs) + +SET(DEPS "glib-2.0 gio-2.0 dlog capi-base-common") +SET(INCDIR "context-service") + +INCLUDE_DIRECTORIES( + ${CMAKE_SOURCE_DIR}/include + ${CMAKE_SOURCE_DIR}/src/shared +) + +ADD_DEFINITIONS(-O2 -Wall -fPIC -fdata-sections -ffunction-sections -fvisibility=hidden) +ADD_DEFINITIONS(-DLOG_TAG="CONTEXT-SENSOR") +SET(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -fPIC -Wl,--as-needed -Wl,--gc-section -Wl,--print-gc-section") + +SET(VERSION ${FULLVER}) +SET(PREFIX ${CMAKE_INSTALL_PREFIX}) +SET(PC_INCLUDE "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_INCLUDEDIR}/${INCDIR}") +SET(PC_LIBDIR "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}") +SET(PC_CFLAGS -I\${includedir}/${INCDIR}) + +INSTALL( + DIRECTORY ${CMAKE_SOURCE_DIR}/include/ + DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/${INCDIR} + FILES_MATCHING PATTERN "*.h" +) + +ADD_SUBDIRECTORY(src/client-dummy) +ADD_SUBDIRECTORY(src/server-dummy) +ADD_SUBDIRECTORY(src/client) +ADD_SUBDIRECTORY(src/server) diff --git a/LICENSE b/LICENSE new file mode 100644 index 0000000..3ef9807 --- /dev/null +++ b/LICENSE @@ -0,0 +1,204 @@ +Copyright (c) 2017 - 2017 Samsung Electronics Co., Ltd. All rights reserved. + + Apache License + Version 2.0, January 2004 + http://www.apache.org/licenses/ + + TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + + 1. Definitions. + + "License" shall mean the terms and conditions for use, reproduction, + and distribution as defined by Sections 1 through 9 of this document. + + "Licensor" shall mean the copyright owner or entity authorized by + the copyright owner that is granting the License. + + "Legal Entity" shall mean the union of the acting entity and all + other entities that control, are controlled by, or are under common + control with that entity. For the purposes of this definition, + "control" means (i) the power, direct or indirect, to cause the + direction or management of such entity, whether by contract or + otherwise, or (ii) ownership of fifty percent (50%) or more of the + outstanding shares, or (iii) beneficial ownership of such entity. + + "You" (or "Your") shall mean an individual or Legal Entity + exercising permissions granted by this License. + + "Source" form shall mean the preferred form for making modifications, + including but not limited to software source code, documentation + source, and configuration files. + + "Object" form shall mean any form resulting from mechanical + transformation or translation of a Source form, including but + not limited to compiled object code, generated documentation, + and conversions to other media types. + + "Work" shall mean the work of authorship, whether in Source or + Object form, made available under the License, as indicated by a + copyright notice that is included in or attached to the work + (an example is provided in the Appendix below). + + "Derivative Works" shall mean any work, whether in Source or Object + form, that is based on (or derived from) the Work and for which the + editorial revisions, annotations, elaborations, or other modifications + represent, as a whole, an original work of authorship. For the purposes + of this License, Derivative Works shall not include works that remain + separable from, or merely link (or bind by name) to the interfaces of, + the Work and Derivative Works thereof. + + "Contribution" shall mean any work of authorship, including + the original version of the Work and any modifications or additions + to that Work or Derivative Works thereof, that is intentionally + submitted to Licensor for inclusion in the Work by the copyright owner + or by an individual or Legal Entity authorized to submit on behalf of + the copyright owner. For the purposes of this definition, "submitted" + means any form of electronic, verbal, or written communication sent + to the Licensor or its representatives, including but not limited to + communication on electronic mailing lists, source code control systems, + and issue tracking systems that are managed by, or on behalf of, the + Licensor for the purpose of discussing and improving the Work, but + excluding communication that is conspicuously marked or otherwise + designated in writing by the copyright owner as "Not a Contribution." + + "Contributor" shall mean Licensor and any individual or Legal Entity + on behalf of whom a Contribution has been received by Licensor and + subsequently incorporated within the Work. + + 2. Grant of Copyright License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + copyright license to reproduce, prepare Derivative Works of, + publicly display, publicly perform, sublicense, and distribute the + Work and such Derivative Works in Source or Object form. + + 3. Grant of Patent License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + (except as stated in this section) patent license to make, have made, + use, offer to sell, sell, import, and otherwise transfer the Work, + where such license applies only to those patent claims licensable + by such Contributor that are necessarily infringed by their + Contribution(s) alone or by combination of their Contribution(s) + with the Work to which such Contribution(s) was submitted. If You + institute patent litigation against any entity (including a + cross-claim or counterclaim in a lawsuit) alleging that the Work + or a Contribution incorporated within the Work constitutes direct + or contributory patent infringement, then any patent licenses + granted to You under this License for that Work shall terminate + as of the date such litigation is filed. + + 4. Redistribution. You may reproduce and distribute copies of the + Work or Derivative Works thereof in any medium, with or without + modifications, and in Source or Object form, provided that You + meet the following conditions: + + (a) You must give any other recipients of the Work or + Derivative Works a copy of this License; and + + (b) You must cause any modified files to carry prominent notices + stating that You changed the files; and + + (c) You must retain, in the Source form of any Derivative Works + that You distribute, all copyright, patent, trademark, and + attribution notices from the Source form of the Work, + excluding those notices that do not pertain to any part of + the Derivative Works; and + + (d) If the Work includes a "NOTICE" text file as part of its + distribution, then any Derivative Works that You distribute must + include a readable copy of the attribution notices contained + within such NOTICE file, excluding those notices that do not + pertain to any part of the Derivative Works, in at least one + of the following places: within a NOTICE text file distributed + as part of the Derivative Works; within the Source form or + documentation, if provided along with the Derivative Works; or, + within a display generated by the Derivative Works, if and + wherever such third-party notices normally appear. The contents + of the NOTICE file are for informational purposes only and + do not modify the License. You may add Your own attribution + notices within Derivative Works that You distribute, alongside + or as an addendum to the NOTICE text from the Work, provided + that such additional attribution notices cannot be construed + as modifying the License. + + You may add Your own copyright statement to Your modifications and + may provide additional or different license terms and conditions + for use, reproduction, or distribution of Your modifications, or + for any such Derivative Works as a whole, provided Your use, + reproduction, and distribution of the Work otherwise complies with + the conditions stated in this License. + + 5. Submission of Contributions. Unless You explicitly state otherwise, + any Contribution intentionally submitted for inclusion in the Work + by You to the Licensor shall be under the terms and conditions of + this License, without any additional terms or conditions. + Notwithstanding the above, nothing herein shall supersede or modify + the terms of any separate license agreement you may have executed + with Licensor regarding such Contributions. + + 6. Trademarks. This License does not grant permission to use the trade + names, trademarks, service marks, or product names of the Licensor, + except as required for reasonable and customary use in describing the + origin of the Work and reproducing the content of the NOTICE file. + + 7. Disclaimer of Warranty. Unless required by applicable law or + agreed to in writing, Licensor provides the Work (and each + Contributor provides its Contributions) on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + implied, including, without limitation, any warranties or conditions + of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A + PARTICULAR PURPOSE. You are solely responsible for determining the + appropriateness of using or redistributing the Work and assume any + risks associated with Your exercise of permissions under this License. + + 8. Limitation of Liability. In no event and under no legal theory, + whether in tort (including negligence), contract, or otherwise, + unless required by applicable law (such as deliberate and grossly + negligent acts) or agreed to in writing, shall any Contributor be + liable to You for damages, including any direct, indirect, special, + incidental, or consequential damages of any character arising as a + result of this License or out of the use or inability to use the + Work (including but not limited to damages for loss of goodwill, + work stoppage, computer failure or malfunction, or any and all + other commercial damages or losses), even if such Contributor + has been advised of the possibility of such damages. + + 9. Accepting Warranty or Additional Liability. While redistributing + the Work or Derivative Works thereof, You may choose to offer, + and charge a fee for, acceptance of support, warranty, indemnity, + or other liability obligations and/or rights consistent with this + License. However, in accepting such obligations, You may act only + on Your own behalf and on Your sole responsibility, not on behalf + of any other Contributor, and only if You agree to indemnify, + defend, and hold each Contributor harmless for any liability + incurred by, or claims asserted against, such Contributor by reason + of your accepting any such warranty or additional liability. + + END OF TERMS AND CONDITIONS + + APPENDIX: How to apply the Apache License to your work. + + To apply the Apache License to your work, attach the following + boilerplate notice, with the fields enclosed by brackets "[]" + replaced with your own identifying information. (Don't include + the brackets!) The text should be enclosed in the appropriate + comment syntax for the file format. We also recommend that a + file or class name and description of purpose be included on the + same "printed page" as the copyright notice for easier + identification within third-party archives. + + Copyright [yyyy] [name of copyright owner] + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. + diff --git a/include/SensorRecorder.h b/include/SensorRecorder.h new file mode 100644 index 0000000..94964ac --- /dev/null +++ b/include/SensorRecorder.h @@ -0,0 +1,33 @@ +/* + * Copyright (c) 2017 Samsung Electronics Co., Ltd. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +#ifndef __SENSOR_RECORDER_H__ +#define __SENSOR_RECORDER_H__ + +#include + +#ifdef __cplusplus +extern "C" +{ +#endif + +int sensor_recorder_test(); + +#ifdef __cplusplus +} +#endif + +#endif diff --git a/include/SensorRecorderService.h b/include/SensorRecorderService.h new file mode 100644 index 0000000..f44cbe2 --- /dev/null +++ b/include/SensorRecorderService.h @@ -0,0 +1,39 @@ +/* + * Copyright (c) 2017 Samsung Electronics Co., Ltd. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +#ifndef __SENSOR_RECORDER_SERVICE_H__ +#define __SENSOR_RECORDER_SERVICE_H__ + +/* This header SHOULD NOT be included by other headers in this directory. */ + +#include +#include + +namespace ctx { + + class EXPORT_API SensorRecorderService : public DBusService { + public: + SensorRecorderService(GDBusConnection* conn); + ~SensorRecorderService(); + + protected: + void prepare(); + ClientProxy* createProxy(const std::string& busName); + }; + +} + +#endif diff --git a/include/SensorRecorderTypes.h b/include/SensorRecorderTypes.h new file mode 100644 index 0000000..00fbaed --- /dev/null +++ b/include/SensorRecorderTypes.h @@ -0,0 +1,23 @@ +/* + * Copyright (c) 2017 Samsung Electronics Co., Ltd. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +#ifndef __SENSOR_RECORDER_TYPES_H__ +#define __SENSOR_RECORDER_TYPES_H__ + +#include + + +#endif diff --git a/packaging/sensor-recorder.manifest b/packaging/sensor-recorder.manifest new file mode 100644 index 0000000..97e8c31 --- /dev/null +++ b/packaging/sensor-recorder.manifest @@ -0,0 +1,5 @@ + + + + + diff --git a/packaging/sensor-recorder.spec b/packaging/sensor-recorder.spec new file mode 100644 index 0000000..0a61609 --- /dev/null +++ b/packaging/sensor-recorder.spec @@ -0,0 +1,97 @@ +Name: sensor-recorder +Summary: Tizen Sensor Recorder +Version: 0.0.1 +Release: 1 +Group: Service Framework/Context +License: Apache-2.0 +Source0: %{name}-%{version}.tar.gz + +BuildRequires: cmake +BuildRequires: pkgconfig(glib-2.0) +BuildRequires: pkgconfig(gio-2.0) +BuildRequires: pkgconfig(sqlite3) +BuildRequires: pkgconfig(dlog) +BuildRequires: pkgconfig(capi-base-common) +BuildRequires: pkgconfig(libtzplatform-config) +BuildRequires: pkgconfig(context-common-server) +BuildRequires: pkgconfig(context-common-client) +Provides: %{name}-profile_tv = %{version}-%{release} +Provides: %{name}-profile_ivi = %{version}-%{release} +Provides: %{name}-profile_common = %{version}-%{release} + +%description +Tizen Sensor Recorder Service + + +%package genuine +Summary: Genuine Sensor Recorder service server and client libraries +Requires: %{name} = %{version}-%{release} +Requires: context-service +Provides: %{name}-profile_mobile = %{version}-%{release} +Provides: %{name}-profile_wearable = %{version}-%{release} + +%description genuine +Binary replacement for sensor-recorder. +This genuine sensor-recorder package contains actually working shared objects +of the both server and client sides of the sensor-recorder service. + + +%package devel +Summary: Tizen Sensor Recorder Service API +Group: Service Framework/Context +Requires: %{name} = %{version}-%{release} + +%description devel +Tizen Sensor Recorder Service API + + +%prep +%setup -q + +%build +MAJORVER=`echo %{version} | awk 'BEGIN {FS="."}{print $1}'` + +export CXXFLAGS+=" -Wextra -Wcast-align -Wshadow -Wwrite-strings -Wswitch-default -Wno-unused-parameter" +export CXXFLAGS+=" -Wno-empty-body -fomit-frame-pointer -fno-optimize-sibling-calls" +export CXXFLAGS+=" -fno-strict-aliasing -fno-unroll-loops -fsigned-char -fstrict-overflow" +export CXXFLAGS+=" -Wnon-virtual-dtor -std=c++0x" + +cmake . -DCMAKE_INSTALL_PREFIX=%{_prefix} -DMAJORVER=${MAJORVER} -DFULLVER=%{version} +make %{?jobs:-j%jobs} + +%install +rm -rf %{buildroot} +%make_install + + +%post +/sbin/ldconfig + +%files +%manifest packaging/%{name}.manifest +%{_libdir}/lib%{name}-client.so* +%{_libdir}/lib%{name}-server.so* +%license LICENSE + + +%preun genuine +echo "You need to reinstall %{name} to keep using the APIs after uninstalling this." + +%post genuine +pushd %{_libdir} +ln -sf lib%{name}-client-genuine.so.%{version} lib%{name}-client.so.%{version} +ln -sf lib%{name}-server-genuine.so.%{version} lib%{name}-server.so.%{version} +chsmack -a "_" lib%{name}-client.so.%{version} +chsmack -a "_" lib%{name}-server.so.%{version} +popd +/sbin/ldconfig + +%files genuine +%manifest packaging/%{name}.manifest +%{_libdir}/lib%{name}-client-genuine.so* +%{_libdir}/lib%{name}-server-genuine.so* + + +%files devel +%{_includedir}/context-service/*.h +%{_libdir}/pkgconfig/*.pc diff --git a/sensor-recorder.pc.in b/sensor-recorder.pc.in new file mode 100644 index 0000000..378b991 --- /dev/null +++ b/sensor-recorder.pc.in @@ -0,0 +1,13 @@ +#Package Information for pkg-config + +prefix=@PREFIX@ +exec_prefix=@PREFIX@ +libdir=@PC_LIBDIR@ +includedir=@PC_INCLUDE@ + +Name: @PC_NAME@ +Description: @PC_DESCRIPTION@ +Version: @VERSION@ +Requires: @PC_REQUIRED@ +Libs: -L${libdir} @PC_LDFLAGS@ +Cflags: -I${includedir} diff --git a/src/client-dummy/CMakeLists.txt b/src/client-dummy/CMakeLists.txt new file mode 100644 index 0000000..17d81b2 --- /dev/null +++ b/src/client-dummy/CMakeLists.txt @@ -0,0 +1,34 @@ +SET(target "${PROJECT_NAME}-client") + +SET(DEPS "${DEPS} context-common-client") + +FILE(GLOB_RECURSE SRCS *.cpp) +MESSAGE("Sources: ${SRCS}") + +INCLUDE(FindPkgConfig) +pkg_check_modules(PKG_CLIENT REQUIRED ${DEPS}) + +FOREACH(flag ${PKG_CLIENT_CFLAGS}) + SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${flag}") +ENDFOREACH(flag) + +ADD_LIBRARY(${target} SHARED ${SRCS}) +TARGET_LINK_LIBRARIES(${target} ${PKG_CLIENT_LDFLAGS}) +SET_TARGET_PROPERTIES(${target} PROPERTIES SOVERSION ${MAJORVER}) +SET_TARGET_PROPERTIES(${target} PROPERTIES VERSION ${FULLVER}) + + +SET(PC_NAME ${target}) +SET(PC_DESCRIPTION "Tizen Sensor Recorder Client Library") +SET(PC_REQUIRED ${DEPS}) +SET(PC_LDFLAGS -l${target}) + +CONFIGURE_FILE( + ${CMAKE_SOURCE_DIR}/${PROJECT_NAME}.pc.in + ${CMAKE_SOURCE_DIR}/${target}.pc + @ONLY +) + + +INSTALL(TARGETS ${target} LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}) +INSTALL(FILES ${CMAKE_SOURCE_DIR}/${target}.pc DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig) diff --git a/src/client-dummy/SensorRecorder.cpp b/src/client-dummy/SensorRecorder.cpp new file mode 100644 index 0000000..66d0bae --- /dev/null +++ b/src/client-dummy/SensorRecorder.cpp @@ -0,0 +1,26 @@ +/* + * Copyright (c) 2017 Samsung Electronics Co., Ltd. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +#include +#include + +using namespace ctx; + +/* TODO: Remove this test code */ +EXPORT_API int sensor_recorder_test() +{ + return E_SUPPORT; +} diff --git a/src/client/CMakeLists.txt b/src/client/CMakeLists.txt new file mode 100644 index 0000000..8f551d7 --- /dev/null +++ b/src/client/CMakeLists.txt @@ -0,0 +1,19 @@ +SET(target "${PROJECT_NAME}-client-genuine") + +SET(DEPS "${DEPS} context-common-client") + +FILE(GLOB_RECURSE SRCS *.cpp ../shared/*.cpp) +MESSAGE("Sources: ${SRCS}") + +INCLUDE(FindPkgConfig) +pkg_check_modules(PKG_CLIENT REQUIRED ${DEPS}) + +FOREACH(flag ${PKG_CLIENT_CFLAGS}) + SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${flag}") +ENDFOREACH(flag) + +ADD_LIBRARY(${target} SHARED ${SRCS}) +TARGET_LINK_LIBRARIES(${target} ${PKG_CLIENT_LDFLAGS}) +SET_TARGET_PROPERTIES(${target} PROPERTIES VERSION ${FULLVER}) + +INSTALL(TARGETS ${target} LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} NAMELINK_SKIP) diff --git a/src/client/SensorRecorder.cpp b/src/client/SensorRecorder.cpp new file mode 100644 index 0000000..d63fbb5 --- /dev/null +++ b/src/client/SensorRecorder.cpp @@ -0,0 +1,36 @@ +/* + * Copyright (c) 2017 Samsung Electronics Co., Ltd. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +#include +#include +#include + +using namespace ctx; + +/* TODO: Remove this test code */ +EXPORT_API int sensor_recorder_test() +{ + // DBusClient object can be maintained as a static object. + DBusClient client(CTX_SENSOR_RECORDER); + + GVariant* output = NULL; + + int err = client.call("test", g_variant_new("(i)", 100), &output); + + _I(YELLOW("Return: %d (%s)"), err, CTX_ERROR_STR(err)); + + return err; +} diff --git a/src/server-dummy/CMakeLists.txt b/src/server-dummy/CMakeLists.txt new file mode 100644 index 0000000..62aa1b5 --- /dev/null +++ b/src/server-dummy/CMakeLists.txt @@ -0,0 +1,34 @@ +SET(target "${PROJECT_NAME}-server") + +SET(DEPS "${DEPS} context-common-server") + +FILE(GLOB_RECURSE SRCS *.cpp) +MESSAGE("Sources: ${SRCS}") + +INCLUDE(FindPkgConfig) +pkg_check_modules(PKG_SERVER REQUIRED ${DEPS}) + +FOREACH(flag ${PKG_SERVER_CFLAGS}) + SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${flag}") +ENDFOREACH(flag) + +ADD_LIBRARY(${target} SHARED ${SRCS}) +TARGET_LINK_LIBRARIES(${target} ${PKG_SERVER_LDFLAGS}) +SET_TARGET_PROPERTIES(${target} PROPERTIES SOVERSION ${MAJORVER}) +SET_TARGET_PROPERTIES(${target} PROPERTIES VERSION ${FULLVER}) + + +SET(PC_NAME ${target}) +SET(PC_DESCRIPTION "Tizen Sensor Recorder Server Library") +SET(PC_REQUIRED ${DEPS}) +SET(PC_LDFLAGS -l${target}) + +CONFIGURE_FILE( + ${CMAKE_SOURCE_DIR}/${PROJECT_NAME}.pc.in + ${CMAKE_SOURCE_DIR}/${target}.pc + @ONLY +) + + +INSTALL(TARGETS ${target} LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}) +INSTALL(FILES ${CMAKE_SOURCE_DIR}/${target}.pc DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig) diff --git a/src/server-dummy/SensorRecorderService.cpp b/src/server-dummy/SensorRecorderService.cpp new file mode 100644 index 0000000..1582aa2 --- /dev/null +++ b/src/server-dummy/SensorRecorderService.cpp @@ -0,0 +1,39 @@ +/* + * Copyright (c) 2017 Samsung Electronics Co., Ltd. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +#include +#include + +using namespace ctx; + +SensorRecorderService::SensorRecorderService(GDBusConnection* conn) : + DBusService(conn, CTX_SENSOR_RECORDER, CTX_SENSOR_RECORDER_SPEC) +{ + throw std::runtime_error("Sensor Recorder is not supported"); +} + +SensorRecorderService::~SensorRecorderService() +{ +} + +void SensorRecorderService::prepare() +{ +} + +ClientProxy* SensorRecorderService::createProxy(const std::string& busName) +{ + return NULL; +} diff --git a/src/server/CMakeLists.txt b/src/server/CMakeLists.txt new file mode 100644 index 0000000..64a741f --- /dev/null +++ b/src/server/CMakeLists.txt @@ -0,0 +1,19 @@ +SET(target "${PROJECT_NAME}-server-genuine") + +SET(DEPS "${DEPS} context-common-server") + +FILE(GLOB_RECURSE SRCS *.cpp ../shared/*.cpp) +MESSAGE("Sources: ${SRCS}") + +INCLUDE(FindPkgConfig) +pkg_check_modules(PKG_SERVER REQUIRED ${DEPS}) + +FOREACH(flag ${PKG_SERVER_CFLAGS}) + SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${flag}") +ENDFOREACH(flag) + +ADD_LIBRARY(${target} SHARED ${SRCS}) +TARGET_LINK_LIBRARIES(${target} ${PKG_SERVER_LDFLAGS}) +SET_TARGET_PROPERTIES(${target} PROPERTIES VERSION ${FULLVER}) + +INSTALL(TARGETS ${target} LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} NAMELINK_SKIP) diff --git a/src/server/SensorRecorderClientProxy.cpp b/src/server/SensorRecorderClientProxy.cpp new file mode 100644 index 0000000..10a7564 --- /dev/null +++ b/src/server/SensorRecorderClientProxy.cpp @@ -0,0 +1,45 @@ +/* + * Copyright (c) 2017 Samsung Electronics Co., Ltd. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +#include +#include +#include "SensorRecorderClientProxy.h" + +using namespace ctx; + +SensorRecorderClientProxy::SensorRecorderClientProxy(DBusService* hostService, const std::string& busName) : + ClientProxy(hostService, busName) +{ +} + +SensorRecorderClientProxy::~SensorRecorderClientProxy() +{ +} + +void SensorRecorderClientProxy::onMethodCalled(MethodCall* methodCall) +{ + /* TODO: Remove this test code */ + char* param = g_variant_print(methodCall->getParam(), FALSE); + _I("Caller: %s, Method: %s", methodCall->getSender()->getBusName().c_str(), methodCall->getMethodName().c_str()); + _I("Parameters: %s", param); + g_free(param); + methodCall->reply(E_FAILED); + delete methodCall; +} + +void SensorRecorderClientProxy::onDisconnected() +{ +} diff --git a/src/server/SensorRecorderClientProxy.h b/src/server/SensorRecorderClientProxy.h new file mode 100644 index 0000000..e9e188d --- /dev/null +++ b/src/server/SensorRecorderClientProxy.h @@ -0,0 +1,35 @@ +/* + * Copyright (c) 2017 Samsung Electronics Co., Ltd. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +#ifndef __SENSOR_RECORDER_CLIENT_PROXY_H__ +#define __SENSOR_RECORDER_CLIENT_PROXY_H__ + +#include + +namespace ctx { + + class SensorRecorderClientProxy : public ClientProxy { + public: + SensorRecorderClientProxy(DBusService* hostService, const std::string& busName); + ~SensorRecorderClientProxy(); + + void onMethodCalled(MethodCall* methodCall); + void onDisconnected(); + }; + +} + +#endif /* __SENSOR_RECORDER_CLIENT_PROXY_H__ */ diff --git a/src/server/SensorRecorderService.cpp b/src/server/SensorRecorderService.cpp new file mode 100644 index 0000000..b08cf1c --- /dev/null +++ b/src/server/SensorRecorderService.cpp @@ -0,0 +1,40 @@ +/* + * Copyright (c) 2017 Samsung Electronics Co., Ltd. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +#include +#include +#include "SensorRecorderClientProxy.h" + +using namespace ctx; + +SensorRecorderService::SensorRecorderService(GDBusConnection* conn) : + DBusService(conn, CTX_SENSOR_RECORDER, CTX_SENSOR_RECORDER_SPEC) +{ +} + +SensorRecorderService::~SensorRecorderService() +{ +} + +void SensorRecorderService::prepare() +{ + /* Service-specific initialization tasks */ +} + +ClientProxy* SensorRecorderService::createProxy(const std::string& busName) +{ + return new(std::nothrow) SensorRecorderClientProxy(this, busName); +} diff --git a/src/shared/SensorRecorderTypesPrivate.h b/src/shared/SensorRecorderTypesPrivate.h new file mode 100644 index 0000000..d4dac43 --- /dev/null +++ b/src/shared/SensorRecorderTypesPrivate.h @@ -0,0 +1,29 @@ +/* + * Copyright (c) 2017 Samsung Electronics Co., Ltd. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +#ifndef __SENSOR_RECORDER_TYPES_PRIVATE_H__ +#define __SENSOR_RECORDER_TYPES_PRIVATE_H__ + +#include + +#define CTX_SENSOR_RECORDER "SensorRecorder" +#define CTX_SENSOR_RECORDER_SPEC \ + "" \ + " " \ + " " \ + "" + +#endif -- 2.7.4 From 871468c187775566ae673eade3821049593799b1 Mon Sep 17 00:00:00 2001 From: Mu-Woong Lee Date: Thu, 9 Feb 2017 19:18:51 +0900 Subject: [PATCH 3/4] Add callback function for active user changes Change-Id: I6329afeb9ab5290a43ca7905d42ac1cf5abacf71 Signed-off-by: Mu-Woong Lee --- include/SensorRecorderService.h | 2 ++ src/server-dummy/SensorRecorderService.cpp | 4 ++++ src/server/SensorRecorderService.cpp | 5 +++++ 3 files changed, 11 insertions(+) diff --git a/include/SensorRecorderService.h b/include/SensorRecorderService.h index f44cbe2..4c7c5e1 100644 --- a/include/SensorRecorderService.h +++ b/include/SensorRecorderService.h @@ -32,6 +32,8 @@ namespace ctx { protected: void prepare(); ClientProxy* createProxy(const std::string& busName); + + void onUserActivated(uid_t uid); }; } diff --git a/src/server-dummy/SensorRecorderService.cpp b/src/server-dummy/SensorRecorderService.cpp index 1582aa2..6ea50b9 100644 --- a/src/server-dummy/SensorRecorderService.cpp +++ b/src/server-dummy/SensorRecorderService.cpp @@ -37,3 +37,7 @@ ClientProxy* SensorRecorderService::createProxy(const std::string& busName) { return NULL; } + +void SensorRecorderService::onUserActivated(uid_t uid) +{ +} diff --git a/src/server/SensorRecorderService.cpp b/src/server/SensorRecorderService.cpp index b08cf1c..d62ae19 100644 --- a/src/server/SensorRecorderService.cpp +++ b/src/server/SensorRecorderService.cpp @@ -38,3 +38,8 @@ ClientProxy* SensorRecorderService::createProxy(const std::string& busName) { return new(std::nothrow) SensorRecorderClientProxy(this, busName); } + +void SensorRecorderService::onUserActivated(uid_t uid) +{ + _I("New User: %u", uid); +} -- 2.7.4 From 8917f5e27e3006421333a81398662e00ef300fc8 Mon Sep 17 00:00:00 2001 From: Mu-Woong Lee Date: Mon, 20 Feb 2017 12:40:48 +0900 Subject: [PATCH 4/4] Cleanup the build script Change-Id: Iaf30e93421566f92d01f6da6b96e3dfcc6f633e9 Signed-off-by: Mu-Woong Lee --- packaging/sensor-recorder.spec | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/packaging/sensor-recorder.spec b/packaging/sensor-recorder.spec index 0a61609..1c71a2b 100644 --- a/packaging/sensor-recorder.spec +++ b/packaging/sensor-recorder.spec @@ -29,6 +29,7 @@ Requires: %{name} = %{version}-%{release} Requires: context-service Provides: %{name}-profile_mobile = %{version}-%{release} Provides: %{name}-profile_wearable = %{version}-%{release} +%global __provides_exclude ^.*-genuine\\.so.*$ %description genuine Binary replacement for sensor-recorder. @@ -56,11 +57,10 @@ export CXXFLAGS+=" -Wno-empty-body -fomit-frame-pointer -fno-optimize-sibling-ca export CXXFLAGS+=" -fno-strict-aliasing -fno-unroll-loops -fsigned-char -fstrict-overflow" export CXXFLAGS+=" -Wnon-virtual-dtor -std=c++0x" -cmake . -DCMAKE_INSTALL_PREFIX=%{_prefix} -DMAJORVER=${MAJORVER} -DFULLVER=%{version} -make %{?jobs:-j%jobs} +%cmake . -DMAJORVER=${MAJORVER} -DFULLVER=%{version} +make %{?_smp_mflags} %install -rm -rf %{buildroot} %make_install -- 2.7.4