From d1c23715e8b55daf679d457825e49f759f84eaaf Mon Sep 17 00:00:00 2001 From: Taeyoung Kim Date: Tue, 19 Jan 2016 11:34:11 +0900 Subject: [PATCH 2/9] tracker: add library basic codes - spec file for rpm build - CMakeLists file for cross compile - pc file to use pkg-config Change-Id: I4eabc4917356938687c8fd900e4e2ff842cfca73 Signed-off-by: Taeyoung Kim --- .gitignore | 3 + CMakeLists.txt | 56 ++++++++++++ LICENSE | 201 ++++++++++++++++++++++++++++++++++++++++++ include/tracker.h | 66 ++++++++++++++ include/tracker_private.h | 46 ++++++++++ packaging/libtracker.manifest | 5 ++ packaging/libtracker.spec | 63 +++++++++++++ src/tracker.c | 28 ++++++ tracker.pc.in | 12 +++ 9 files changed, 480 insertions(+) create mode 100644 .gitignore create mode 100644 CMakeLists.txt create mode 100644 LICENSE create mode 100644 include/tracker.h create mode 100644 include/tracker_private.h create mode 100644 packaging/libtracker.manifest create mode 100644 packaging/libtracker.spec create mode 100644 src/tracker.c create mode 100644 tracker.pc.in diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..9306ae6 --- /dev/null +++ b/.gitignore @@ -0,0 +1,3 @@ +cscope.files +cscope.out +tags diff --git a/CMakeLists.txt b/CMakeLists.txt new file mode 100644 index 0000000..88e32bb --- /dev/null +++ b/CMakeLists.txt @@ -0,0 +1,56 @@ +CMAKE_MINIMUM_REQUIRED(VERSION 2.6) +PROJECT(${LIBNAME} C) + +SET(PREFIX ${CMAKE_INSTALL_PREFIX}) +SET(LIBDIR ${LIB_INSTALL_DIR}) +SET(INCLUDEDIR "${PREFIX}/include/lib${LIBNAME}") +SET(PC_NAME ${LIBNAME}) +SET(PC_LDFLAGS ${LIBNAME}) + +SET(INC_DIR include) +INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/${INC_DIR}) + +SET(PKG_MODULES + capi-base-common + dlog + glib-2.0 +) + +SET(SRCS + src/tracker.c +) + +SET(HEADERS + ${INC_DIR}/tracker.h +) + +INCLUDE(FindPkgConfig) +pkg_check_modules(${LIBNAME} REQUIRED ${PKG_MODULES}) + +FOREACH(flag ${${LIBNAME}_CFLAGS}) + SET(EXTRA_CFLAGS "${EXTRA_CFLAGS} ${flag}") +ENDFOREACH(flag) + +SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${EXTRA_CFLAGS} -fPIC -Wall -Werror -fvisibility=hidden") +SET(CMAKE_C_FLAGS_DEBUG "-O0 -g") + +ADD_LIBRARY(${LIBNAME} SHARED ${SRCS}) +TARGET_LINK_LIBRARIES(${LIBNAME} ${${LIBNAME}_LDFLAGS} "-ldl") + +SET_TARGET_PROPERTIES(${LIBNAME} + PROPERTIES + VERSION ${FULLVER} + SOVERSION ${MAJORVER} + CLEAN_DIRECT_OUTPUT 1 +) + +INSTALL(TARGETS ${LIBNAME} DESTINATION ${LIB_INSTALL_DIR} COMPONENT RuntimeLibraries) + +CONFIGURE_FILE(${LIBNAME}.pc.in ${LIBNAME}.pc @ONLY) +INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/${LIBNAME}.pc DESTINATION ${LIB_INSTALL_DIR}/pkgconfig) + +INSTALL(DIRECTORY ${INC_DIR}/ DESTINATION include/lib${LIBNAME} + FILES_MATCHING + PATTERN "*_private.h" EXCLUDE + PATTERN "${INC_DIR}/*.h" +) diff --git a/LICENSE b/LICENSE new file mode 100644 index 0000000..261eeb9 --- /dev/null +++ b/LICENSE @@ -0,0 +1,201 @@ + 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/tracker.h b/include/tracker.h new file mode 100644 index 0000000..0154a39 --- /dev/null +++ b/include/tracker.h @@ -0,0 +1,66 @@ +/* + * libtracker + * Copyright (c) 2016 Samsung Electronics Co., Ltd All Rights Reserved + * + * 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 __LIBTRACKER_TRACKER_H__ +#define __LIBTRACKER_TRACKER_H__ + +#ifdef __cplusplus +extern "C" +{ +#endif + +/** + * @addtogroup LIBTRACKER_MODULE + * @{ + */ + +#include + +/** + * @brief Enumeration of error codes for libtracker + */ +typedef enum { + TRACKER_ERROR_NONE = TIZEN_ERROR_NONE, /**< Successful */ + TRACKER_ERROR_INVALID_PARAMETER = TIZEN_ERROR_INVALID_PARAMETER, /**< Invalid parameter */ + TRACKER_ERROR_OUT_OF_MEMORY = TIZEN_ERROR_OUT_OF_MEMORY, /**< Out of memory */ + TRACKER_ERROR_IO_ERROR = TIZEN_ERROR_IO_ERROR, /**< An input/output error occurred */ + TRACKER_ERROR_PERMISSION_DENIED = TIZEN_ERROR_PERMISSION_DENIED, /**< No permission to use the API */ + TRACKER_ERROR_NOT_SUPPORTED = TIZEN_ERROR_NOT_SUPPORTED, /**< The api is not supported */ +} tracker_error_e; + +/** + * @brief Gets the reference count of the Power Lock operation + * @since_tizen 3.0 + * @param[out] count The reference count of the Power Lock operation + * @return @c 0 on success, + * otherwise a negative error value + * @retval #TRACKER_ERROR_NONE Successful + * @retval #TRACKER_ERROR_INVALID_PARAMETER The input parameter is invalid + * @retval #TRACKER_ERROR_PERMISSION_DENIED No permission to use the API + */ +int tracker_get_power_lock_ref(int *count); + +/** + * @} + */ + +#ifdef __cplusplus +} +#endif + +#endif /* __LIBTRACKER_TRACKER_H__ */ diff --git a/include/tracker_private.h b/include/tracker_private.h new file mode 100644 index 0000000..1f11431 --- /dev/null +++ b/include/tracker_private.h @@ -0,0 +1,46 @@ +/* + * libtracker + * Copyright (c) 2016 Samsung Electronics Co., Ltd All Rights Reserved + * + * 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 __LIBTRACKER_TRACKER_PRIVATE_H__ +#define __LIBTRACKER_TRACKER_PRIVATE_H__ + +#include +#include +#include +#include + +#ifndef API +#define API __attribute__ ((visibility("default"))) +#endif + +#ifdef LOG_TAG +#undef LOG_TAG +#endif +#define LOG_TAG "LIBTRACKER" + +#define _E(fmt, arg...) LOGE(fmt, ##arg) +#define _D(fmt, arg...) LOGD(fmt, ##arg) +#define _I(fmt, arg...) LOGI(fmt, ##arg) + +#define _SE(fmt, arg...) SECURE_LOGE(fmt, ##arg) +#define _SD(fmt, arg...) SECURE_LOGD(fmt, ##arg) +#define _SI(fmt, arg...) SECURE_LOGI(fmt, ##arg) + +#define ARRAY_SIZE(name) (sizeof(name)/sizeof(name[0])) + +#endif /* __LIBTRACKER_TRACKER_PRIVATE_H__ */ diff --git a/packaging/libtracker.manifest b/packaging/libtracker.manifest new file mode 100644 index 0000000..97e8c31 --- /dev/null +++ b/packaging/libtracker.manifest @@ -0,0 +1,5 @@ + + + + + diff --git a/packaging/libtracker.spec b/packaging/libtracker.spec new file mode 100644 index 0000000..7b2bd1c --- /dev/null +++ b/packaging/libtracker.spec @@ -0,0 +1,63 @@ +%define libname tracker + +Name: lib%{libname} +Summary: tracker library for system information +Version: 1.0.1 +Release: 1 +Group: System/Libraries +License: Apache License, Version 2.0 +Source0: %{name}-%{version}.tar.gz +Source1001: %{name}.manifest +BuildRequires: cmake +BuildRequires: pkgconfig(capi-base-common) +BuildRequires: pkgconfig(dlog) +BuildRequires: pkgconfig(glib-2.0) + +Requires(post): /sbin/ldconfig +Requires(postun): /sbin/ldconfig + +%description +Tracker library for system information. + +%package devel +Summary: tracker library for system information (devel) +Group: Development/Libraries +Requires: %{name} = %{version}-%{release} + +%description devel +Tracker library for system information (devel) + +%prep +%setup -q +cp %{SOURCE1001} . + + +%build +MAJORVER=`echo %{version} | awk 'BEGIN {FS="."}{print $1}'` + +%cmake . \ + -DCMAKE_INSTALL_PREFIX=%{_prefix} \ + -DLIBNAME=%{libname} \ + -DMAJORVER=${MAJORVER} \ + -DFULLVER=%{version} + +make %{?jobs:-j%jobs} + +%install +%make_install + +%post -p /sbin/ldconfig + +%postun -p /sbin/ldconfig + + +%files +%license LICENSE +%manifest %{name}.manifest +%{_libdir}/%{name}.so.* + +%files devel +%manifest %{name}.manifest +%{_includedir}/%{name}/%{libname}.h +%{_libdir}/%{name}.so +%{_libdir}/pkgconfig/%{libname}.pc diff --git a/src/tracker.c b/src/tracker.c new file mode 100644 index 0000000..19cea74 --- /dev/null +++ b/src/tracker.c @@ -0,0 +1,28 @@ +/* + * libtracker + * Copyright (c) 2016 Samsung Electronics Co., Ltd All Rights Reserved + * + * 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 "tracker.h" +#include "tracker_private.h" + +static int power_lock_ref = 0; + +API int tracker_get_power_lock_ref(int *cnt) +{ + _I("Power Lock reference count: (%d)", power_lock_ref); + *cnt = power_lock_ref; + return TRACKER_ERROR_NONE; +} diff --git a/tracker.pc.in b/tracker.pc.in new file mode 100644 index 0000000..d41bc57 --- /dev/null +++ b/tracker.pc.in @@ -0,0 +1,12 @@ +# Package Information for pkg-config +prefix=@PREFIX@ +exec_prefix=@PREFIX@ +libdir=@LIB_INSTALL_DIR@ +includedir=@INCLUDEDIR@ + +Name: @PC_NAME@ +Description: Library to track system information +Version: @FULLVER@ +Requires: +Libs: -L${libdir} -l@PC_LDFLAGS@ +Cflags: -I${includedir} -- 2.7.4 From c1462e95b262d9f3f0739877271e7c07ef8d185d Mon Sep 17 00:00:00 2001 From: Taeyoung Kim Date: Wed, 20 Jan 2016 18:31:08 +0900 Subject: [PATCH 3/9] tracker: add start/stop tracking apis for internal usages - The apis will be used only in the framework layer of the Tizen Platform. Now they are used to handle power lock reference count. But it will be used for more information to handle resources of framework. - The reference count is increased when power is locked and the reference count is decreases when power is ulocked. There are several reference counts for each service because power can be locked several times by the usage of other apis. Change-Id: I38df55bcf0654647d7ecb34389a4db558dee6a9b Signed-off-by: Taeyoung Kim --- CMakeLists.txt | 2 + include/tracker.h | 35 ++++++++++++++ include/tracker_private.h | 27 +++++++++++ src/power_lock.c | 79 ++++++++++++++++++++++++++++++++ src/services.c | 114 ++++++++++++++++++++++++++++++++++++++++++++++ src/tracker.c | 55 ++++++++++++++++++++-- 6 files changed, 308 insertions(+), 4 deletions(-) create mode 100644 src/power_lock.c create mode 100644 src/services.c diff --git a/CMakeLists.txt b/CMakeLists.txt index 88e32bb..6053937 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -18,6 +18,8 @@ SET(PKG_MODULES SET(SRCS src/tracker.c + src/services.c + src/power_lock.c ) SET(HEADERS diff --git a/include/tracker.h b/include/tracker.h index 0154a39..87f1d61 100644 --- a/include/tracker.h +++ b/include/tracker.h @@ -43,6 +43,15 @@ typedef enum { TRACKER_ERROR_NOT_SUPPORTED = TIZEN_ERROR_NOT_SUPPORTED, /**< The api is not supported */ } tracker_error_e; +typedef enum { + TRACKER_SERVICE_DOWNLOAD = 1 << 0, /**< download services */ + TRACKER_SERVICE_MEDIA = 1 << 1, /**< media operations */ + TRACKER_SERVICE_NETWORK = 1 << 2, /**< network services */ + TRACKER_SERVICE_LOCATION = 1 << 3, /**< location services */ + TRACKER_SERVICE_SENSOR = 1 << 4, /**< sensor information */ + TRACKER_SERVICE_IOT = 1 << 5, /**< IoT services */ +} tracker_service_e; + /** * @brief Gets the reference count of the Power Lock operation * @since_tizen 3.0 @@ -56,6 +65,32 @@ typedef enum { int tracker_get_power_lock_ref(int *count); /** + * @brief Start tracking for information of services + * @details The api should be used only in the framework, not in applications + * @since_tizen 3.0 + * @param[in] services The services to use internally + * @return @c 0 on success, + * otherwise a negative error value + * @retval #TRACKER_ERROR_NONE Successful + * @retval #TRACKER_ERROR_INVALID_PARAMETER The input parameter is invalid + * @retval #TRACKER_ERROR_PERMISSION_DENIED No permission to use the API + */ +int tracker_start_services(int services); + +/** + * @brief Stop tracking for information of services + * @details The api should be used only in the framework, not in applications + * @since_tizen 3.0 + * @param[in] services The services not to use internally + * @return @c 0 on success, + * otherwise a negative error value + * @retval #TRACKER_ERROR_NONE Successful + * @retval #TRACKER_ERROR_INVALID_PARAMETER The input parameter is invalid + * @retval #TRACKER_ERROR_PERMISSION_DENIED No permission to use the API + */ +int tracker_stop_services(int services); + +/** * @} */ diff --git a/include/tracker_private.h b/include/tracker_private.h index 1f11431..a9dd764 100644 --- a/include/tracker_private.h +++ b/include/tracker_private.h @@ -24,6 +24,8 @@ #include #include +#include "tracker.h" + #ifndef API #define API __attribute__ ((visibility("default"))) #endif @@ -43,4 +45,29 @@ #define ARRAY_SIZE(name) (sizeof(name)/sizeof(name[0])) +int get_power_lock_ref(void); +void power_lock_ref(tracker_service_e service); +void power_lock_unref(tracker_service_e service); + +char *service_name_str(tracker_service_e svc, char *buf, size_t len); + +void start_service_download(void); +void stop_service_download(void); + +void start_service_media(void); +void stop_service_media(void); + +void start_service_network(void); +void stop_service_network(void); + +void start_service_location(void); +void stop_service_location(void); + +void start_service_sensor(void); +void stop_service_sensor(void); + +void start_service_iot(void); +void stop_service_iot(void); + + #endif /* __LIBTRACKER_TRACKER_PRIVATE_H__ */ diff --git a/src/power_lock.c b/src/power_lock.c new file mode 100644 index 0000000..e75963f --- /dev/null +++ b/src/power_lock.c @@ -0,0 +1,79 @@ +/* + * libtracker + * Copyright (c) 2016 Samsung Electronics Co., Ltd All Rights Reserved + * + * 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 "tracker.h" +#include "tracker_private.h" + +#define POWERLOCK_DEFAULT_REF 0 + +struct powerlock_ref { + tracker_service_e service; + unsigned int ref; +} lock_refs[] = { + { TRACKER_SERVICE_DOWNLOAD, POWERLOCK_DEFAULT_REF }, + { TRACKER_SERVICE_MEDIA, POWERLOCK_DEFAULT_REF }, + { TRACKER_SERVICE_NETWORK, POWERLOCK_DEFAULT_REF }, + { TRACKER_SERVICE_LOCATION, POWERLOCK_DEFAULT_REF }, + { TRACKER_SERVICE_SENSOR, POWERLOCK_DEFAULT_REF }, + { TRACKER_SERVICE_IOT, POWERLOCK_DEFAULT_REF }, +}; + +int get_power_lock_ref(void) +{ + int sum = 0, i; + + for (i = 0 ; i < ARRAY_SIZE(lock_refs) ; i++) + sum += lock_refs[i].ref; + + _I("Total reference count of pid(%d) is (%d)", + getpid(), sum); + + return sum; +} + +void power_lock_ref(tracker_service_e service) +{ + int i; + char buf[32]; + + for (i = 0 ; i < ARRAY_SIZE(lock_refs) ; i++) { + if (lock_refs[i].service != service) + continue; + lock_refs[i].ref++; + _I("[%s] pid(%d) increases power lock ref count to (%d)", + service_name_str(service, buf, sizeof(buf)), + getpid(), lock_refs[i].ref); + break; + } +} + +void power_lock_unref(tracker_service_e service) +{ + int i; + char buf[32]; + + for (i = 0 ; i < ARRAY_SIZE(lock_refs) ; i++) { + if (lock_refs[i].service != service) + continue; + if (lock_refs[i].ref > 0) + lock_refs[i].ref--; + _I("[%s] pid(%d) decreases power lock ref count to (%d)", + service_name_str(service, buf, sizeof(buf)), + getpid(), lock_refs[i].ref); + break; + } +} diff --git a/src/services.c b/src/services.c new file mode 100644 index 0000000..08b3ead --- /dev/null +++ b/src/services.c @@ -0,0 +1,114 @@ +/* + * libtracker + * Copyright (c) 2016 Samsung Electronics Co., Ltd All Rights Reserved + * + * 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 "tracker.h" +#include "tracker_private.h" + +char *service_name_str(tracker_service_e svc, char *buf, size_t len) +{ + char *str; + + if (!buf) + return NULL; + + switch (svc) { + case TRACKER_SERVICE_DOWNLOAD: + str = "DOWNLOAD"; + break; + case TRACKER_SERVICE_MEDIA: + str = "MEDIA"; + break; + case TRACKER_SERVICE_NETWORK: + str = "NETWORK"; + break; + case TRACKER_SERVICE_LOCATION: + str = "LOCATION"; + break; + case TRACKER_SERVICE_SENSOR: + str = "SENSOR"; + break; + case TRACKER_SERVICE_IOT: + str = "IoT"; + break; + default: + str = "unknown"; + break; + } + + snprintf(buf, len, "%s", str); + return str; +} + +void power_lock_ref_download(void) +{ + power_lock_ref(TRACKER_SERVICE_DOWNLOAD); +} + +void power_lock_unref_download(void) +{ + power_lock_unref(TRACKER_SERVICE_DOWNLOAD); +} + +void power_lock_ref_media(void) +{ + power_lock_ref(TRACKER_SERVICE_MEDIA); +} + +void power_lock_unref_media(void) +{ + power_lock_unref(TRACKER_SERVICE_MEDIA); +} + +void power_lock_ref_network(void) +{ + power_lock_ref(TRACKER_SERVICE_NETWORK); +} + +void power_lock_unref_network(void) +{ + power_lock_unref(TRACKER_SERVICE_NETWORK); +} + +void power_lock_ref_location(void) +{ + power_lock_ref(TRACKER_SERVICE_LOCATION); +} + +void power_lock_unref_location(void) +{ + power_lock_unref(TRACKER_SERVICE_LOCATION); +} + +void power_lock_ref_sensor(void) +{ + power_lock_ref(TRACKER_SERVICE_SENSOR); +} + +void power_lock_unref_sensor(void) +{ + power_lock_unref(TRACKER_SERVICE_SENSOR); +} + +void power_lock_ref_iot(void) +{ + power_lock_ref(TRACKER_SERVICE_IOT); +} + +void power_lock_unref_iot(void) +{ + power_lock_unref(TRACKER_SERVICE_IOT); +} diff --git a/src/tracker.c b/src/tracker.c index 19cea74..574a2f1 100644 --- a/src/tracker.c +++ b/src/tracker.c @@ -18,11 +18,58 @@ #include "tracker.h" #include "tracker_private.h" -static int power_lock_ref = 0; - API int tracker_get_power_lock_ref(int *cnt) { - _I("Power Lock reference count: (%d)", power_lock_ref); - *cnt = power_lock_ref; + int ref; + + ref = get_power_lock_ref(); + if (ref < 0) { + _E("Failed to get power lock reference count(%d)", ref); + return ref; + } + + *cnt = ref; + return TRACKER_ERROR_NONE; +} + +API int tracker_start_services(int services) +{ + if (services < 0) + return TRACKER_ERROR_INVALID_PARAMETER; + + if (services & TRACKER_SERVICE_DOWNLOAD) + start_service_download(); + if (services & TRACKER_SERVICE_MEDIA) + start_service_media(); + if (services & TRACKER_SERVICE_NETWORK) + start_service_network(); + if (services & TRACKER_SERVICE_LOCATION) + start_service_location(); + if (services & TRACKER_SERVICE_SENSOR) + start_service_sensor(); + if (services & TRACKER_SERVICE_IOT) + start_service_iot(); + + return TRACKER_ERROR_NONE; +} + +API int tracker_stop_services(int services) +{ + if (services < 0) + return TRACKER_ERROR_INVALID_PARAMETER; + + if (services & TRACKER_SERVICE_DOWNLOAD) + stop_service_download(); + if (services & TRACKER_SERVICE_MEDIA) + stop_service_media(); + if (services & TRACKER_SERVICE_NETWORK) + stop_service_network(); + if (services & TRACKER_SERVICE_LOCATION) + stop_service_location(); + if (services & TRACKER_SERVICE_SENSOR) + stop_service_sensor(); + if (services & TRACKER_SERVICE_IOT) + stop_service_iot(); + return TRACKER_ERROR_NONE; } -- 2.7.4 From f49c9f1869d4e39856f45c59e14038138a1d193c Mon Sep 17 00:00:00 2001 From: Taeyoung Kim Date: Thu, 21 Jan 2016 15:04:14 +0900 Subject: [PATCH 4/9] tracker: fix wrong function names - The function names for services are wrong. The name is just for power lock. But the real role of the functions for services is tracking informations of device and apps' situation. Thus the names are changed to common names Change-Id: I501759d153f823f10c63ee0e62bba70dc5902633 Signed-off-by: Taeyoung Kim --- src/services.c | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/src/services.c b/src/services.c index 08b3ead..e9daa62 100644 --- a/src/services.c +++ b/src/services.c @@ -53,62 +53,62 @@ char *service_name_str(tracker_service_e svc, char *buf, size_t len) return str; } -void power_lock_ref_download(void) +void start_service_download(void) { power_lock_ref(TRACKER_SERVICE_DOWNLOAD); } -void power_lock_unref_download(void) +void stop_service_download(void) { power_lock_unref(TRACKER_SERVICE_DOWNLOAD); } -void power_lock_ref_media(void) +void start_service_media(void) { power_lock_ref(TRACKER_SERVICE_MEDIA); } -void power_lock_unref_media(void) +void stop_service_media(void) { power_lock_unref(TRACKER_SERVICE_MEDIA); } -void power_lock_ref_network(void) +void start_service_network(void) { power_lock_ref(TRACKER_SERVICE_NETWORK); } -void power_lock_unref_network(void) +void stop_service_network(void) { power_lock_unref(TRACKER_SERVICE_NETWORK); } -void power_lock_ref_location(void) +void start_service_location(void) { power_lock_ref(TRACKER_SERVICE_LOCATION); } -void power_lock_unref_location(void) +void stop_service_location(void) { power_lock_unref(TRACKER_SERVICE_LOCATION); } -void power_lock_ref_sensor(void) +void start_service_sensor(void) { power_lock_ref(TRACKER_SERVICE_SENSOR); } -void power_lock_unref_sensor(void) +void stop_service_sensor(void) { power_lock_unref(TRACKER_SERVICE_SENSOR); } -void power_lock_ref_iot(void) +void start_service_iot(void) { power_lock_ref(TRACKER_SERVICE_IOT); } -void power_lock_unref_iot(void) +void stop_service_iot(void) { power_lock_unref(TRACKER_SERVICE_IOT); } -- 2.7.4 From 7e943e064db395d00d97dd2ccecfcfb330866b86 Mon Sep 17 00:00:00 2001 From: Taeyoung Kim Date: Fri, 5 Feb 2016 20:35:57 +0900 Subject: [PATCH 5/9] power lock: add total count of power lock - Add function to get total count of power lock - The function is used to avoid auto unlock problem Change-Id: Id357f31ec8ca8af549b3903f3b2ff55d4a7522c3 Signed-off-by: Taeyoung Kim --- include/tracker.h | 12 ++++++++++++ include/tracker_private.h | 1 + src/power_lock.c | 42 +++++++++++++++++++++++++++++++++--------- src/tracker.c | 14 ++++++++++++++ 4 files changed, 60 insertions(+), 9 deletions(-) diff --git a/include/tracker.h b/include/tracker.h index 87f1d61..e157657 100644 --- a/include/tracker.h +++ b/include/tracker.h @@ -65,6 +65,18 @@ typedef enum { int tracker_get_power_lock_ref(int *count); /** + * @brief Gets the total count of the Power Lock operation + * @since_tizen 3.0 + * @param[out] count The total count of the Power Lock operation + * @return @c 0 on success, + * otherwise a negative error value + * @retval #TRACKER_ERROR_NONE Successful + * @retval #TRACKER_ERROR_INVALID_PARAMETER The input parameter is invalid + * @retval #TRACKER_ERROR_PERMISSION_DENIED No permission to use the API + */ +int tracker_get_power_lock_total(int *count); + +/** * @brief Start tracking for information of services * @details The api should be used only in the framework, not in applications * @since_tizen 3.0 diff --git a/include/tracker_private.h b/include/tracker_private.h index a9dd764..3291e5c 100644 --- a/include/tracker_private.h +++ b/include/tracker_private.h @@ -46,6 +46,7 @@ #define ARRAY_SIZE(name) (sizeof(name)/sizeof(name[0])) int get_power_lock_ref(void); +int get_power_lock_total(void); void power_lock_ref(tracker_service_e service); void power_lock_unref(tracker_service_e service); diff --git a/src/power_lock.c b/src/power_lock.c index e75963f..643d94e 100644 --- a/src/power_lock.c +++ b/src/power_lock.c @@ -15,23 +15,28 @@ * limitations under the License. */ +#include #include "tracker.h" #include "tracker_private.h" -#define POWERLOCK_DEFAULT_REF 0 +#define POWERLOCK_DEFAULT_REF 0 +#define POWERLOCK_DEFAULT_COUNT 0 struct powerlock_ref { tracker_service_e service; unsigned int ref; + int total; } lock_refs[] = { - { TRACKER_SERVICE_DOWNLOAD, POWERLOCK_DEFAULT_REF }, - { TRACKER_SERVICE_MEDIA, POWERLOCK_DEFAULT_REF }, - { TRACKER_SERVICE_NETWORK, POWERLOCK_DEFAULT_REF }, - { TRACKER_SERVICE_LOCATION, POWERLOCK_DEFAULT_REF }, - { TRACKER_SERVICE_SENSOR, POWERLOCK_DEFAULT_REF }, - { TRACKER_SERVICE_IOT, POWERLOCK_DEFAULT_REF }, + { TRACKER_SERVICE_DOWNLOAD, POWERLOCK_DEFAULT_REF , POWERLOCK_DEFAULT_COUNT }, + { TRACKER_SERVICE_MEDIA, POWERLOCK_DEFAULT_REF , POWERLOCK_DEFAULT_COUNT }, + { TRACKER_SERVICE_NETWORK, POWERLOCK_DEFAULT_REF , POWERLOCK_DEFAULT_COUNT }, + { TRACKER_SERVICE_LOCATION, POWERLOCK_DEFAULT_REF , POWERLOCK_DEFAULT_COUNT }, + { TRACKER_SERVICE_SENSOR, POWERLOCK_DEFAULT_REF , POWERLOCK_DEFAULT_COUNT }, + { TRACKER_SERVICE_IOT, POWERLOCK_DEFAULT_REF , POWERLOCK_DEFAULT_COUNT }, }; +#define COUNT_MAX (INT_MAX/ARRAY_SIZE(lock_refs)) + int get_power_lock_ref(void) { int sum = 0, i; @@ -45,6 +50,19 @@ int get_power_lock_ref(void) return sum; } +int get_power_lock_total(void) +{ + int sum = 0, i; + + for (i = 0 ; i < ARRAY_SIZE(lock_refs) ; i++) + sum += lock_refs[i].total; + + _I("Total lock count of pid(%d) is (%d)", + getpid(), sum); + + return sum; +} + void power_lock_ref(tracker_service_e service) { int i; @@ -54,9 +72,15 @@ void power_lock_ref(tracker_service_e service) if (lock_refs[i].service != service) continue; lock_refs[i].ref++; - _I("[%s] pid(%d) increases power lock ref count to (%d)", + + if (lock_refs[i].total == COUNT_MAX) + lock_refs[i].total = POWERLOCK_DEFAULT_COUNT; + else + lock_refs[i].total++; + + _I("[%s] pid(%d) increases power lock ref count to (%d, %d)", service_name_str(service, buf, sizeof(buf)), - getpid(), lock_refs[i].ref); + getpid(), lock_refs[i].ref, lock_refs[i].total); break; } } diff --git a/src/tracker.c b/src/tracker.c index 574a2f1..c9b7bde 100644 --- a/src/tracker.c +++ b/src/tracker.c @@ -32,6 +32,20 @@ API int tracker_get_power_lock_ref(int *cnt) return TRACKER_ERROR_NONE; } +API int tracker_get_power_lock_total(int *cnt) +{ + int count; + + count = get_power_lock_total(); + if (count < 0) { + _E("Failed to get power lock total count(%d)", count); + return count; + } + + *cnt = count; + return TRACKER_ERROR_NONE; +} + API int tracker_start_services(int services) { if (services < 0) -- 2.7.4 From 1d227fb24ea6af2cc2be57e707def9d940e72f08 Mon Sep 17 00:00:00 2001 From: "pr.jung" Date: Thu, 18 Aug 2016 13:17:45 +0900 Subject: [PATCH 6/9] Modify License Change-Id: Ib3cef750c67d0ccb847789fa59125c054b939f1f Signed-off-by: pr.jung --- LICENSE | 2 ++ packaging/libtracker.spec | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/LICENSE b/LICENSE index 261eeb9..ac83dfc 100644 --- a/LICENSE +++ b/LICENSE @@ -1,3 +1,5 @@ +Copyright (c) 2016 Samsung Electronics Co., Ltd. All rights reserved. + Apache License Version 2.0, January 2004 http://www.apache.org/licenses/ diff --git a/packaging/libtracker.spec b/packaging/libtracker.spec index 7b2bd1c..151cdb0 100644 --- a/packaging/libtracker.spec +++ b/packaging/libtracker.spec @@ -5,7 +5,7 @@ Summary: tracker library for system information Version: 1.0.1 Release: 1 Group: System/Libraries -License: Apache License, Version 2.0 +License: Apache-2.0 Source0: %{name}-%{version}.tar.gz Source1001: %{name}.manifest BuildRequires: cmake -- 2.7.4 From c1f157fe7d1cc6835763533eb6ba87f51afcb869 Mon Sep 17 00:00:00 2001 From: Kichan Kwon Date: Mon, 24 Apr 2017 20:10:12 +0900 Subject: [PATCH 7/9] Libtracker refactoring for multi-tracker - Modify API - Rename get functions - Require tracker type : no more only power lock's - Modularization - Each constructor adds their own tracker - Iterate all trackers and run only for loaded trackers Change-Id: Ifdcc55d04643b2d6694222fec5afd128e37d78f5 Signed-off-by: Kichan Kwon --- include/tracker.h | 11 +++++-- include/tracker_private.h | 27 +++++++++++++-- src/power_lock.c | 54 ++++++++++++++++-------------- src/services.c | 84 ++++++++++++++++++++++++++++++++++++++++------- src/tracker.c | 18 +++++++--- 5 files changed, 150 insertions(+), 44 deletions(-) diff --git a/include/tracker.h b/include/tracker.h index e157657..ff0c41e 100644 --- a/include/tracker.h +++ b/include/tracker.h @@ -52,9 +52,15 @@ typedef enum { TRACKER_SERVICE_IOT = 1 << 5, /**< IoT services */ } tracker_service_e; +typedef enum { + TRACKER_TYPE_POWER_LOCK = 0, + TRACKER_TYPE_MAX +} tracker_type_e; + /** * @brief Gets the reference count of the Power Lock operation * @since_tizen 3.0 + * @param[in] type Tracker type * @param[out] count The reference count of the Power Lock operation * @return @c 0 on success, * otherwise a negative error value @@ -62,11 +68,12 @@ typedef enum { * @retval #TRACKER_ERROR_INVALID_PARAMETER The input parameter is invalid * @retval #TRACKER_ERROR_PERMISSION_DENIED No permission to use the API */ -int tracker_get_power_lock_ref(int *count); +int tracker_get_ref_counter(tracker_type_e type, int *count); /** * @brief Gets the total count of the Power Lock operation * @since_tizen 3.0 + * @param[in] type Tracker type * @param[out] count The total count of the Power Lock operation * @return @c 0 on success, * otherwise a negative error value @@ -74,7 +81,7 @@ int tracker_get_power_lock_ref(int *count); * @retval #TRACKER_ERROR_INVALID_PARAMETER The input parameter is invalid * @retval #TRACKER_ERROR_PERMISSION_DENIED No permission to use the API */ -int tracker_get_power_lock_total(int *count); +int tracker_get_tick(tracker_type_e type, int *count); /** * @brief Start tracking for information of services diff --git a/include/tracker_private.h b/include/tracker_private.h index 3291e5c..59ad674 100644 --- a/include/tracker_private.h +++ b/include/tracker_private.h @@ -45,8 +45,22 @@ #define ARRAY_SIZE(name) (sizeof(name)/sizeof(name[0])) -int get_power_lock_ref(void); -int get_power_lock_total(void); +struct ops { + tracker_type_e type; + void (*ref)(tracker_service_e); + void (*unref)(tracker_service_e); + int (*get_ref_counter)(void); + int (*get_tick)(void); +}; + +struct counter { + tracker_service_e service; + unsigned int ref_counter; + int tick; +}; + +int power_lock_get_ref_counter(void); +int power_lock_get_tick(void); void power_lock_ref(tracker_service_e service); void power_lock_unref(tracker_service_e service); @@ -70,5 +84,14 @@ void stop_service_sensor(void); void start_service_iot(void); void stop_service_iot(void); +/****************************************************************/ + +struct ops *trackers[TRACKER_TYPE_MAX]; + +#define REGISTER_TRACKER(name) \ + static void __attribute__ ((constructor)) add_tracker(void) \ + { \ + trackers[(name)->type] = name; \ + } #endif /* __LIBTRACKER_TRACKER_PRIVATE_H__ */ diff --git a/src/power_lock.c b/src/power_lock.c index 643d94e..ded7750 100644 --- a/src/power_lock.c +++ b/src/power_lock.c @@ -22,11 +22,7 @@ #define POWERLOCK_DEFAULT_REF 0 #define POWERLOCK_DEFAULT_COUNT 0 -struct powerlock_ref { - tracker_service_e service; - unsigned int ref; - int total; -} lock_refs[] = { +static struct counter lock_counters[] = { { TRACKER_SERVICE_DOWNLOAD, POWERLOCK_DEFAULT_REF , POWERLOCK_DEFAULT_COUNT }, { TRACKER_SERVICE_MEDIA, POWERLOCK_DEFAULT_REF , POWERLOCK_DEFAULT_COUNT }, { TRACKER_SERVICE_NETWORK, POWERLOCK_DEFAULT_REF , POWERLOCK_DEFAULT_COUNT }, @@ -35,14 +31,14 @@ struct powerlock_ref { { TRACKER_SERVICE_IOT, POWERLOCK_DEFAULT_REF , POWERLOCK_DEFAULT_COUNT }, }; -#define COUNT_MAX (INT_MAX/ARRAY_SIZE(lock_refs)) +#define COUNT_MAX (INT_MAX/ARRAY_SIZE(lock_counters)) -int get_power_lock_ref(void) +int power_lock_get_ref_counter(void) { int sum = 0, i; - for (i = 0 ; i < ARRAY_SIZE(lock_refs) ; i++) - sum += lock_refs[i].ref; + for (i = 0 ; i < ARRAY_SIZE(lock_counters) ; i++) + sum += lock_counters[i].ref_counter; _I("Total reference count of pid(%d) is (%d)", getpid(), sum); @@ -50,12 +46,12 @@ int get_power_lock_ref(void) return sum; } -int get_power_lock_total(void) +int power_lock_get_tick(void) { int sum = 0, i; - for (i = 0 ; i < ARRAY_SIZE(lock_refs) ; i++) - sum += lock_refs[i].total; + for (i = 0 ; i < ARRAY_SIZE(lock_counters) ; i++) + sum += lock_counters[i].tick; _I("Total lock count of pid(%d) is (%d)", getpid(), sum); @@ -68,19 +64,19 @@ void power_lock_ref(tracker_service_e service) int i; char buf[32]; - for (i = 0 ; i < ARRAY_SIZE(lock_refs) ; i++) { - if (lock_refs[i].service != service) + for (i = 0 ; i < ARRAY_SIZE(lock_counters) ; i++) { + if (lock_counters[i].service != service) continue; - lock_refs[i].ref++; + lock_counters[i].ref_counter++; - if (lock_refs[i].total == COUNT_MAX) - lock_refs[i].total = POWERLOCK_DEFAULT_COUNT; + if (lock_counters[i].tick == COUNT_MAX) + lock_counters[i].tick = POWERLOCK_DEFAULT_COUNT; else - lock_refs[i].total++; + lock_counters[i].tick++; _I("[%s] pid(%d) increases power lock ref count to (%d, %d)", service_name_str(service, buf, sizeof(buf)), - getpid(), lock_refs[i].ref, lock_refs[i].total); + getpid(), lock_counters[i].ref_counter, lock_counters[i].tick); break; } } @@ -90,14 +86,24 @@ void power_lock_unref(tracker_service_e service) int i; char buf[32]; - for (i = 0 ; i < ARRAY_SIZE(lock_refs) ; i++) { - if (lock_refs[i].service != service) + for (i = 0 ; i < ARRAY_SIZE(lock_counters) ; i++) { + if (lock_counters[i].service != service) continue; - if (lock_refs[i].ref > 0) - lock_refs[i].ref--; + if (lock_counters[i].ref_counter > 0) + lock_counters[i].ref_counter--; _I("[%s] pid(%d) decreases power lock ref count to (%d)", service_name_str(service, buf, sizeof(buf)), - getpid(), lock_refs[i].ref); + getpid(), lock_counters[i].ref_counter); break; } } + +static struct ops power_lock_ops = { + .type = TRACKER_TYPE_POWER_LOCK, + .ref = power_lock_ref, + .unref = power_lock_unref, + .get_ref_counter = power_lock_get_ref_counter, + .get_tick = power_lock_get_tick, +}; + +REGISTER_TRACKER(&power_lock_ops) diff --git a/src/services.c b/src/services.c index e9daa62..31c0a46 100644 --- a/src/services.c +++ b/src/services.c @@ -55,60 +55,120 @@ char *service_name_str(tracker_service_e svc, char *buf, size_t len) void start_service_download(void) { - power_lock_ref(TRACKER_SERVICE_DOWNLOAD); + int i; + for (i = 0; i < TRACKER_TYPE_MAX; i++) { + if (!trackers[i] || !trackers[i]->ref) + continue; + trackers[i]->ref(TRACKER_SERVICE_DOWNLOAD); + } } void stop_service_download(void) { - power_lock_unref(TRACKER_SERVICE_DOWNLOAD); + int i; + for (i = 0; i < TRACKER_TYPE_MAX; i++) { + if (!trackers[i] || !trackers[i]->unref) + continue; + trackers[i]->unref(TRACKER_SERVICE_DOWNLOAD); + } } void start_service_media(void) { - power_lock_ref(TRACKER_SERVICE_MEDIA); + int i; + for (i = 0; i < TRACKER_TYPE_MAX; i++) { + if (!trackers[i] || !trackers[i]->ref) + continue; + trackers[i]->ref(TRACKER_SERVICE_MEDIA); + } } void stop_service_media(void) { - power_lock_unref(TRACKER_SERVICE_MEDIA); + int i; + for (i = 0; i < TRACKER_TYPE_MAX; i++) { + if (!trackers[i] || !trackers[i]->unref) + continue; + trackers[i]->unref(TRACKER_SERVICE_MEDIA); + } } void start_service_network(void) { - power_lock_ref(TRACKER_SERVICE_NETWORK); + int i; + for (i = 0; i < TRACKER_TYPE_MAX; i++) { + if (!trackers[i] || !trackers[i]->ref) + continue; + trackers[i]->ref(TRACKER_SERVICE_NETWORK); + } } void stop_service_network(void) { - power_lock_unref(TRACKER_SERVICE_NETWORK); + int i; + for (i = 0; i < TRACKER_TYPE_MAX; i++) { + if (!trackers[i] || !trackers[i]->unref) + continue; + trackers[i]->unref(TRACKER_SERVICE_NETWORK); + } } void start_service_location(void) { - power_lock_ref(TRACKER_SERVICE_LOCATION); + int i; + for (i = 0; i < TRACKER_TYPE_MAX; i++) { + if (!trackers[i] || !trackers[i]->ref) + continue; + trackers[i]->ref(TRACKER_SERVICE_LOCATION); + } } void stop_service_location(void) { - power_lock_unref(TRACKER_SERVICE_LOCATION); + int i; + for (i = 0; i < TRACKER_TYPE_MAX; i++) { + if (!trackers[i] || !trackers[i]->unref) + continue; + trackers[i]->unref(TRACKER_SERVICE_LOCATION); + } } void start_service_sensor(void) { - power_lock_ref(TRACKER_SERVICE_SENSOR); + int i; + for (i = 0; i < TRACKER_TYPE_MAX; i++) { + if (!trackers[i] || !trackers[i]->ref) + continue; + trackers[i]->ref(TRACKER_SERVICE_SENSOR); + } } void stop_service_sensor(void) { - power_lock_unref(TRACKER_SERVICE_SENSOR); + int i; + for (i = 0; i < TRACKER_TYPE_MAX; i++) { + if (!trackers[i] || !trackers[i]->unref) + continue; + trackers[i]->unref(TRACKER_SERVICE_SENSOR); + } } void start_service_iot(void) { - power_lock_ref(TRACKER_SERVICE_IOT); + int i; + for (i = 0; i < TRACKER_TYPE_MAX; i++) { + if (!trackers[i] || !trackers[i]->ref) + continue; + trackers[i]->ref(TRACKER_SERVICE_IOT); + } } void stop_service_iot(void) { - power_lock_unref(TRACKER_SERVICE_IOT); + int i; + for (i = 0; i < TRACKER_TYPE_MAX; i++) { + if (!trackers[i] || !trackers[i]->unref) + continue; + trackers[i]->unref(TRACKER_SERVICE_IOT); + } } diff --git a/src/tracker.c b/src/tracker.c index c9b7bde..f972dd9 100644 --- a/src/tracker.c +++ b/src/tracker.c @@ -18,11 +18,16 @@ #include "tracker.h" #include "tracker_private.h" -API int tracker_get_power_lock_ref(int *cnt) +API int tracker_get_ref_counter(tracker_type_e type, int *cnt) { int ref; - ref = get_power_lock_ref(); + if (type < 0 || type >= TRACKER_TYPE_MAX || !trackers[type]) { + _E("Try to access not existed tracker %d", type); + return TRACKER_ERROR_INVALID_PARAMETER; + } + + ref = trackers[type]->get_ref_counter(); if (ref < 0) { _E("Failed to get power lock reference count(%d)", ref); return ref; @@ -32,11 +37,16 @@ API int tracker_get_power_lock_ref(int *cnt) return TRACKER_ERROR_NONE; } -API int tracker_get_power_lock_total(int *cnt) +API int tracker_get_tick(tracker_type_e type, int *cnt) { int count; - count = get_power_lock_total(); + if (type < 0 || type >= TRACKER_TYPE_MAX || !trackers[type]) { + _E("Try to access not existed tracker %d", type); + return TRACKER_ERROR_INVALID_PARAMETER; + } + + count = trackers[type]->get_tick(); if (count < 0) { _E("Failed to get power lock total count(%d)", count); return count; -- 2.7.4 From 271ea858652ab0e765543b7b31e34a499625b7a3 Mon Sep 17 00:00:00 2001 From: Slava Barinov Date: Thu, 25 May 2017 15:42:50 +0300 Subject: [PATCH 8/9] tracker: move variable definition from header to source This fixes Address Sanitizer build with -fno-common Change-Id: Ia19e7e3a6dc13d6c73b302810924405d7a890a27 Signed-off-by: Slava Barinov --- include/tracker_private.h | 2 +- src/tracker.c | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/include/tracker_private.h b/include/tracker_private.h index 59ad674..a8ab2f6 100644 --- a/include/tracker_private.h +++ b/include/tracker_private.h @@ -86,7 +86,7 @@ void stop_service_iot(void); /****************************************************************/ -struct ops *trackers[TRACKER_TYPE_MAX]; +extern struct ops *trackers[TRACKER_TYPE_MAX]; #define REGISTER_TRACKER(name) \ static void __attribute__ ((constructor)) add_tracker(void) \ diff --git a/src/tracker.c b/src/tracker.c index f972dd9..4b34711 100644 --- a/src/tracker.c +++ b/src/tracker.c @@ -18,6 +18,8 @@ #include "tracker.h" #include "tracker_private.h" +struct ops *trackers[TRACKER_TYPE_MAX]; + API int tracker_get_ref_counter(tracker_type_e type, int *cnt) { int ref; -- 2.7.4 From c882c3240e6a244a8e782ddf7ce9a1c8022f935d Mon Sep 17 00:00:00 2001 From: Kichan Kwon Date: Mon, 14 Aug 2017 11:59:25 +0900 Subject: [PATCH 9/9] Modify comment Change-Id: Idb8be7376d6b4cfa54e1e51add2d9ceca0ac26d7 Signed-off-by: Kichan Kwon --- include/tracker.h | 32 ++++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/include/tracker.h b/include/tracker.h index ff0c41e..a9e2519 100644 --- a/include/tracker.h +++ b/include/tracker.h @@ -25,14 +25,14 @@ extern "C" #endif /** - * @addtogroup LIBTRACKER_MODULE + * @addtogroup LIBTRACKER_MODULE * @{ */ #include /** - * @brief Enumeration of error codes for libtracker + * @brief Enumeration of error codes for libtracker */ typedef enum { TRACKER_ERROR_NONE = TIZEN_ERROR_NONE, /**< Successful */ @@ -58,10 +58,10 @@ typedef enum { } tracker_type_e; /** - * @brief Gets the reference count of the Power Lock operation - * @since_tizen 3.0 - * @param[in] type Tracker type - * @param[out] count The reference count of the Power Lock operation + * @brief Gets the reference count of @a type tracker + * @since_tizen 3.0 + * @param[in] type Tracker type + * @param[out] count The reference count of @a type tracker * @return @c 0 on success, * otherwise a negative error value * @retval #TRACKER_ERROR_NONE Successful @@ -71,10 +71,10 @@ typedef enum { int tracker_get_ref_counter(tracker_type_e type, int *count); /** - * @brief Gets the total count of the Power Lock operation - * @since_tizen 3.0 - * @param[in] type Tracker type - * @param[out] count The total count of the Power Lock operation + * @brief Gets the total count of @a type tracker + * @since_tizen 3.0 + * @param[in] type Tracker type + * @param[out] count The total count of @a type tracker * @return @c 0 on success, * otherwise a negative error value * @retval #TRACKER_ERROR_NONE Successful @@ -85,9 +85,9 @@ int tracker_get_tick(tracker_type_e type, int *count); /** * @brief Start tracking for information of services - * @details The api should be used only in the framework, not in applications - * @since_tizen 3.0 - * @param[in] services The services to use internally + * @details This API should be used only in the framework, not in applications + * @since_tizen 3.0 + * @param[in] services The services to use internally * @return @c 0 on success, * otherwise a negative error value * @retval #TRACKER_ERROR_NONE Successful @@ -98,9 +98,9 @@ int tracker_start_services(int services); /** * @brief Stop tracking for information of services - * @details The api should be used only in the framework, not in applications - * @since_tizen 3.0 - * @param[in] services The services not to use internally + * @details This API should be used only in the framework, not in applications + * @since_tizen 3.0 + * @param[in] services The services not to use internally * @return @c 0 on success, * otherwise a negative error value * @retval #TRACKER_ERROR_NONE Successful -- 2.7.4