Rearrange configuration files & Modify the spec file

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

diff --git a/conf/limiter-profile-iot-headless.conf b/conf/limiter-profile-iot-headless.conf
deleted file mode 100644 (file)
index aa83b44..0000000
--- a/conf/limiter-profile-iot-headless.conf
+++ /dev/null
@@ -1,20 +0,0 @@
-[MemoryGroupLimit]
-VipGroupLimit=     100%
-HighGroupLimit=    100%
-MediumGroupLimit=  100%
-LowestGroupLimit=  100%
-
-[MemoryLevelThreshold]
-#MediumLevel=     400MB
-#LowLevel=        300MB
-#CriticalLevel=   200MB
-#OomLevel=        160MB
-OomPopup=            no
-
-[MemoryAppTypeLimit]
-ServicePerAppLimitAction=128MB,kill
-#WidgetPerAppLimitAction=160MB,kill
-#GUIPerAppLimitAction=1024MB,kill
-
-[MemoryAppStatusLimit]
-#BackgroundPerAppLimitAction=768MB,kill

diff --git a/conf/limiter-profile-tv.conf b/conf/limiter-profile-tv.conf
deleted file mode 100644 (file)
index ebefc4d..0000000
--- a/conf/limiter-profile-tv.conf
+++ /dev/null
@@ -1,17 +0,0 @@
-[MemoryGroupLimit]
-VipGroupLimit=     100%
-HighGroupLimit=    100%
-MediumGroupLimit=  100%
-LowestGroupLimit=  100%
-
-[MemoryLevelThreshold]
-#MediumLevel=     400MB
-#LowLevel=        300MB
-#CriticalLevel=   200MB
-#OomLevel=        160MB
-#OomPopup=           no
-
-[MemoryAppTypeLimit]
-ServicePerAppLimitAction=128MB,ignore
-
-[MemoryAppStatusLimit]

diff --git a/conf/optimizer-profile-tv.conf b/conf/optimizer-profile-tv.conf
new file mode 100644 (file)
index 0000000..dcd3a3b
--- /dev/null
+++ b/conf/optimizer-profile-tv.conf
@@ -0,0 +1,37 @@
+[MemorySwap]
+SwapEnable=1
+ReclaimAtBoot=yes
+SwapType=zram
+VipGroupSwappiness=0
+HighGroupSwappiness=0
+MediumGroupSwappiness=0
+LowestGroupSwappiness=0
+
+[MemoryZram]
+CompAlgorithm=zstd
+ZramRatio=0.4
+
+[MemoryZswap]
+PoolRatio=40
+PoolType=z3fold
+
+[MemoryDedup]
+DedupEnable=1
+DedupAtBoot=yes
+ScanOnLowmem=true
+
+[MemoryKsm]
+KsmMode=oneshot
+#KsmMode=periodic
+
+PagesToScan=100
+PagesToScanWithBoost=1000
+
+[MemoryCompaction]
+CompactionEnable=0
+FragLevel=800
+
+[CpuSched]
+
+[CpuAffinity]
+#ForegroundApps=1,2,4-6

diff --git a/packaging/resourced.spec b/packaging/resourced.spec
index ef3d836..94da3d0 100644 (file)
--- a/packaging/resourced.spec
+++ b/packaging/resourced.spec
@@ -1,10 +1,5 @@
 # Note about configuration packages
 #
-# resourced uses alternatives-based configuration scheme, meaning that
-# configuration files are provided by various sources (packages).  Each
-# configuration file has unique name and assigned priority.  For given
-# unique name used is the file which has highest priority.
-#
 # Consequently, to replace given configuration file it's enough to provide
 # it from different package with higher priority.
 #
@@ -46,9 +41,6 @@ BuildRequires:  pkgconfig(capi-system-device)
 BuildRequires:  pkgconfig(cmocka)
 BuildRequires:  pkgconfig(libsyscommon)
 
