From 3e76e44425dadff820197d43f310967265a5c9be Mon Sep 17 00:00:00 2001 From: SangYoun Kwak Date: Thu, 27 Apr 2023 14:48:45 +0900 Subject: [PATCH] Rename package, include and function name of system plugin Since the name of plugin has changed to syscommon-plugin/system-plugin, the package name, include path and function name of plugin should be changed. * in .spec file and CMakeLists.txt, package names are renamed: plugin-api-resourced -> libsyscommon-plugin-api-resourced * include path: plugin/plugin-resourced... -> syscommon-plugin-resourced... (The 'system' directory was included by the package config(.pc) file of plugins) * function name: plugin_resourced_memory_lmk_get_kill_candidates -> syscommon_plugin_resourced_memory_lmk_get_kill_candidates Change-Id: Ie3b07e06e4d43536ac5ba2d92a2ef7ed2c1926b7 Signed-off-by: SangYoun Kwak --- packaging/resourced.spec | 2 +- src/CMakeLists.txt | 2 +- src/resource-limiter/memory/lowmem-governor.c | 4 ++-- src/resource-limiter/memory/lowmem.h | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/packaging/resourced.spec b/packaging/resourced.spec index 8f4f55c..0c970fa 100644 --- a/packaging/resourced.spec +++ b/packaging/resourced.spec @@ -42,7 +42,7 @@ BuildRequires: pkgconfig(capi-system-device) BuildRequires: pkgconfig(capi-system-resource) BuildRequires: pkgconfig(cmocka) BuildRequires: pkgconfig(libsyscommon) -BuildRequires: pkgconfig(plugin-api-resourced) +BuildRequires: pkgconfig(libsyscommon-plugin-api-resourced) BuildRequires: gperf # for swap plugin diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 2690407..f3d9067 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -110,7 +110,7 @@ SET(REQUIRES_LIST ${REQUIRES_LIST} libudev dbus-1 libsyscommon - plugin-api-resourced + libsyscommon-plugin-api-resourced ) INCLUDE(FindPkgConfig) diff --git a/src/resource-limiter/memory/lowmem-governor.c b/src/resource-limiter/memory/lowmem-governor.c index 88389af..2cfa41c 100644 --- a/src/resource-limiter/memory/lowmem-governor.c +++ b/src/resource-limiter/memory/lowmem-governor.c @@ -21,7 +21,7 @@ * @desc Provides governor function to sort out candidate process to kill. */ -#include +#include #include "lowmem.h" #include "module.h" @@ -48,7 +48,7 @@ static int lowmem_governor_initialize(void *data) */ /* Register the governor for the lowmem_worker(lowmem killer) */ - lowmem_register_lmk_governor(plugin_resourced_memory_lmk_get_kill_candidates); + lowmem_register_lmk_governor(syscommon_plugin_resourced_memory_lmk_get_kill_candidates); /* Register governors for the memory levels */ lowmem_register_mem_level_governor(MEM_LEVEL_HIGH, mem_state_dummy_governor); diff --git a/src/resource-limiter/memory/lowmem.h b/src/resource-limiter/memory/lowmem.h index 763bc19..d853241 100644 --- a/src/resource-limiter/memory/lowmem.h +++ b/src/resource-limiter/memory/lowmem.h @@ -29,7 +29,7 @@ #include #include -#include +#include #include "fd-handler.h" -- 2.7.4