From 13584c15d345712dfbddb20ae6440fdfb4cd883d Mon Sep 17 00:00:00 2001 From: SangYoun Kwak Date: Thu, 27 Apr 2023 14:13:39 +0900 Subject: [PATCH] plugin-api: Rename 'plugin' to 'syscommon-plugin' Since the plugin-api is the plugin feature which is only used in system scope and it is located in libsyscommon, plugin was changed to syscommon-plugin to indicate its usage and location. Change rule: * Basically, plugin becomes syscommon-plugin to indicate it is from the libsyscommon repository * Symbols which are used internally can omit the prefix 'syscommon'. Changed: * Package name: plugin-api... -> libsyscommon-plugin-api... * Package config file name: plugin-api-....pc -> libsyscommon-plugin-api....pc * .so name: libplugin-api-....so -> libsyscommon-plugin-api....so Change-Id: Ia56c935ebf97a93cad7efd0235508c540ee0348d Signed-off-by: SangYoun Kwak --- packaging/libsyscommon.spec | 124 +++++++++--------- src/plugin-api/common/CMakeLists.txt | 15 ++- ....h => syscommon-plugin-common-interface.h} | 28 ++-- ...gin-common.h => syscommon-plugin-common.h} | 57 +++++--- ...n => libsyscommon-plugin-api-common.pc.in} | 6 +- src/plugin-api/common/src/common.h | 12 +- ...common.c => syscommon-plugin-api-common.c} | 87 ++++++------ ...api-conf.c => syscommon-plugin-api-conf.c} | 25 ++-- ...api-conf.h => syscommon-plugin-api-conf.h} | 15 ++- ...api-list.h => syscommon-plugin-api-list.h} | 33 ++--- src/plugin-api/deviced/CMakeLists.txt | 28 ++-- ...common-plugin-deviced-display-interface.h} | 6 +- ...y.h => syscommon-plugin-deviced-display.h} | 6 +- ... => libsyscommon-plugin-api-deviced.pc.in} | 8 +- ...y.c => syscommon-plugin-deviced-display.c} | 0 src/plugin-api/resourced/CMakeLists.txt | 28 ++-- ...n-plugin-resourced-memory-lmk-interface.h} | 10 +- ...> syscommon-plugin-resourced-memory-lmk.h} | 13 +- ...> libsyscommon-plugin-api-resourced.pc.in} | 8 +- ...> syscommon-plugin-resourced-memory-lmk.c} | 27 ++-- 20 files changed, 282 insertions(+), 254 deletions(-) rename src/plugin-api/common/include/{plugin-common-interface.h => syscommon-plugin-common-interface.h} (66%) rename src/plugin-api/common/include/{plugin-common.h => syscommon-plugin-common.h} (76%) rename src/plugin-api/common/{plugin-api-common.pc.in => libsyscommon-plugin-api-common.pc.in} (64%) rename src/plugin-api/common/src/{plugin-api-common.c => syscommon-plugin-api-common.c} (81%) rename src/plugin-api/common/src/{plugin-api-conf.c => syscommon-plugin-api-conf.c} (86%) rename src/plugin-api/common/src/{plugin-api-conf.h => syscommon-plugin-api-conf.h} (78%) rename src/plugin-api/common/src/{plugin-api-list.h => syscommon-plugin-api-list.h} (56%) rename src/plugin-api/deviced/include/{plugin-deviced-display-interface.h => syscommon-plugin-deviced-display-interface.h} (87%) rename src/plugin-api/deviced/include/{plugin-deviced-display.h => syscommon-plugin-deviced-display.h} (89%) rename src/plugin-api/deviced/{plugin-api-deviced.pc.in => libsyscommon-plugin-api-deviced.pc.in} (56%) rename src/plugin-api/deviced/src/{plugin-deviced-display.c => syscommon-plugin-deviced-display.c} (100%) rename src/plugin-api/resourced/include/{plugin-resourced-memory-lmk-interface.h => syscommon-plugin-resourced-memory-lmk-interface.h} (81%) rename src/plugin-api/resourced/include/{plugin-resourced-memory-lmk.h => syscommon-plugin-resourced-memory-lmk.h} (88%) rename src/plugin-api/resourced/{plugin-api-resourced.pc.in => libsyscommon-plugin-api-resourced.pc.in} (55%) rename src/plugin-api/resourced/src/{plugin-resourced-memory-lmk.c => syscommon-plugin-resourced-memory-lmk.c} (74%) diff --git a/packaging/libsyscommon.spec b/packaging/libsyscommon.spec index a7c8cb5..0ce2272 100644 --- a/packaging/libsyscommon.spec +++ b/packaging/libsyscommon.spec @@ -1,7 +1,7 @@ %define libsyscommon_version 5.0.0 -%define plugin_api_common_version 0.1.0 -%define plugin_api_resourced_version 0.1.0 -%define plugin_api_deviced_version 0.1.0 +%define libsyscommon_plugin_api_common_version 0.1.0 +%define libsyscommon_plugin_api_resourced_version 0.1.0 +%define libsyscommon_plugin_api_deviced_version 0.1.0 Name: libsyscommon Summary: System Libraries @@ -41,59 +41,59 @@ Requires: pkgconfig(capi-system-info) %description -n libsyscommon-devel Development header files for system common library. -# Packages for plugin-api -%package -n plugin-api-common -Summary: Common plugin APIs -Version: %{plugin_api_common_version} +# Packages for system plugin api +%package -n libsyscommon-plugin-api-common +Summary: Common system plugin APIs +Version: %{libsyscommon_plugin_api_common_version} License: MIT Requires: pkgconfig(gio-2.0) Requires: pkgconfig(dlog) -%package -n plugin-api-common-devel -Summary: Header files for common plugin APIs -Version: %{plugin_api_common_version} +%package -n libsyscommon-plugin-api-common-devel +Summary: Header files for common system plugin APIs +Version: %{libsyscommon_plugin_api_common_version} License: MIT Requires: pkgconfig(gio-2.0) Requires: pkgconfig(dlog) -%description -n plugin-api-common-devel -Development header files for common plugin APIs. +%description -n libsyscommon-plugin-api-common-devel +Development header files for common system plugin APIs. -%package -n plugin-api-resourced -Summary: Plugin APIs for the resourced -Version: %{plugin_api_resourced_version} +%package -n libsyscommon-plugin-api-resourced +Summary: System plugin APIs for the resourced +Version: %{libsyscommon_plugin_api_resourced_version} License: MIT Requires: pkgconfig(gio-2.0) Requires: pkgconfig(dlog) -%description -n plugin-api-resourced -Plugin APIs for the resourced. +%description -n libsyscommon-plugin-api-resourced +System plugin APIs for the resourced. -%package -n plugin-api-resourced-devel -Summary: Header files for plugin APIs for the resourced -Version: %{plugin_api_resourced_version} +%package -n libsyscommon-plugin-api-resourced-devel +Summary: Header files for system plugin APIs for the resourced +Version: %{libsyscommon_plugin_api_resourced_version} License: MIT Requires: pkgconfig(gio-2.0) Requires: pkgconfig(dlog) -%description -n plugin-api-resourced-devel -Development header files for plugin APIs for the resourced. +%description -n libsyscommon-plugin-api-resourced-devel +Development header files for system plugin APIs for the resourced. -%package -n plugin-api-deviced -Summary: Plugin APIs for the deviced -Version: %{plugin_api_deviced_version} +%package -n libsyscommon-plugin-api-deviced +Summary: System plugin APIs for the deviced +Version: %{libsyscommon_plugin_api_deviced_version} License: MIT -%description -n plugin-api-deviced -Plugin APIs for the deviced. +%description -n libsyscommon-plugin-api-deviced +System plugin APIs for the deviced. -%package -n plugin-api-deviced-devel -Summary: Header files for plugin APIs for the deviced -Version: %{plugin_api_deviced_version} +%package -n libsyscommon-plugin-api-deviced-devel +Summary: Header files for system plugin APIs for the deviced +Version: %{libsyscommon_plugin_api_deviced_version} License: MIT -%description -n plugin-api-deviced-devel -Development header files for plugin APIs for the deviced. +%description -n libsyscommon-plugin-api-deviced-devel +Development header files for system plugin APIs for the deviced. ###### @@ -104,15 +104,15 @@ Development header files for plugin APIs for the deviced. cp %{SOURCE1001} . %build -PLUGIN_API_COMMON_MAJORVER=$(echo %{plugin_api_common_version} | cut -d'.' -f1) -PLUGIN_API_RESOURCED_MAJORVER=$(echo %{plugin_api_resourced_version} | cut -d'.' -f1) -PLUGIN_API_DEVICED_MAJORVER=$(echo %{plugin_api_deviced_version} | cut -d'.' -f1) +PLUGIN_API_COMMON_MAJORVER=$(echo %{libsyscommon_plugin_api_common_version} | cut -d'.' -f1) +PLUGIN_API_RESOURCED_MAJORVER=$(echo %{libsyscommon_plugin_api_resourced_version} | cut -d'.' -f1) +PLUGIN_API_DEVICED_MAJORVER=$(echo %{libsyscommon_plugin_api_deviced_version} | cut -d'.' -f1) %cmake . -DFULLVER=%{libsyscommon_version} \ - -DPLUGIN_API_COMMON_VERSION=%{plugin_api_common_version} \ + -DPLUGIN_API_COMMON_VERSION=%{libsyscommon_plugin_api_common_version} \ -DPLUGIN_API_COMMON_MAJORVER=${PLUGIN_API_COMMON_MAJORVER} \ - -DPLUGIN_API_RESOURCED_VERSION=%{plugin_api_resourced_version} \ + -DPLUGIN_API_RESOURCED_VERSION=%{libsyscommon_plugin_api_resourced_version} \ -DPLUGIN_API_RESOURCED_MAJORVER=${PLUGIN_API_RESOURCED_MAJORVER} \ - -DPLUGIN_API_DEVICED_VERSION=%{plugin_api_deviced_version} \ + -DPLUGIN_API_DEVICED_VERSION=%{libsyscommon_plugin_api_deviced_version} \ -DPLUGIN_API_DEVICED_MAJORVER=${PLUGIN_API_DEVICED_MAJORVER} \ -DPLUGIN_API_COMMON_ENABLE_DLOG=1 \ -DPLUGIN_API_RESOURCED_ENABLE_DLOG=1 \ @@ -145,53 +145,53 @@ touch debugsources.list %{_includedir}/libsyscommon/*.h %{_libdir}/pkgconfig/libsyscommon.pc -%description -n plugin-api-common -Common plugin APIs to load another APIs from backend. +%description -n libsyscommon-plugin-api-common +Common system plugin APIs to load another APIs from backend. -%files -n plugin-api-common +%files -n libsyscommon-plugin-api-common %defattr(-,root,root,-) %license LICENSE.MIT -%{_libdir}/libplugin-api-common.so.* +%{_libdir}/libsyscommon-plugin-api-common.so.* -%post -n plugin-api-common +%post -n libsyscommon-plugin-api-common pushd %{_libdir} -chsmack -a "_" libplugin-api-common.so.%{plugin_api_common_version} +chsmack -a "_" libsyscommon-plugin-api-common.so.%{libsyscommon_plugin_api_common_version} popd /sbin/ldconfig -%files -n plugin-api-common-devel +%files -n libsyscommon-plugin-api-common-devel %defattr(-,root,root,-) %license LICENSE.MIT -%{_includedir}/plugin/plugin-common*.h -%{_libdir}/pkgconfig/plugin-api-common.pc -%{_libdir}/libplugin-api-common.so +%{_includedir}/system/syscommon-plugin-common*.h +%{_libdir}/pkgconfig/libsyscommon-plugin-api-common.pc +%{_libdir}/libsyscommon-plugin-api-common.so -%files -n plugin-api-resourced +%files -n libsyscommon-plugin-api-resourced %defattr(-,root,root,-) %license LICENSE.MIT -%{_libdir}/libplugin-api-resourced.so.* +%{_libdir}/libsyscommon-plugin-api-resourced.so.* -%post -n plugin-api-resourced +%post -n libsyscommon-plugin-api-resourced pushd %{_libdir} -chsmack -a "_" libplugin-api-resourced.so.%{plugin_api_resourced_version} +chsmack -a "_" libsyscommon-plugin-api-resourced.so.%{libsyscommon_plugin_api_resourced_version} popd /sbin/ldconfig -%files -n plugin-api-resourced-devel +%files -n libsyscommon-plugin-api-resourced-devel %defattr(-,root,root,-) %license LICENSE.MIT -%{_includedir}/plugin/plugin-resourced*.h -%{_libdir}/pkgconfig/plugin-api-resourced.pc -%{_libdir}/libplugin-api-resourced.so +%{_includedir}/system/syscommon-plugin-resourced*.h +%{_libdir}/pkgconfig/libsyscommon-plugin-api-resourced.pc +%{_libdir}/libsyscommon-plugin-api-resourced.so -%files -n plugin-api-deviced +%files -n libsyscommon-plugin-api-deviced %defattr(-,root,root,-) %license LICENSE.MIT -%{_libdir}/libplugin-api-deviced.so.* +%{_libdir}/libsyscommon-plugin-api-deviced.so.* -%files -n plugin-api-deviced-devel +%files -n libsyscommon-plugin-api-deviced-devel %defattr(-,root,root,-) %license LICENSE.MIT -%{_includedir}/plugin/plugin-deviced*.h -%{_libdir}/pkgconfig/plugin-api-deviced.pc -%{_libdir}/libplugin-api-deviced.so +%{_includedir}/system/syscommon-plugin-deviced*.h +%{_libdir}/pkgconfig/libsyscommon-plugin-api-deviced.pc +%{_libdir}/libsyscommon-plugin-api-deviced.so diff --git a/src/plugin-api/common/CMakeLists.txt b/src/plugin-api/common/CMakeLists.txt index 8f0e0fe..666d51f 100644 --- a/src/plugin-api/common/CMakeLists.txt +++ b/src/plugin-api/common/CMakeLists.txt @@ -1,17 +1,17 @@ CMAKE_MINIMUM_REQUIRED(VERSION 2.6) -PROJECT(plugin-api-common) +PROJECT(syscommon-plugin-api-common) SET(PREFIX ${CMAKE_INSTALL_PREFIX}) SET(EXEC_PREFIX "${PREFIX}/bin") SET(LIBDIR ${LIB_INSTALL_DIR}) -SET(INCLUDEDIR "${PREFIX}/include/plugin") +SET(INCLUDEDIR "${PREFIX}/include/system") SET(VERSION ${PLUGIN_API_COMMON_VERSION}) INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/include) if (${PLUGIN_API_COMMON_ENABLE_DLOG}) ADD_DEFINITIONS("-DENABLE_DLOG=1") - ADD_DEFINITIONS("-DLOG_TAG=\"PLUGIN_API_COMMON\"") + ADD_DEFINITIONS("-DLOG_TAG=\"SYSTEM_PLUGIN_API_COMMON\"") SET(PKG_MODULES dlog gio-2.0 @@ -37,8 +37,8 @@ SET(CMAKE_EXE_LINKER_FLAGS "-pie") SET(CMAKE_C_FLAGS_DEBUG "-O0 -g") SET(SRCS - src/plugin-api-common.c - src/plugin-api-conf.c) + src/syscommon-plugin-api-common.c + src/syscommon-plugin-api-conf.c) ADD_LIBRARY(${PROJECT_NAME} SHARED ${SRCS}) TARGET_LINK_LIBRARIES(${PROJECT_NAME} ${${PROJECT_NAME}_LDFLAGS} @@ -58,5 +58,6 @@ ENDFOREACH(include_dirs) FOREACH(libraries ${${PROJECT_NAME}_LIBRARIES}) SET(PLUGIN_COMMON_LIBS "${PLUGIN_COMMON_LIBS} -l${libraries}") ENDFOREACH(libraries) -CONFIGURE_FILE(${PROJECT_NAME}.pc.in ${PROJECT_NAME}.pc @ONLY) -INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}.pc DESTINATION ${LIB_INSTALL_DIR}/pkgconfig) +SET(PACKAGE_CONFIG_FILE "lib${PROJECT_NAME}.pc") +CONFIGURE_FILE(${PACKAGE_CONFIG_FILE}.in ${PACKAGE_CONFIG_FILE} @ONLY) +INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/${PACKAGE_CONFIG_FILE} DESTINATION ${LIB_INSTALL_DIR}/pkgconfig) diff --git a/src/plugin-api/common/include/plugin-common-interface.h b/src/plugin-api/common/include/syscommon-plugin-common-interface.h similarity index 66% rename from src/plugin-api/common/include/plugin-common-interface.h rename to src/plugin-api/common/include/syscommon-plugin-common-interface.h index 37f201a..1cda550 100644 --- a/src/plugin-api/common/include/plugin-common-interface.h +++ b/src/plugin-api/common/include/syscommon-plugin-common-interface.h @@ -22,35 +22,35 @@ * THE SOFTWARE. */ -#ifndef __PLUGIN_COMMON_INTERFACE__ -#define __PLUGIN_COMMON_INTERFACE__ +#ifndef __SYSCOMMON_PLUGIN_COMMON_INTERFACE__ +#define __SYSCOMMON_PLUGIN_COMMON_INTERFACE__ #ifdef __cplusplus extern "C" { #endif -enum plugin_abi_version { - PLUGIN_ABI_VERSION_UNKNOWN = 0, - PLUGIN_ABI_VERSION_TIZEN_7_0, - PLUGIN_ABI_VERSION_TIZEN_7_5, - PLUGIN_ABI_VERSION_END, +enum syscommon_plugin_abi_version { + SYSCOMMON_PLUGIN_ABI_VERSION_UNKNOWN = 0, + SYSCOMMON_PLUGIN_ABI_VERSION_TIZEN_7_0, + SYSCOMMON_PLUGIN_ABI_VERSION_TIZEN_7_5, + SYSCOMMON_PLUGIN_ABI_VERSION_END, }; -static const char *const plugin_abi_version_str[] = { - [PLUGIN_ABI_VERSION_UNKNOWN] = "Unknown PLUGIN ABI Version", - [PLUGIN_ABI_VERSION_TIZEN_7_0] = "PLUGIN_ABI_VERSION_TIZEN_7_0", - [PLUGIN_ABI_VERSION_TIZEN_7_5] = "PLUGIN_ABI_VERSION_TIZEN_7_5", +static const char *const syscommon_plugin_abi_version_str[] = { + [SYSCOMMON_PLUGIN_ABI_VERSION_UNKNOWN] = "Unknown PLUGIN ABI Version", + [SYSCOMMON_PLUGIN_ABI_VERSION_TIZEN_7_0] = "PLUGIN_ABI_VERSION_TIZEN_7_0", + [SYSCOMMON_PLUGIN_ABI_VERSION_TIZEN_7_5] = "PLUGIN_ABI_VERSION_TIZEN_7_5", }; -typedef struct __plugin_backend { +typedef struct __syscommon_plugin_backend { const char *name; const char *vendor; const unsigned int abi_version; int (*init) (void **data); int (*exit) (void *data); -} plugin_backend; +} syscommon_plugin_backend; #ifdef __cplusplus } #endif -#endif /* __PLUGIN_COMMON_INTERFACE__ */ +#endif /* __SYSCOMMON_PLUGIN_COMMON_INTERFACE__ */ diff --git a/src/plugin-api/common/include/plugin-common.h b/src/plugin-api/common/include/syscommon-plugin-common.h similarity index 76% rename from src/plugin-api/common/include/plugin-common.h rename to src/plugin-api/common/include/syscommon-plugin-common.h index d7856bc..d530c0a 100644 --- a/src/plugin-api/common/include/plugin-common.h +++ b/src/plugin-api/common/include/syscommon-plugin-common.h @@ -22,19 +22,19 @@ * THE SOFTWARE. */ -#ifndef __PLUGIN_COMMON__ -#define __PLUGIN_COMMON__ +#ifndef __SYSCOMMON_PLUGIN_COMMON__ +#define __SYSCOMMON_PLUGIN_COMMON__ -#include "plugin-common-interface.h" +#include "syscommon-plugin-common-interface.h" #ifdef __cplusplus extern "C" { #endif -enum plugin_module { - PLUGIN_MODULE_UNKNOWN = 0, - PLUGIN_MODULE_RESOURCED_MEMORY_LMK, - PLUGIN_MODULE_END, +enum syscommon_plugin_module { + SYSCOMMON_PLUGIN_MODULE_UNKNOWN = 0, + SYSCOMMON_PLUGIN_MODULE_RESOURCED_MEMORY_LMK, + SYSCOMMON_PLUGIN_MODULE_END, }; /** @@ -44,7 +44,9 @@ enum plugin_module { * @param[in] Arrary size of name[] * @return @c 0 on success, otherwise a negative error value */ -int plugin_common_get_backend_library_name(enum plugin_module module, char *name, int size); +int syscommon_plugin_common_get_backend_library_name( + enum syscommon_plugin_module module, + char *name, int size); /** * @brief Get the backend symbol name according to the type of PLUGIN module @@ -53,7 +55,8 @@ int plugin_common_get_backend_library_name(enum plugin_module module, char *name * @param[in] Arrary size of name[] * @return @c 0 on success, otherwise a negative error value */ -int plugin_common_get_backend_symbol_name(enum plugin_module module, char *name, int size); +int syscommon_plugin_common_get_backend_symbol_name( + enum syscommon_plugin_module module, char *name, int size); /** * @brief Get the backend data according to the type of PLUGIN module @@ -62,7 +65,8 @@ int plugin_common_get_backend_symbol_name(enum plugin_module module, char *name, * should be stored from PLUGIN backend binary. * @return @c 0 on success, otherwise a negative error value */ -int plugin_common_get_backend(enum plugin_module module, void **data); +int syscommon_plugin_common_get_backend(enum syscommon_plugin_module module, + void **data); /** * @brief Put the backend data according to the type of PLUGIN module @@ -70,7 +74,8 @@ int plugin_common_get_backend(enum plugin_module module, void **data); * @param[in] Data pointer where 'plugin_backend_[module]_funcs' instance * @return @c 0 on success, otherwise a negative error value */ -int plugin_common_put_backend(enum plugin_module module, void *data); +int syscommon_plugin_common_put_backend(enum syscommon_plugin_module module, + void *data); /** * @brief Get the backend data with the specific library name according to the type of PLUGIN module @@ -80,7 +85,8 @@ int plugin_common_put_backend(enum plugin_module module, void *data); * @param[in] PLUGIN backend library name which is not default library name * @return @c 0 on success, otherwise a negative error value */ -int plugin_common_get_backend_with_library_name(enum plugin_module module, +int syscommon_plugin_common_get_backend_with_library_name( + enum syscommon_plugin_module module, void **data, const char *library_name); /** @@ -90,7 +96,8 @@ int plugin_common_get_backend_with_library_name(enum plugin_module module, * @param[in] PLUGIN backend library name which is not default library name * @return @c 0 on success, otherwise a negative error value */ -int plugin_common_put_backend_with_library_name(enum plugin_module module, +int syscommon_plugin_common_put_backend_with_library_name( + enum syscommon_plugin_module module, void *data, const char *library_name); /** @@ -99,15 +106,17 @@ int plugin_common_put_backend_with_library_name(enum plugin_module module, * @param[in] PLUGIN ABI version of backend module among enum plugin_abi_version * @return @c 0 on success, otherwise a negative error value */ -int plugin_common_check_backend_abi_version(enum plugin_module module, - enum plugin_abi_version abi_version); +int syscommon_plugin_common_check_backend_abi_version( + enum syscommon_plugin_module module, + enum syscommon_plugin_abi_version abi_version); /** * @brief Get the backend PLUGIN ABI version according to the type of PLUGIN module * @param[in] PLUGIN module id among enum plugin_moudle * @return @c positive integer value on success, otherwise a zero error value */ -unsigned int plugin_common_get_backend_abi_version(enum plugin_module module); +unsigned int syscommon_plugin_common_get_backend_abi_version( + enum syscommon_plugin_module module); /** * @brief Get the backend name according to the type of PLUGIN module @@ -116,7 +125,9 @@ unsigned int plugin_common_get_backend_abi_version(enum plugin_module module); * @param[in] Arrary size of name[] * @return @c positive integer value on success, otherwise a zero error value */ -int plugin_common_get_backend_name(enum plugin_module module, char *name, int size); +int syscommon_plugin_common_get_backend_name( + enum syscommon_plugin_module module, + char *name, int size); /** * @brief Get the backend vendor description according to the type of PLUGIN module @@ -125,14 +136,17 @@ int plugin_common_get_backend_name(enum plugin_module module, char *name, int si * @param[in] Arrary size of vendor[] * @return @c positive integer value on success, otherwise a zero error value */ -int plugin_common_get_backend_vendor(enum plugin_module module, char *vendor, int size); +int syscommon_plugin_common_get_backend_vendor( + enum syscommon_plugin_module module, + char *vendor, int size); /** * @brief Get the number of the backend libraries according to the type of PLUGIN module * @param[in] PLUGIN module id among enum plugin_moudle * @return @c 0 on success, otherwise a negative error value */ -int plugin_common_get_backend_count(enum plugin_module module); +int syscommon_plugin_common_get_backend_count( + enum syscommon_plugin_module module); /** * @brief Get the backend library names according to the type of PLUGIN module @@ -142,7 +156,8 @@ int plugin_common_get_backend_count(enum plugin_module module); * @param[in] Maximum length of the library name * @return @c 0 on success, otherwise a negative error value */ -int plugin_common_get_backend_library_names(enum plugin_module module, +int syscommon_plugin_common_get_backend_library_names( + enum syscommon_plugin_module module, char **library_names, int library_count, int library_name_size); @@ -150,4 +165,4 @@ int plugin_common_get_backend_library_names(enum plugin_module module, #ifdef __cplusplus } #endif -#endif /* __PLUGIN_COMMON__ */ +#endif /* __SYSCOMMON_PLUGIN_COMMON__ */ diff --git a/src/plugin-api/common/plugin-api-common.pc.in b/src/plugin-api/common/libsyscommon-plugin-api-common.pc.in similarity index 64% rename from src/plugin-api/common/plugin-api-common.pc.in rename to src/plugin-api/common/libsyscommon-plugin-api-common.pc.in index 4738a7f..4271f1b 100644 --- a/src/plugin-api/common/plugin-api-common.pc.in +++ b/src/plugin-api/common/libsyscommon-plugin-api-common.pc.in @@ -9,8 +9,8 @@ exec_prefix=@EXEC_PREFIX@ libdir=@LIBDIR@ includedir=@INCLUDEDIR@ -Name: plugin-api-common -Description: Common plugin APIs +Name: libsyscommon-plugin-api-common +Description: Common system plugin APIs Version: @VERSION@ Cflags: -I${includedir} @PLUGIN_COMMON_INCLUDEDIR@ -Libs: -L${libdir} -lplugin-api-common @PLUGIN_COMMON_LIBS@ +Libs: -L${libdir} -lsyscommon-plugin-api-common @PLUGIN_COMMON_LIBS@ diff --git a/src/plugin-api/common/src/common.h b/src/plugin-api/common/src/common.h index 33e4560..a89fe09 100644 --- a/src/plugin-api/common/src/common.h +++ b/src/plugin-api/common/src/common.h @@ -27,7 +27,7 @@ #include -#include "plugin-common.h" +#include "syscommon-plugin-common.h" #ifdef __cplusplus extern "C" { @@ -71,7 +71,7 @@ static const char *const plugin_group_string[] = { }; /** - * plugin-api-common provides the PLUGIN ABI * (Application Binary Interface) + * syscommon-plugin-api-common provides the PLUGIN ABI * (Application Binary Interface) * version check feature which is used to check the ABI compatibility between * PLUGIN API package and PLUGIN backend package. * In order to compare ABI version between two binary, Tizen core platform @@ -86,15 +86,15 @@ static const char *const plugin_group_string[] = { * released officially. */ struct plugin_abi_version_match { - enum plugin_abi_version platform_abi_version; - enum plugin_abi_version backend_min_abi_version; + enum syscommon_plugin_abi_version platform_abi_version; + enum syscommon_plugin_abi_version backend_min_abi_version; }; struct __plugin_module_info { int usage_count; enum plugin_group group; - enum plugin_module module; + enum syscommon_plugin_module module; enum plugin_license license; char *module_name; char *backend_module_name; @@ -102,7 +102,7 @@ struct __plugin_module_info { char *library_name; char *library_name_64bit; void *handle; - plugin_backend *backend; + syscommon_plugin_backend *backend; char *symbol_name; unsigned int num_abi_versions; diff --git a/src/plugin-api/common/src/plugin-api-common.c b/src/plugin-api/common/src/syscommon-plugin-api-common.c similarity index 81% rename from src/plugin-api/common/src/plugin-api-common.c rename to src/plugin-api/common/src/syscommon-plugin-api-common.c index 0f5dcc6..b6fb3db 100644 --- a/src/plugin-api/common/src/plugin-api-common.c +++ b/src/plugin-api/common/src/syscommon-plugin-api-common.c @@ -36,7 +36,7 @@ #include #include "common.h" -#include "plugin-api-conf.h" +#include "syscommon-plugin-api-conf.h" extern char *program_invocation_name; @@ -44,11 +44,11 @@ extern char *program_invocation_name; #define EXPORT __attribute__ ((visibility("default"))) #endif -static enum plugin_abi_version g_platform_curr_abi_version; +static enum syscommon_plugin_abi_version g_platform_curr_abi_version; G_LOCK_DEFINE_STATIC(plugin_common_lock); EXPORT -int plugin_common_get_backend_library_name(enum plugin_module module, char *name, int size) +int syscommon_plugin_common_get_backend_library_name(enum syscommon_plugin_module module, char *name, int size) { const char *library_name = NULL; struct __plugin_module_info *info = NULL; @@ -56,7 +56,7 @@ int plugin_common_get_backend_library_name(enum plugin_module module, char *name int len_library_name; /* Check parameter whether is valid or not */ - if (module <= PLUGIN_MODULE_UNKNOWN || module >= PLUGIN_MODULE_END) { + if (module <= SYSCOMMON_PLUGIN_MODULE_UNKNOWN || module >= SYSCOMMON_PLUGIN_MODULE_END) { _E("Invalid parameter of PLUGIN module (%d)\n", module); return -EINVAL; } @@ -94,7 +94,7 @@ out: } EXPORT -int plugin_common_get_backend_symbol_name(enum plugin_module module, char *name, int size) +int syscommon_plugin_common_get_backend_symbol_name(enum syscommon_plugin_module module, char *name, int size) { struct __plugin_module_info *info = NULL; char *symbol_name = NULL; @@ -102,7 +102,7 @@ int plugin_common_get_backend_symbol_name(enum plugin_module module, char *name, int len_symbol_name; /* Check parameter whether is valid or not */ - if (module <= PLUGIN_MODULE_UNKNOWN || module >= PLUGIN_MODULE_END) { + if (module <= SYSCOMMON_PLUGIN_MODULE_UNKNOWN || module >= SYSCOMMON_PLUGIN_MODULE_END) { _E("Invalid paramer of PLUGIN module (%d)\n", module); return -EINVAL; } @@ -233,7 +233,7 @@ static int __init_backend(struct __plugin_module_info *info, void **data, } /* Check PLUGIN ABI Version */ - ret = plugin_common_check_backend_abi_version(info->module, + ret = syscommon_plugin_common_check_backend_abi_version(info->module, info->backend->abi_version); if (ret < 0) { _E("%s: Failed to check ABI version\n", info->module_name); @@ -276,13 +276,13 @@ static int __exit_backend(struct __plugin_module_info *info, void *data, return 0; } -static int __get_backend(enum plugin_module module, void **data, +static int __get_backend(enum syscommon_plugin_module module, void **data, const char *library_name) { struct __plugin_module_info *info = NULL; int ret; - if (module <= PLUGIN_MODULE_UNKNOWN || module >= PLUGIN_MODULE_END) { + if (module <= SYSCOMMON_PLUGIN_MODULE_UNKNOWN || module >= SYSCOMMON_PLUGIN_MODULE_END) { _E("Invalid parameter of PLUGIN module (%d)\n", module); return -EINVAL; } @@ -334,14 +334,14 @@ err: return ret; } -static int __put_backend(enum plugin_module module, void *data, +static int __put_backend(enum syscommon_plugin_module module, void *data, const char *library_name) { struct __plugin_module_info *info = NULL; int ret; /* Check parameter whether is valid or not */ - if (module <= PLUGIN_MODULE_UNKNOWN || module >= PLUGIN_MODULE_END) { + if (module <= SYSCOMMON_PLUGIN_MODULE_UNKNOWN || module >= SYSCOMMON_PLUGIN_MODULE_END) { _E("Invalid parameter of PLUGIN module (%d)\n", module); return -EINVAL; } @@ -397,13 +397,13 @@ out: return ret; } -static int __get_backend_data(enum plugin_module module, unsigned int *abi_version, +static int __get_backend_data(enum syscommon_plugin_module module, unsigned int *abi_version, char *name, int name_size, char *vendor, int vendor_size) { struct __plugin_module_info *info = NULL; int ret, len; - if (module <= PLUGIN_MODULE_UNKNOWN || module >= PLUGIN_MODULE_END) { + if (module <= SYSCOMMON_PLUGIN_MODULE_UNKNOWN || module >= SYSCOMMON_PLUGIN_MODULE_END) { _E("Invalid parameter of PLUGIN module (%d)\n", module); return 0; } @@ -411,14 +411,14 @@ static int __get_backend_data(enum plugin_module module, unsigned int *abi_versi G_LOCK(plugin_common_lock); if (_plugin_api_conf_init()) { - ret = PLUGIN_ABI_VERSION_UNKNOWN; + ret = SYSCOMMON_PLUGIN_ABI_VERSION_UNKNOWN; goto err_unlock; } info = _plugin_api_conf_get_module_info(module, NULL); if (info == NULL) { _E("Failed to get PLUGIN module(%d) information\n", module); - ret = PLUGIN_ABI_VERSION_UNKNOWN; + ret = SYSCOMMON_PLUGIN_ABI_VERSION_UNKNOWN; goto err_conf_exit; } @@ -468,47 +468,47 @@ err_unlock: } EXPORT -int plugin_common_get_backend(enum plugin_module module, void **data) +int syscommon_plugin_common_get_backend(enum syscommon_plugin_module module, void **data) { return __get_backend(module, data, NULL); } EXPORT -int plugin_common_put_backend(enum plugin_module module, void *data) +int syscommon_plugin_common_put_backend(enum syscommon_plugin_module module, void *data) { return __put_backend(module, data, NULL); } EXPORT -int plugin_common_get_backend_with_library_name(enum plugin_module module, +int syscommon_plugin_common_get_backend_with_library_name(enum syscommon_plugin_module module, void **data, const char *library_name) { return __get_backend(module, data, library_name); } EXPORT -int plugin_common_put_backend_with_library_name(enum plugin_module module, +int syscommon_plugin_common_put_backend_with_library_name(enum syscommon_plugin_module module, void *data, const char *library_name) { return __put_backend(module, data, library_name); } EXPORT -int plugin_common_check_backend_abi_version(enum plugin_module module, - enum plugin_abi_version abi_version) +int syscommon_plugin_common_check_backend_abi_version(enum syscommon_plugin_module module, + enum syscommon_plugin_abi_version abi_version) { struct __plugin_module_info *info = NULL; int i; int ret; /* Check parameter whether is valid or not */ - if (module <= PLUGIN_MODULE_UNKNOWN || module >= PLUGIN_MODULE_END) { + if (module <= SYSCOMMON_PLUGIN_MODULE_UNKNOWN || module >= SYSCOMMON_PLUGIN_MODULE_END) { _E("Invalid paramer of PLUGIN module(%d)\n", module); return -EINVAL; } - if (abi_version <= PLUGIN_ABI_VERSION_UNKNOWN - || abi_version >= PLUGIN_ABI_VERSION_END) { + if (abi_version <= SYSCOMMON_PLUGIN_ABI_VERSION_UNKNOWN + || abi_version >= SYSCOMMON_PLUGIN_ABI_VERSION_END) { _E("Invalid paramer of PLUGIN ABI version(%d) for PLUGIN module(%d)\n", abi_version, module); return -EINVAL; @@ -534,8 +534,8 @@ int plugin_common_check_backend_abi_version(enum plugin_module module, g_platform_curr_abi_version = _plugin_api_conf_get_platform_abi_version(); - if (g_platform_curr_abi_version <= PLUGIN_ABI_VERSION_UNKNOWN - || g_platform_curr_abi_version >= PLUGIN_ABI_VERSION_END) { + if (g_platform_curr_abi_version <= SYSCOMMON_PLUGIN_ABI_VERSION_UNKNOWN + || g_platform_curr_abi_version >= SYSCOMMON_PLUGIN_ABI_VERSION_END) { _E("Invalid paramer of current PLUGIN ABI version(%d)(%d)\n", g_platform_curr_abi_version, module); ret = -EINVAL; @@ -549,8 +549,8 @@ int plugin_common_check_backend_abi_version(enum plugin_module module, if (g_platform_curr_abi_version != data->platform_abi_version) continue; - if (data->backend_min_abi_version <= PLUGIN_ABI_VERSION_UNKNOWN || - data->backend_min_abi_version >= PLUGIN_ABI_VERSION_END) { + if (data->backend_min_abi_version <= SYSCOMMON_PLUGIN_ABI_VERSION_UNKNOWN || + data->backend_min_abi_version >= SYSCOMMON_PLUGIN_ABI_VERSION_END) { _E("%s: abi_versions[%d].backend_min_abi_version(%d) is invalid\n", info->module_name, i, data->backend_min_abi_version); ret = -EINVAL; @@ -565,12 +565,12 @@ int plugin_common_check_backend_abi_version(enum plugin_module module, _E("%s: \'%s\' doesn't support \'%s\'\n", info->module_name, - plugin_abi_version_str[g_platform_curr_abi_version], - plugin_abi_version_str[abi_version]); + syscommon_plugin_abi_version_str[g_platform_curr_abi_version], + syscommon_plugin_abi_version_str[abi_version]); _E("%s: Must use ABI versions from \'%s\' to \'%s\'\n", info->module_name, - plugin_abi_version_str[data->backend_min_abi_version], - plugin_abi_version_str[data->platform_abi_version]); + syscommon_plugin_abi_version_str[data->backend_min_abi_version], + syscommon_plugin_abi_version_str[data->platform_abi_version]); } ret = -EINVAL; @@ -580,32 +580,32 @@ out: } EXPORT -unsigned int plugin_common_get_backend_abi_version(enum plugin_module module) +unsigned int syscommon_plugin_common_get_backend_abi_version(enum syscommon_plugin_module module) { unsigned int abi_version; int ret; ret = __get_backend_data(module, &abi_version, NULL, 0, NULL, 0); if (ret < 0) - return PLUGIN_ABI_VERSION_UNKNOWN; + return SYSCOMMON_PLUGIN_ABI_VERSION_UNKNOWN; return abi_version; } EXPORT -int plugin_common_get_backend_name(enum plugin_module module, char *name, int size) +int syscommon_plugin_common_get_backend_name(enum syscommon_plugin_module module, char *name, int size) { return __get_backend_data(module, NULL, name, size, NULL, 0); } EXPORT -int plugin_common_get_backend_vendor(enum plugin_module module, char *vendor, int size) +int syscommon_plugin_common_get_backend_vendor(enum syscommon_plugin_module module, char *vendor, int size) { return __get_backend_data(module, NULL, NULL, 0, vendor, size); } -static int __get_backend_library_data(enum plugin_module module, +static int __get_backend_library_data(enum syscommon_plugin_module module, char **lib_names, int lib_count, int lib_name_size) @@ -616,16 +616,16 @@ static int __get_backend_library_data(enum plugin_module module, char *backend_module_name = NULL; int count, i, ret; #if defined(__aarch64__) || defined(__x86_64__) - const char plugin_backend_path[] = "/usr/lib64/plugin"; + const char plugin_backend_path[] = "/usr/lib64/system/plugin"; #else - const char plugin_backend_path[] = "/usr/lib/plugin"; + const char plugin_backend_path[] = "/usr/lib/system/plugin"; #endif /* Check if lib_names and lib_count are valid */ assert(!(lib_names == NULL && lib_count != 0)); /* Check parameter whether is valid or not */ - if (module <= PLUGIN_MODULE_UNKNOWN || module >= PLUGIN_MODULE_END) { + if (module <= SYSCOMMON_PLUGIN_MODULE_UNKNOWN || module >= SYSCOMMON_PLUGIN_MODULE_END) { _E("Invalid parameter of PLUGIN module (%d)\n", module); return -EINVAL; } @@ -646,7 +646,7 @@ static int __get_backend_library_data(enum plugin_module module, ret = -EINVAL; goto err; } - backend_module_name = g_strdup_printf("libplugin-backend-%s", + backend_module_name = g_strdup_printf("libplugin-%s", info->backend_module_name); if (!backend_module_name) { _E("Failed to allocate the backend_module_name of PLUGIN module(%s)\n", @@ -707,13 +707,14 @@ err: } EXPORT -int plugin_common_get_backend_count(enum plugin_module module) +int syscommon_plugin_common_get_backend_count(enum syscommon_plugin_module module) { return __get_backend_library_data(module, NULL, 0, 0); } EXPORT -int plugin_common_get_backend_library_names(enum plugin_module module, +int syscommon_plugin_common_get_backend_library_names( + enum syscommon_plugin_module module, char **library_names, int library_count, int library_name_size) diff --git a/src/plugin-api/common/src/plugin-api-conf.c b/src/plugin-api/common/src/syscommon-plugin-api-conf.c similarity index 86% rename from src/plugin-api/common/src/plugin-api-conf.c rename to src/plugin-api/common/src/syscommon-plugin-api-conf.c index bb560a2..19daa1a 100644 --- a/src/plugin-api/common/src/plugin-api-conf.c +++ b/src/plugin-api/common/src/syscommon-plugin-api-conf.c @@ -27,12 +27,12 @@ #include #include -#include "plugin-common.h" -#include "plugin-common-interface.h" +#include "syscommon-plugin-common.h" +#include "syscommon-plugin-common-interface.h" #include "common.h" -#include "plugin-api-conf.h" -#include "plugin-api-list.h" +#include "syscommon-plugin-api-conf.h" +#include "syscommon-plugin-api-list.h" #ifndef EXPORT #define EXPORT __attribute__ ((visibility("default"))) @@ -57,13 +57,14 @@ void _destroy_module_info(gpointer data) } } -static struct __plugin_module_info* _get_module_info(enum plugin_module module) +static struct __plugin_module_info* _get_module_info(enum syscommon_plugin_module module) { return &g_plugin_module_info[module]; } -static struct __plugin_module_info* _get_module_info_with_library_name(enum plugin_module module, - const char *library_name) +static struct __plugin_module_info* _get_module_info_with_library_name( + enum syscommon_plugin_module module, + const char *library_name) { struct __plugin_module_info *info = NULL, *new_info = NULL, *tmp_info = NULL; char *library_name_prefix = NULL; @@ -82,7 +83,7 @@ static struct __plugin_module_info* _get_module_info_with_library_name(enum plug tmp_info->module_name); return NULL; } - library_name_prefix = g_strdup_printf("libplugin-backend-%s", + library_name_prefix = g_strdup_printf("libplugin-%s", tmp_info->backend_module_name); if (!library_name_prefix) { _E("Failed to allocate library_name_prefix of PLUGIN module(%s)\n", @@ -120,9 +121,9 @@ static struct __plugin_module_info* _get_module_info_with_library_name(enum plug new_info->license = info->license; new_info->module_name = g_strdup(info->module_name); #if defined(__aarch64__) || defined(__x86_64__) - new_info->library_name_64bit = g_strdup_printf("/usr/lib64/plugin/%s", library_name); + new_info->library_name_64bit = g_strdup_printf("/usr/lib64/system/plugin/%s", library_name); #else - new_info->library_name = g_strdup_printf("/usr/lib/plugin/%s", library_name); + new_info->library_name = g_strdup_printf("/usr/lib/system/plugin/%s", library_name); #endif new_info->symbol_name = g_strdup(info->symbol_name); new_info->num_abi_versions = info->num_abi_versions; @@ -137,7 +138,7 @@ out: } EXPORT -struct __plugin_module_info* _plugin_api_conf_get_module_info(enum plugin_module module, +struct __plugin_module_info* _plugin_api_conf_get_module_info(enum syscommon_plugin_module module, const char *library_name) { if (!_module_hash) @@ -150,7 +151,7 @@ struct __plugin_module_info* _plugin_api_conf_get_module_info(enum plugin_module } -enum plugin_abi_version _plugin_api_conf_get_platform_abi_version(void) +enum syscommon_plugin_abi_version _plugin_api_conf_get_platform_abi_version(void) { return g_platform_curr_abi_version; } diff --git a/src/plugin-api/common/src/plugin-api-conf.h b/src/plugin-api/common/src/syscommon-plugin-api-conf.h similarity index 78% rename from src/plugin-api/common/src/plugin-api-conf.h rename to src/plugin-api/common/src/syscommon-plugin-api-conf.h index 2d59713..20e8b32 100644 --- a/src/plugin-api/common/src/plugin-api-conf.h +++ b/src/plugin-api/common/src/syscommon-plugin-api-conf.h @@ -22,13 +22,13 @@ * THE SOFTWARE. */ -#ifndef __PLUGIN_API_CONF__ -#define __PLUGIN_API_CONF__ +#ifndef __SYSCOMMON_PLUGIN_API_CONF__ +#define __SYSCOMMON_PLUGIN_API_CONF__ #include #include -#include "plugin-common-interface.h" +#include "syscommon-plugin-common-interface.h" #ifdef __cplusplus extern "C" { @@ -37,12 +37,13 @@ extern "C" { int _plugin_api_conf_init(void); void _plugin_api_conf_exit(void); -struct __plugin_module_info *_plugin_api_conf_get_module_info(enum plugin_module module, - const char *library_name); +struct __plugin_module_info *_plugin_api_conf_get_module_info( + enum syscommon_plugin_module module, + const char *library_name); -enum plugin_abi_version _plugin_api_conf_get_platform_abi_version(void); +enum syscommon_plugin_abi_version _plugin_api_conf_get_platform_abi_version(void); #ifdef __cplusplus } #endif /* __cplusplus */ -#endif /* __PLUGIN_API_CONF__ */ +#endif /* __SYSCOMMON_PLUGIN_API_CONF__ */ diff --git a/src/plugin-api/common/src/plugin-api-list.h b/src/plugin-api/common/src/syscommon-plugin-api-list.h similarity index 56% rename from src/plugin-api/common/src/plugin-api-list.h rename to src/plugin-api/common/src/syscommon-plugin-api-list.h index 79439fb..e7b0ee6 100644 --- a/src/plugin-api/common/src/plugin-api-list.h +++ b/src/plugin-api/common/src/syscommon-plugin-api-list.h @@ -22,38 +22,39 @@ * THE SOFTWARE. */ -#ifndef __PLUGIN_API_LIST_H__ -#define __PLUGIN_API_LIST_H__ +#ifndef __SYSCOMMON_PLUGIN_API_LIST_H__ +#define __SYSCOMMON_PLUGIN_API_LIST_H__ -#include "plugin-common.h" +#include "syscommon-plugin-common.h" #include "common.h" #define PLUGIN_ABI_VERSION_MAX 10 -enum plugin_abi_version g_platform_curr_abi_version = PLUGIN_ABI_VERSION_TIZEN_7_5; +enum syscommon_plugin_abi_version g_platform_curr_abi_version = + SYSCOMMON_PLUGIN_ABI_VERSION_TIZEN_7_5; -static struct plugin_abi_version_match abi_version_match_data[PLUGIN_MODULE_END][PLUGIN_ABI_VERSION_MAX] = { - [PLUGIN_MODULE_RESOURCED_MEMORY_LMK] = { +static struct plugin_abi_version_match abi_version_match_data[SYSCOMMON_PLUGIN_MODULE_END][PLUGIN_ABI_VERSION_MAX] = { + [SYSCOMMON_PLUGIN_MODULE_RESOURCED_MEMORY_LMK] = { [0] = { - .platform_abi_version = PLUGIN_ABI_VERSION_TIZEN_7_5, - .backend_min_abi_version = PLUGIN_ABI_VERSION_TIZEN_7_5, + .platform_abi_version = SYSCOMMON_PLUGIN_ABI_VERSION_TIZEN_7_5, + .backend_min_abi_version = SYSCOMMON_PLUGIN_ABI_VERSION_TIZEN_7_5, }, }, }; static struct __plugin_module_info g_plugin_module_info[] = { - [PLUGIN_MODULE_RESOURCED_MEMORY_LMK] = { + [SYSCOMMON_PLUGIN_MODULE_RESOURCED_MEMORY_LMK] = { .group = PLUGIN_GROUP_RESOURCED, - .module = PLUGIN_MODULE_RESOURCED_MEMORY_LMK, + .module = SYSCOMMON_PLUGIN_MODULE_RESOURCED_MEMORY_LMK, .license = PLUGIN_LICENSE_APACHE_2_0, - .module_name = "PLUGIN_MODULE_RESOURCED_MEMORY_LMK", + .module_name = "SYSCOMMON_PLUGIN_MODULE_RESOURCED_MEMORY_LMK", .backend_module_name = "resourced-memory-lmk", - .library_name = "/usr/lib/plugin/libplugin-backend-resourced-memory-lmk.so", - .library_name_64bit = "/usr/lib64/plugin/libplugin-backend-resourced-memory-lmk.so", - .symbol_name = "plugin_backend_resourced_memory_lmk_data", - .num_abi_versions = ARRAY_SIZE(abi_version_match_data[PLUGIN_MODULE_RESOURCED_MEMORY_LMK]), - .abi_versions = abi_version_match_data[PLUGIN_MODULE_RESOURCED_MEMORY_LMK], + .library_name = "/usr/lib/system/plugin/libplugin-resourced-memory-lmk.so", + .library_name_64bit = "/usr/lib64/system/plugin/libplugin-resourced-memory-lmk.so", + .symbol_name = "system_plugin_backend_resourced_memory_lmk_data", + .num_abi_versions = ARRAY_SIZE(abi_version_match_data[SYSCOMMON_PLUGIN_MODULE_RESOURCED_MEMORY_LMK]), + .abi_versions = abi_version_match_data[SYSCOMMON_PLUGIN_MODULE_RESOURCED_MEMORY_LMK], }, }; diff --git a/src/plugin-api/deviced/CMakeLists.txt b/src/plugin-api/deviced/CMakeLists.txt index 89ed42d..78af80a 100644 --- a/src/plugin-api/deviced/CMakeLists.txt +++ b/src/plugin-api/deviced/CMakeLists.txt @@ -1,15 +1,15 @@ CMAKE_MINIMUM_REQUIRED(VERSION 2.6) -PROJECT(plugin-api-deviced) +PROJECT(syscommon-plugin-api-deviced) SET(PREFIX ${CMAKE_INSTALL_PREFIX}) SET(EXEC_PREFIX "${PREFIX}/bin") SET(LIBDIR ${LIB_INSTALL_DIR}) -SET(INCLUDEDIR "${PREFIX}/include/plugin") +SET(INCLUDEDIR "${PREFIX}/include/system") SET(VERSION ${PLUGIN_API_DEVICED_VERSION}) INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/include) -# Including below should be removed if the repository of plugin-api-common is -# separated. +# Including below should be removed if the repository of +# syscommon-plugin-api-common is separated. INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/../common/include) if (${PLUGIN_API_DEVICED_ENABLE_DLOG}) @@ -17,7 +17,7 @@ if (${PLUGIN_API_DEVICED_ENABLE_DLOG}) glib-2.0 dlog) ADD_DEFINITIONS("-DENABLE_DLOG") - ADD_DEFINITIONS("-DLOG_TAG=\"PLUGIN_API_DEVICED\"") + ADD_DEFINITIONS("-DLOG_TAG=\"SYSTEM_PLUGIN_API_DEVICED\"") else() SET(PKG_MODULES glib-2.0) @@ -35,12 +35,13 @@ SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${EXTRA_CFLAGS} -Wall -lrt") SET(CMAKE_EXE_LINKER_FLAGS "-Wl,--as-needed -Wl") SET(CMAKE_C_FLAGS_DEBUG "-O0 -g") -# plugin-api-common.c and plugin-api-conf.c are unnecessary if the repository of -# plugin-api-common is separated. -# Please remove them from SRCS and add 'plugin-api-common' to PKG_MODULES. -SET(SRCS src/plugin-deviced-display.c - ../common/src/plugin-api-common.c - ../common/src/plugin-api-conf.c) +# syscommon-plugin-api-common.c and syscommon-plugin-api-conf.c are unnecessary +# if the repository of syscommon-plugin-api-common is separated. +# Please remove them from SRCS and add 'syscommon-plugin-api-common' +# to PKG_MODULES. +SET(SRCS src/syscommon-plugin-deviced-display.c + ../common/src/syscommon-plugin-api-common.c + ../common/src/syscommon-plugin-api-conf.c) ADD_LIBRARY(${PROJECT_NAME} SHARED ${SRCS}) TARGET_LINK_LIBRARIES(${PROJECT_NAME} ${pkgs_LDFLAGS} @@ -62,5 +63,6 @@ ENDFOREACH(include_dirs) FOREACH(libraries ${pkgs_LIBRARIES}) SET(PLUGIN_DEVICED_LIBS "${PLUGIN_DEVICED_LIBS} -l${libraries}") ENDFOREACH(libraries) -CONFIGURE_FILE(${PROJECT_NAME}.pc.in ${PROJECT_NAME}.pc @ONLY) -INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}.pc DESTINATION ${LIB_INSTALL_DIR}/pkgconfig) +SET(PACKAGE_CONFIG_FILE "lib${PROJECT_NAME}.pc") +CONFIGURE_FILE(${PACKAGE_CONFIG_FILE}.in ${PACKAGE_CONFIG_FILE} @ONLY) +INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/${PACKAGE_CONFIG_FILE} DESTINATION ${LIB_INSTALL_DIR}/pkgconfig) diff --git a/src/plugin-api/deviced/include/plugin-deviced-display-interface.h b/src/plugin-api/deviced/include/syscommon-plugin-deviced-display-interface.h similarity index 87% rename from src/plugin-api/deviced/include/plugin-deviced-display-interface.h rename to src/plugin-api/deviced/include/syscommon-plugin-deviced-display-interface.h index 2a0c909..6b094a3 100644 --- a/src/plugin-api/deviced/include/plugin-deviced-display-interface.h +++ b/src/plugin-api/deviced/include/syscommon-plugin-deviced-display-interface.h @@ -22,8 +22,8 @@ * THE SOFTWARE. */ -#ifndef __PLUGIN_DEVICED_DISPLAY_INTERFACE_H__ -#define __PLUGIN_DEVICED_DISPLAY_INTERFACE_H__ +#ifndef __SYSCOMMON_PLUGIN_DEVICED_DISPLAY_INTERFACE_H__ +#define __SYSCOMMON_PLUGIN_DEVICED_DISPLAY_INTERFACE_H__ #ifdef __cplusplus extern "C" { @@ -33,4 +33,4 @@ extern "C" { } #endif -#endif //__PLUGIN_DEVICED_DISPLAY_INTERFACE_H__ +#endif //__SYSCOMMON_PLUGIN_DEVICED_DISPLAY_INTERFACE_H__ diff --git a/src/plugin-api/deviced/include/plugin-deviced-display.h b/src/plugin-api/deviced/include/syscommon-plugin-deviced-display.h similarity index 89% rename from src/plugin-api/deviced/include/plugin-deviced-display.h rename to src/plugin-api/deviced/include/syscommon-plugin-deviced-display.h index 14e5c6c..c0267c3 100644 --- a/src/plugin-api/deviced/include/plugin-deviced-display.h +++ b/src/plugin-api/deviced/include/syscommon-plugin-deviced-display.h @@ -22,8 +22,8 @@ * THE SOFTWARE. */ -#ifndef __PLUGIN_DEVICED_DISPLAY_H__ -#define __PLUGIN_DEVICED_DISPLAY_H__ +#ifndef __SYSCOMMON_PLUGIN_DEVICED_DISPLAY_H__ +#define __SYSCOMMON_PLUGIN_DEVICED_DISPLAY_H__ #ifdef __cplusplus extern "C" { @@ -33,4 +33,4 @@ extern "C" { } #endif -#endif //__PLUGIN_DEVICED_DISPLAY_H__ +#endif //__SYSCOMMON_PLUGIN_DEVICED_DISPLAY_H__ diff --git a/src/plugin-api/deviced/plugin-api-deviced.pc.in b/src/plugin-api/deviced/libsyscommon-plugin-api-deviced.pc.in similarity index 56% rename from src/plugin-api/deviced/plugin-api-deviced.pc.in rename to src/plugin-api/deviced/libsyscommon-plugin-api-deviced.pc.in index a328de4..100d572 100644 --- a/src/plugin-api/deviced/plugin-api-deviced.pc.in +++ b/src/plugin-api/deviced/libsyscommon-plugin-api-deviced.pc.in @@ -9,9 +9,9 @@ exec_prefix=@EXEC_PREFIX@ libdir=@LIBDIR@ includedir=@INCLUDEDIR@ -Name: plugin-api-deviced -Description: Plugin APIs for the deviced +Name: libsyscommon-plugin-api-deviced +Description: System plugin APIs for the deviced Version: @VERSION@ -Requires.private: plugin-api-common +Requires.private: libsyscommon-plugin-api-common Cflags: -I${includedir} @PLUGIN_DEVICED_INCLUDEDIR@ -Libs: -L${libdir} -lplugin-api-deviced @PLUGIN_DEVICED_LIBS@ +Libs: -L${libdir} -lsyscommon-plugin-api-deviced @PLUGIN_DEVICED_LIBS@ diff --git a/src/plugin-api/deviced/src/plugin-deviced-display.c b/src/plugin-api/deviced/src/syscommon-plugin-deviced-display.c similarity index 100% rename from src/plugin-api/deviced/src/plugin-deviced-display.c rename to src/plugin-api/deviced/src/syscommon-plugin-deviced-display.c diff --git a/src/plugin-api/resourced/CMakeLists.txt b/src/plugin-api/resourced/CMakeLists.txt index 114cbcb..9060f8e 100644 --- a/src/plugin-api/resourced/CMakeLists.txt +++ b/src/plugin-api/resourced/CMakeLists.txt @@ -1,16 +1,16 @@ CMAKE_MINIMUM_REQUIRED(VERSION 2.6) -PROJECT(plugin-api-resourced) +PROJECT(syscommon-plugin-api-resourced) SET(PREFIX ${CMAKE_INSTALL_PREFIX}) SET(EXEC_PREFIX "${PREFIX}/bin") SET(LIBDIR ${LIB_INSTALL_DIR}) -SET(INCLUDEDIR "${PREFIX}/include/plugin") +SET(INCLUDEDIR "${PREFIX}/include/system") SET(VERSION ${PLUGIN_API_RESOURCED_VERSION}) INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/include) -# Including below should be removed if the repository of plugin-api-common is -# separated. +# Including below should be removed if the repository of +# syscommon-plugin-api-common is separated. INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/../common/include) if (${PLUGIN_API_RESOURCED_ENABLE_DLOG}) @@ -18,7 +18,7 @@ if (${PLUGIN_API_RESOURCED_ENABLE_DLOG}) glib-2.0 dlog) ADD_DEFINITIONS("-DENABLE_DLOG") - ADD_DEFINITIONS("-DLOG_TAG=\"PLUGIN_API_RESOURCED\"") + ADD_DEFINITIONS("-DLOG_TAG=\"SYSTEM_PLUGIN_API_RESOURCED\"") else() SET(PKG_MODULES glib-2.0) @@ -36,12 +36,13 @@ SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${EXTRA_CFLAGS} -Wall -lrt") SET(CMAKE_EXE_LINKER_FLAGS "-Wl,--as-needed -Wl") SET(CMAKE_C_FLAGS_DEBUG "-O0 -g") -# plugin-api-common.c and plugin-api-conf.c are unnecessary if the repository of -# plugin-api-common is separated. -# Please remove them from SRCS and add 'plugin-api-common' to PKG_MODULES. -SET(SRCS src/plugin-resourced-memory-lmk.c - ../common/src/plugin-api-common.c - ../common/src/plugin-api-conf.c) +# syscommon-plugin-api-common.c and syscommon-plugin-api-conf.c are unnecessary +# if the repository of syscommon-plugin-api-common is separated. +# Please remove them from SRCS and add 'syscommon-plugin-api-common' +# to PKG_MODULES. +SET(SRCS src/syscommon-plugin-resourced-memory-lmk.c + ../common/src/syscommon-plugin-api-common.c + ../common/src/syscommon-plugin-api-conf.c) ADD_LIBRARY(${PROJECT_NAME} SHARED ${SRCS}) TARGET_LINK_LIBRARIES(${PROJECT_NAME} ${${PROJECT_NAME}_LDFLAGS} @@ -63,5 +64,6 @@ ENDFOREACH(include_dirs) FOREACH(libraries ${${PROJECT_NAME}_LIBRARIES}) SET(PLUGIN_RESOURCED_LIBS "${PLUGIN_RESOURCED_LIBS} -l${libraries}") ENDFOREACH(libraries) -CONFIGURE_FILE(${PROJECT_NAME}.pc.in ${PROJECT_NAME}.pc @ONLY) -INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}.pc DESTINATION ${LIB_INSTALL_DIR}/pkgconfig) +SET(PACKAGE_CONFIG_FILE "lib${PROJECT_NAME}.pc") +CONFIGURE_FILE(${PACKAGE_CONFIG_FILE}.in ${PACKAGE_CONFIG_FILE} @ONLY) +INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/${PACKAGE_CONFIG_FILE} DESTINATION ${LIB_INSTALL_DIR}/pkgconfig) diff --git a/src/plugin-api/resourced/include/plugin-resourced-memory-lmk-interface.h b/src/plugin-api/resourced/include/syscommon-plugin-resourced-memory-lmk-interface.h similarity index 81% rename from src/plugin-api/resourced/include/plugin-resourced-memory-lmk-interface.h rename to src/plugin-api/resourced/include/syscommon-plugin-resourced-memory-lmk-interface.h index e936fc0..9bfc4ac 100644 --- a/src/plugin-api/resourced/include/plugin-resourced-memory-lmk-interface.h +++ b/src/plugin-api/resourced/include/syscommon-plugin-resourced-memory-lmk-interface.h @@ -22,8 +22,8 @@ * THE SOFTWARE. */ -#ifndef __PLUGIN_RESOURCED_MEMORY_LMK_INTERFACE_H__ -#define __PLUGIN_RESOURCED_MEMORY_LMK_INTERFACE_H__ +#ifndef __SYSCOMMON_PLUGIN_RESOURCED_MEMORY_LMK_INTERFACE_H__ +#define __SYSCOMMON_PLUGIN_RESOURCED_MEMORY_LMK_INTERFACE_H__ #include @@ -31,16 +31,16 @@ extern "C" { #endif -typedef struct _plugin_backend_resourced_memory_lmk_funcs { +typedef struct _syscommon_plugin_backend_resourced_memory_lmk_funcs { int (*get_kill_candidates)(GArray *candidates, GArray *task_info_app_array, GArray *task_info_proc_array, unsigned long totalram_kb); -} plugin_backend_resourced_memory_lmk_funcs; +} syscommon_plugin_backend_resourced_memory_lmk_funcs; #ifdef __cplusplus } #endif -#endif /* __PLUGIN_RESOURCED_MEMORY_LMK_INTERFACE_H__ */ +#endif /* __SYSCOMMON_PLUGIN_RESOURCED_MEMORY_LMK_INTERFACE_H__ */ diff --git a/src/plugin-api/resourced/include/plugin-resourced-memory-lmk.h b/src/plugin-api/resourced/include/syscommon-plugin-resourced-memory-lmk.h similarity index 88% rename from src/plugin-api/resourced/include/plugin-resourced-memory-lmk.h rename to src/plugin-api/resourced/include/syscommon-plugin-resourced-memory-lmk.h index 9d58ca5..49f257b 100644 --- a/src/plugin-api/resourced/include/plugin-resourced-memory-lmk.h +++ b/src/plugin-api/resourced/include/syscommon-plugin-resourced-memory-lmk.h @@ -22,8 +22,8 @@ * THE SOFTWARE. */ -#ifndef __PLUGIN_RESOURCED_MEMORY_LMK_H__ -#define __PLUGIN_RESOURCED_MEMORY_LMK_H__ +#ifndef __SYSCOMMON_PLUGIN_RESOURCED_MEMORY_LMK_H__ +#define __SYSCOMMON_PLUGIN_RESOURCED_MEMORY_LMK_H__ #include #include @@ -65,13 +65,13 @@ struct task_info { * @brief Get the backend data of resourced-memory-lmk module * @return @c 0 on success, otherwise a negative error value */ -int plugin_resourced_memory_lmk_get_backend(void); +int syscommon_plugin_resourced_memory_lmk_get_backend(void); /** * @brief Put the backend data of resourced-memory-lmk module * @return @c 0 on success, otherwise a negative error value */ -int plugin_resourced_memory_lmk_put_backend(void); +int syscommon_plugin_resourced_memory_lmk_put_backend(void); /** * @brief Call the get_kill_candidates function of resourced-memory-lmk module @@ -82,7 +82,8 @@ int plugin_resourced_memory_lmk_put_backend(void); * @return @c the number of kill candidates on success, * otherwise a negative error value */ -int plugin_resourced_memory_lmk_get_kill_candidates(GArray *candidates, +int syscommon_plugin_resourced_memory_lmk_get_kill_candidates( + GArray *candidates, GArray *task_info_app_array, GArray *task_info_proc_array, unsigned long totalram_kb); @@ -91,4 +92,4 @@ int plugin_resourced_memory_lmk_get_kill_candidates(GArray *candidates, } #endif -#endif /* __PLUGIN_RESOURCED_MEMORY_LMK_H__ */ +#endif /* __SYSCOMMON_PLUGIN_RESOURCED_MEMORY_LMK_H__ */ diff --git a/src/plugin-api/resourced/plugin-api-resourced.pc.in b/src/plugin-api/resourced/libsyscommon-plugin-api-resourced.pc.in similarity index 55% rename from src/plugin-api/resourced/plugin-api-resourced.pc.in rename to src/plugin-api/resourced/libsyscommon-plugin-api-resourced.pc.in index 6b406aa..d1292b6 100644 --- a/src/plugin-api/resourced/plugin-api-resourced.pc.in +++ b/src/plugin-api/resourced/libsyscommon-plugin-api-resourced.pc.in @@ -9,9 +9,9 @@ exec_prefix=@EXEC_PREFIX@ libdir=@LIBDIR@ includedir=@INCLUDEDIR@ -Name: plugin-api-resourced -Description: Plugin APIs for the resourced +Name: libsyscommon-plugin-api-resourced +Description: System plugin APIs for the resourced Version: @VERSION@ -Requires.private: plugin-api-common +Requires.private: libsyscommon-plugin-api-common Cflags: -I${includedir} @PLUGIN_RESOURCED_INCLUDEDIR@ -Libs: -L${libdir} -lplugin-api-resourced @PLUGIN_RESOURCED_LIBS@ +Libs: -L${libdir} -lsyscommon-plugin-api-resourced @PLUGIN_RESOURCED_LIBS@ diff --git a/src/plugin-api/resourced/src/plugin-resourced-memory-lmk.c b/src/plugin-api/resourced/src/syscommon-plugin-resourced-memory-lmk.c similarity index 74% rename from src/plugin-api/resourced/src/plugin-resourced-memory-lmk.c rename to src/plugin-api/resourced/src/syscommon-plugin-resourced-memory-lmk.c index f1aed5b..c79eeb0 100644 --- a/src/plugin-api/resourced/src/plugin-resourced-memory-lmk.c +++ b/src/plugin-api/resourced/src/syscommon-plugin-resourced-memory-lmk.c @@ -24,28 +24,29 @@ #include -#include "plugin-common.h" +#include "syscommon-plugin-common.h" #include "common.h" -#include "plugin-resourced-memory-lmk.h" -#include "plugin-resourced-memory-lmk-interface.h" +#include "syscommon-plugin-resourced-memory-lmk.h" +#include "syscommon-plugin-resourced-memory-lmk-interface.h" #ifndef EXPORT #define EXPORT __attribute__((visibility("default"))) #endif -static plugin_backend_resourced_memory_lmk_funcs *funcs = NULL; +static syscommon_plugin_backend_resourced_memory_lmk_funcs *funcs = NULL; EXPORT -int plugin_resourced_memory_lmk_get_backend(void) +int syscommon_plugin_resourced_memory_lmk_get_backend(void) { int ret = 0; if (funcs) return 0; - ret = plugin_common_get_backend( - PLUGIN_MODULE_RESOURCED_MEMORY_LMK, (void **)&funcs); + ret = syscommon_plugin_common_get_backend( + SYSCOMMON_PLUGIN_MODULE_RESOURCED_MEMORY_LMK, + (void **)&funcs); if (ret < 0) { _E("Failed to get resourced_memory_lmk backend: %d", ret); return ret; @@ -57,15 +58,16 @@ int plugin_resourced_memory_lmk_get_backend(void) } EXPORT -int plugin_resourced_memory_lmk_put_backend(void) +int syscommon_plugin_resourced_memory_lmk_put_backend(void) { int ret = 0; if (!funcs) return 0; - ret = plugin_common_put_backend( - PLUGIN_MODULE_RESOURCED_MEMORY_LMK, (void *)funcs); + ret = syscommon_plugin_common_put_backend( + SYSCOMMON_PLUGIN_MODULE_RESOURCED_MEMORY_LMK, + (void *)funcs); if (ret < 0) { _E("Failed to put resourced_memory_lmk backend: %d", ret); return ret; @@ -78,7 +80,8 @@ int plugin_resourced_memory_lmk_put_backend(void) } EXPORT -int plugin_resourced_memory_lmk_get_kill_candidates(GArray *candidates, +int syscommon_plugin_resourced_memory_lmk_get_kill_candidates( + GArray *candidates, GArray *task_info_app_array, GArray *task_info_proc_array, unsigned long totalram_kb) @@ -86,7 +89,7 @@ int plugin_resourced_memory_lmk_get_kill_candidates(GArray *candidates, int ret = 0; if (!funcs) { - ret = plugin_resourced_memory_lmk_get_backend(); + ret = syscommon_plugin_resourced_memory_lmk_get_backend(); if (ret < 0) return ret; } -- 2.34.1