-Requires(post): %{_sbindir}/update-alternatives
-Requires(preun): %{_sbindir}/update-alternatives
-
 BuildRequires: gperf
 # for swap plugin
 Requires:      %{_sbindir}/mkswap
@@ -73,8 +65,6 @@ Requires:     %{name}-watchdog-handler = %{version}-%{release}
 
 %package       bin
 Summary:       Resourced binary
-Requires(post): %{_sbindir}/update-alternatives
-Requires(preun): %{_sbindir}/update-alternatives
 %description   bin
 
 %package       private-api-devel
@@ -84,9 +74,6 @@ Requires:     %{name}-bin = %{version}-%{release}
 
 %package       config
 Summary:       Common configuration for resourced
-Requires(post): %{_sbindir}/update-alternatives
-Requires(preun): %{_sbindir}/update-alternatives
-Requires(posttrans): %{_sbindir}/update-alternatives
 %description   config
 
 %package       config-tv
@@ -127,7 +114,7 @@ pushd build
         -DRD_CONFIG_PATH=%{confdir} \
         -DRD_PLUGIN_PATH=%{plugindir} \
         -DRD_TESTS_PATH=%{_libdir}/resourced-tests \
-        -DRD_BINARY_NAME=resourced.common \
+        -DRD_BINARY_NAME=resourced \
         %{?asan:-DASAN_BUILD=True}
 
 make %{?jobs:-j%jobs}
@@ -141,67 +128,8 @@ mkdir -p %{buildroot}/%{TZ_SYS_GLOBALUSER_DATA}/heart
 mkdir -p %{buildroot}/%{TZ_SYS_GLOBALUSER_DB}
 popd
 
