Rename plugins according to conf/resource/module

Renaming plugins in resourced-*.rpm package considering conf, resource, and module.
Plugin library name normally follows the rule below:
libplugin-resourced-<conf>-<resource>-<module>.so

conf: 'limiter' or 'optimizer' or 'monitor' or ''
resource: 'cpu' or 'memory' or ''

Change-Id: I14512fc0bb5f4a36a2a64a0b7f6c9da9e4e0bf46
Signed-off-by: Unsung Lee <unsung.lee@samsung.com>

diff --git a/packaging/resourced.spec b/packaging/resourced.spec
index d8cdb90..8f4f55c 100644 (file)
--- a/packaging/resourced.spec
+++ b/packaging/resourced.spec
@@ -138,13 +138,13 @@ mv %{confdir}/optimizer-profile-tv.conf %{confdir}/optimizer.conf
 %files
 %license LICENSE
 %manifest resourced.manifest
-%{plugindir}/libblock.so
-%{plugindir}/libfreezer.so
-%{plugindir}/libheart.so
-%{plugindir}/libswap.so
-%{plugindir}/libdedup.so
-%{plugindir}/libcompaction.so
-%{plugindir}/libcpu-sched.so
+%{plugindir}/libplugin-resourced-process-block.so
+%{plugindir}/libplugin-resourced-limiter-freezer.so
+%{plugindir}/libplugin-resourced-monitor-heart.so
+%{plugindir}/libplugin-resourced-optimizer-memory-swap.so
+%{plugindir}/libplugin-resourced-optimizer-memory-dedup.so
+%{plugindir}/libplugin-resourced-optimizer-memory-compaction.so
+%{plugindir}/libplugin-resourced-optimizer-cpu-sched.so
 %attr(700, root, root) %{TZ_SYS_ETC}/dump.d/module.d/dump_heart_data.sh
 
 %files bin

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index a4908f0..2690407 100644 (file)
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -140,45 +140,45 @@ INSTALL(FILES ${RESOURCED_HEADERS} DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/resou
 CONFIGURE_FILE(${CMAKE_SOURCE_DIR}/resourced-private-api.pc.in ${CMAKE_SOURCE_DIR}/resourced-private-api.pc @ONLY)
 INSTALL(FILES ${CMAKE_SOURCE_DIR}/resourced-private-api.pc DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig)
 
-ADD_LIBRARY(block MODULE
+ADD_LIBRARY(plugin-resourced-process-block MODULE
        ${BLOCK_SOURCE_DIR}/block.c
        ${BLOCK_SOURCE_DIR}/block-monitor.c)
-TARGET_LINK_LIBRARIES(block resourced-private-api ${RESOURCED_REQUIRE_PKGS_LDFLAGS})
-INSTALL(TARGETS block DESTINATION ${MAKE_INSTALL_PREFIX}${RD_PLUGIN_PATH})
+TARGET_LINK_LIBRARIES(plugin-resourced-process-block resourced-private-api ${RESOURCED_REQUIRE_PKGS_LDFLAGS})
+INSTALL(TARGETS plugin-resourced-process-block DESTINATION ${MAKE_INSTALL_PREFIX}${RD_PLUGIN_PATH})
 
 ADD_DEFINITIONS("-DFREEZER_DIR=\"${LIB_INSTALL_DIR}\"")
-ADD_LIBRARY(freezer MODULE ${FREEZER_SOURCE_DIR}/freezer.c)
-TARGET_LINK_LIBRARIES(freezer resourced-private-api ${RESOURCED_REQUIRE_PKGS_LDFLAGS})
-INSTALL(TARGETS freezer DESTINATION ${MAKE_INSTALL_PREFIX}${RD_PLUGIN_PATH})
+ADD_LIBRARY(plugin-resourced-limiter-freezer MODULE ${FREEZER_SOURCE_DIR}/freezer.c)
+TARGET_LINK_LIBRARIES(plugin-resourced-limiter-freezer resourced-private-api ${RESOURCED_REQUIRE_PKGS_LDFLAGS})
+INSTALL(TARGETS plugin-resourced-limiter-freezer DESTINATION ${MAKE_INSTALL_PREFIX}${RD_PLUGIN_PATH})
 
-ADD_LIBRARY(swap MODULE
+ADD_LIBRARY(plugin-resourced-optimizer-memory-swap MODULE
        ${SWAP_SOURCE_DIR}/swap.c
        ${SWAP_SOURCE_DIR}/fileswap.c
        ${SWAP_SOURCE_DIR}/zswap.c
        ${SWAP_SOURCE_DIR}/zramswap.c)
-TARGET_LINK_LIBRARIES(swap resourced-private-api ${RESOURCED_REQUIRE_PKGS_LDFLAGS})
-INSTALL(TARGETS swap DESTINATION ${MAKE_INSTALL_PREFIX}${RD_PLUGIN_PATH})
+TARGET_LINK_LIBRARIES(plugin-resourced-optimizer-memory-swap resourced-private-api ${RESOURCED_REQUIRE_PKGS_LDFLAGS})
+INSTALL(TARGETS plugin-resourced-optimizer-memory-swap DESTINATION ${MAKE_INSTALL_PREFIX}${RD_PLUGIN_PATH})
 
-ADD_LIBRARY(dedup MODULE
+ADD_LIBRARY(plugin-resourced-optimizer-memory-dedup MODULE
        ${DEDUP_SOURCE_DIR}/dedup.c)
-TARGET_LINK_LIBRARIES(dedup resourced-private-api ${RESOURCED_REQUIRE_PKGS_LDFLAGS})
-INSTALL(TARGETS dedup DESTINATION ${MAKE_INSTALL_PREFIX}${RD_PLUGIN_PATH})
+TARGET_LINK_LIBRARIES(plugin-resourced-optimizer-memory-dedup resourced-private-api ${RESOURCED_REQUIRE_PKGS_LDFLAGS})
+INSTALL(TARGETS plugin-resourced-optimizer-memory-dedup DESTINATION ${MAKE_INSTALL_PREFIX}${RD_PLUGIN_PATH})
 
-ADD_LIBRARY(compaction MODULE
+ADD_LIBRARY(plugin-resourced-optimizer-memory-compaction MODULE
        ${COMPACTION_SOURCE_DIR}/compaction.c)
-TARGET_LINK_LIBRARIES(compaction resourced-private-api ${RESOURCED_REQUIRE_PKGS_LDFLAGS})
-INSTALL(TARGETS compaction DESTINATION ${MAKE_INSTALL_PREFIX}${RD_PLUGIN_PATH})
+TARGET_LINK_LIBRARIES(plugin-resourced-optimizer-memory-compaction resourced-private-api ${RESOURCED_REQUIRE_PKGS_LDFLAGS})
+INSTALL(TARGETS plugin-resourced-optimizer-memory-compaction DESTINATION ${MAKE_INSTALL_PREFIX}${RD_PLUGIN_PATH})
 
-ADD_LIBRARY(cpu-sched MODULE
+ADD_LIBRARY(plugin-resourced-optimizer-cpu-sched MODULE
        ${CPU_RESOURCE_OPTIMIZER_SOURCE_DIR}/cpu-hotplug.c
        ${CPU_RESOURCE_OPTIMIZER_SOURCE_DIR}/cpu-sched.c)
-TARGET_LINK_LIBRARIES(cpu-sched resourced-private-api ${RESOURCED_REQUIRE_PKGS_LDFLAGS})
-INSTALL(TARGETS cpu-sched DESTINATION ${MAKE_INSTALL_PREFIX}${RD_PLUGIN_PATH})
+TARGET_LINK_LIBRARIES(plugin-resourced-optimizer-cpu-sched resourced-private-api ${RESOURCED_REQUIRE_PKGS_LDFLAGS})
+INSTALL(TARGETS plugin-resourced-optimizer-cpu-sched DESTINATION ${MAKE_INSTALL_PREFIX}${RD_PLUGIN_PATH})
 
 INSTALL(FILES ${CONF_DIR}/optimizer.conf DESTINATION ${RD_CONFIG_PATH})
 INSTALL(FILES ${CONF_DIR}/optimizer-profile-tv.conf DESTINATION ${RD_CONFIG_PATH})
 
-ADD_LIBRARY(heart MODULE
+ADD_LIBRARY(plugin-resourced-monitor-heart MODULE
        ${RESOURCE_MONITOR_SOURCE_DIR}/heart.c
        ${RESOURCE_MONITOR_SOURCE_DIR}/heart-abnormal.c
        ${RESOURCE_MONITOR_SOURCE_DIR}/heart-battery.c
@@ -187,8 +187,8 @@ ADD_LIBRARY(heart MODULE
        ${RESOURCE_MONITOR_SOURCE_DIR}/heart-memory.c
        ${RESOURCE_MONITOR_SOURCE_DIR}/heart-storage.c
        ${RESOURCE_MONITOR_SOURCE_DIR}/logging.c)
-TARGET_LINK_LIBRARIES(heart resourced-private-api ${RESOURCED_REQUIRE_PKGS_LDFLAGS})
-INSTALL(TARGETS heart DESTINATION ${MAKE_INSTALL_PREFIX}${RD_PLUGIN_PATH})
+TARGET_LINK_LIBRARIES(plugin-resourced-monitor-heart resourced-private-api ${RESOURCED_REQUIRE_PKGS_LDFLAGS})
+INSTALL(TARGETS plugin-resourced-monitor-heart DESTINATION ${MAKE_INSTALL_PREFIX}${RD_PLUGIN_PATH})
 INSTALL(FILES ${CONF_DIR}/monitor.conf DESTINATION ${RD_CONFIG_PATH})
 CONFIGURE_FILE(${RESOURCE_MONITOR_SOURCE_DIR}/dump_heart_data.sh.in ${RESOURCE_MONITOR_SOURCE_DIR}/dump_heart_data.sh @ONLY)
 INSTALL(FILES ${RESOURCE_MONITOR_SOURCE_DIR}/dump_heart_data.sh DESTINATION ${RD_SYS_ETC}/dump.d/module.d)