-mkdir -p %{buildroot}/%{confdir}/configs
-( cd %{buildroot}/%{confdir} && for i in *.conf; do
-       mv -vf $i configs/config-${i}
-  done ) || false
-
-%post bin
-%{_sbindir}/update-alternatives --install %{_bindir}/resourced %{name} %{_bindir}/resourced.common 100
-
-%posttrans config
-# Installing alternatives for configs is in posttrans because after %preun
-# all the files available in old package (eg. cpu.conf) and not available
-# in new package (we provide config-cpu.conf) are removed by RPM.  Please
-# check this guide for details:
-#   https://docs.fedoraproject.org/en-US/packaging-guidelines/Scriptlets/#ordering
-
-# List of configuration files provided by this package - update when any new config file is added!
-%define config_files limiter optimizer monitor process
-
-for i in %{confdir}/*.conf; do
-       if [ "$i" = %{confdir}/"*.conf" ]; then
-               break;
-       fi
-
-       if [ ! -L "$i" ]; then
-               echo "Stale configuration file found - appending .orig to file name ${i} -> ${i}.orig"
-               rm -f "${i}.orig"
-               mv "$i" "${i}.orig"
-       fi
-done
-
-for i in %{config_files}; do
-       %{_sbindir}/update-alternatives --install %{confdir}/${i}.conf resourced-config-${i} %{confdir}/configs/config-${i}.conf 100
-done
-
-%preun bin
-if [ $1 -eq 0 ]; then
-       %{_sbindir}/update-alternatives --remove %{name} %{_bindir}/resourced.common
-fi
-
-%preun config
-if [ $1 -eq 0 ]; then
-       for i in %{config_files}; do
-               %{_sbindir}/update-alternatives --remove resourced-config-${i} %{confdir}/configs/config-${i}.conf
-       done
-fi
-
 %post config-tv
-%{_sbindir}/update-alternatives --install %{confdir}/limiter.conf resourced-config-limiter %{confdir}/configs/config-limiter-profile-tv.conf 150
-
-%preun config-tv
-if [ $1 -eq 0 ]; then
-       %{_sbindir}/update-alternatives --remove resourced-config-limiter %{confdir}/configs/config-limiter-profile-tv.conf
-fi
-
-%post config-iot-headless
-%{_sbindir}/update-alternatives --install %{confdir}/limiter.conf resourced-config-limiter %{confdir}/configs/config-limiter-profile-iot-headless.conf 150
-
-%preun config-iot-headless
-if [ $1 -eq 0 ]; then
-       %{_sbindir}/update-alternatives --remove resourced-config-limiter %{confdir}/configs/config-limiter-profile-iot-headless.conf
-fi
+mv %{confdir}/optimizer-profile-tv.conf %{confdir}/optimizer.conf
 
 %files
 %license LICENSE
@@ -219,26 +147,25 @@ fi
 %license LICENSE
 %manifest resourced.manifest
 %{_libdir}/libresourced-private-api.so.*
-%ghost %{_bindir}/resourced
-%attr(-,root, root) %{_bindir}/resourced.common
+%{_bindir}/resourced
+%attr(-,root, root) %{_bindir}/resourced
 %attr(700, root, root) %{TZ_SYS_ETC}/dump.d/module.d/dump_heart_data.sh
 
 %files config
 %config %{_sysconfdir}/dbus-1/system.d/org.tizen.resourced.conf
 %{_unitdir}/resourced.service
 %{_unitdir}/multi-user.target.wants/resourced.service
-%{confdir}/configs/config-limiter.conf
-%{confdir}/configs/config-optimizer.conf
-%{confdir}/configs/config-process.conf
-%{confdir}/configs/config-monitor.conf
+%{confdir}/limiter.conf
+%{confdir}/optimizer.conf
+%{confdir}/process.conf
+%{confdir}/monitor.conf
 
 %files config-tv
 %manifest resourced.manifest
-%{confdir}/configs/config-limiter-profile-tv.conf
+%{confdir}/optimizer-profile-tv.conf
 
 %files config-iot-headless
 %manifest resourced.manifest
-%{confdir}/configs/config-limiter-profile-iot-headless.conf
 
 %if %{?watchdog_module} == ON
 %files watchdog-handler
@@ -249,7 +176,6 @@ fi
 
 %files light
 %manifest resourced.manifest
-%ghost %{_bindir}/resourced
 
 %files private-api-devel
 %manifest resourced.manifest

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index cd13b49..47a3ce4 100644 (file)
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -57,14 +57,6 @@ INCLUDE_DIRECTORIES(${RESOURCED_INCLUDEDIR}
   ${PRIORITY_SOURCE_DIR}
 )
 
-#compaction module
-#IF("${COMPACTION_MODULE}" STREQUAL "ON")
-#  FILE(GLOB FILES "${COMPACTION_SOURCE_DIR}/*.c")
-#  FOREACH(FILE ${FILES})
-#      SET(SOURCES ${SOURCES} ${FILE})
-#  ENDFOREACH()
-#ENDIF()
-
 IF("${PROC_WATCHDOG}" STREQUAL "ON")
   SET(SOURCES ${SOURCES}
     ${WATCHDOG_SOURCE_DIR}/proc-watchdog.c
@@ -168,6 +160,7 @@ INSTALL(TARGETS 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
        ${RESOURCE_MONITOR_SOURCE_DIR}/heart.c
@@ -234,8 +227,6 @@ INSTALL(TARGETS ${RD_BINARY_NAME}
 
 IF("${MEMORY_MODULE}" STREQUAL "ON")
        INSTALL(FILES ${CONF_DIR}/limiter.conf DESTINATION ${RD_CONFIG_PATH})
-       INSTALL(FILES ${CONF_DIR}/limiter-profile-tv.conf DESTINATION ${RD_CONFIG_PATH})
-       INSTALL(FILES ${CONF_DIR}/limiter-profile-iot-headless.conf DESTINATION ${RD_CONFIG_PATH})
 ENDIF()
 
 IF("${PROC_WATCHDOG}" STREQUAL "ON")