Simplify CMakefile

- Remove unnecessary resourced-cpucgroup.service
- Use GLOB instead of declaring all files
- Exclude swap source file when swap module is disabled

Change-Id: I8388b866f1337af462a32ccfc54d64c210526e46
Signed-off-by: Kichan Kwon <k_c.kwon@samsung.com>

diff --git a/packaging/resourced-cpucgroup.service b/packaging/resourced-cpucgroup.service
deleted file mode 100644 (file)
index 8db5ad7..0000000
--- a/packaging/resourced-cpucgroup.service
+++ /dev/null
@@ -1,10 +0,0 @@
-[Unit]
-Description=make cpucgroup
-After=graphical.target
-
-[Service]
-Type=oneshot
-ExecStart=/usr/bin/resourced-cpucgroup.sh
-
-[Install]
-WantedBy=graphical.target

diff --git a/packaging/resourced.spec b/packaging/resourced.spec
index cff7659..7efae5b 100644 (file)
--- a/packaging/resourced.spec
+++ b/packaging/resourced.spec
@@ -5,7 +5,6 @@ Release:    1
 Group:      System/Libraries
 License:    Apache-2.0
 Source0:    %{name}-%{version}.tar.gz
-Source2:    resourced-cpucgroup.service
 
 # Default setting
 # Notice : to use freezer module, you should install system-freezer plugin
@@ -152,10 +151,6 @@ install -D scripts/500.resourced_upgrade.sh %{buildroot}%{upgrade_file_path}/scr
        mkdir -p %{buildroot}/%{TZ_SYS_GLOBALUSER_DB}
 %endif
 
-%if %{?cpu_module} == OFF
-       %install_service graphical.target.wants resourced-cpucgroup.service
-%endif
-
 %pre
 if [ "$1" = "2" ]; then # upgrade begins
        systemctl stop resourced.service
@@ -190,10 +185,6 @@ fi
 %config %{rd_config_path}/proc.conf
 %if %{?cpu_module} == ON
        %config %{rd_config_path}/cpu.conf
-%else
-       %{_bindir}/resourced-cpucgroup.sh
-       %{_unitdir}/resourced-cpucgroup.service
-       %{_unitdir}/graphical.target.wants/resourced-cpucgroup.service
 %endif
 %if %{?swap_module} == ON
        %config %{rd_config_path}/swap.conf

diff --git a/scripts/resourced-cpucgroup.sh b/scripts/resourced-cpucgroup.sh
deleted file mode 100644 (file)
index 053279f..0000000
--- a/scripts/resourced-cpucgroup.sh
+++ /dev/null
@@ -1,15 +0,0 @@
-#!/bin/sh
-
-CPU_CGROUP="/sys/fs/cgroup/cpu/background"
-CPU_SHARE="50"
-CPU_CONTROL_LIST="indicator net-config"
-
-/bin/mkdir -pm 755 $CPU_CGROUP
-echo $CPU_SHARE > $CPU_CGROUP/cpu.shares
-for list in $CPU_CONTROL_LIST; do
-        pid=`/usr/bin/pgrep $list`
-        if [ "z${pid}" != "z" ]; then
-                echo $pid > $CPU_CGROUP/cgroup.procs
-        fi
-done
-

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index c2d2f2d..1553a7e 100644 (file)
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -70,17 +70,10 @@ ENDIF()
 
 #heart module
 IF("${HEART_MODULE}" STREQUAL "ON")
-  SET(SOURCES ${SOURCES}
-    ${HEART_SOURCE_DIR}/logging.c
-    ${HEART_SOURCE_DIR}/heart.c
-    ${HEART_SOURCE_DIR}/heart-abnormal.c
-    ${HEART_SOURCE_DIR}/heart-cpu.c
-    ${HEART_SOURCE_DIR}/heart-memory.c
-    ${HEART_SOURCE_DIR}/heart-battery.c
-    ${HEART_SOURCE_DIR}/heart-storage.c
-    ${HEART_SOURCE_DIR}/decision.c
-    ${HEART_SOURCE_DIR}/decision-memory.c
-    )
+  FILE(GLOB FILES "${HEART_SOURCE_DIR}/*.c")
+  FOREACH(FILE ${FILES})
+      SET(SOURCES ${SOURCES} ${FILE})
+  ENDFOREACH()
   ADD_DEFINITIONS("-DHEART_SUPPORT")
   IF("${DEBUG_LOG}" STREQUAL "ON")
     ADD_DEFINITIONS("-DLOGGING_DEBUG")
@@ -89,40 +82,41 @@ ENDIF()
 
 #memory module
 IF("${MEMORY_MODULE}" STREQUAL "ON")
-  SET(SOURCES ${SOURCES}
-    ${MEMORY_SOURCE_DIR}/lowmem-dbus.c
-    ${MEMORY_SOURCE_DIR}/memcontrol.c
-    ${MEMORY_SOURCE_DIR}/vmpressure-lowmem-handler.c
-    )
+  FILE(GLOB FILES "${MEMORY_SOURCE_DIR}/*.c")
+  FOREACH(FILE ${FILES})
+      SET(SOURCES ${SOURCES} ${FILE})
+  ENDFOREACH()
   ADD_DEFINITIONS("-DMEMORY_SUPPORT")
 ENDIF()
 
 #swap module
 IF("${SWAP_MODULE}" STREQUAL "ON")
-  SET(SOURCES ${SOURCES}
-    ${SWAP_SOURCE_DIR}/swap.c
-    )
+  FILE(GLOB FILES "${SWAP_SOURCE_DIR}/*.c")
+  FOREACH(FILE ${FILES})
+      SET(SOURCES ${SOURCES} ${FILE})
+  ENDFOREACH()
   ADD_DEFINITIONS("-DSWAP_SUPPORT")
 ENDIF()
-SET(SOURCES ${SOURCES} ${SWAP_SOURCE_DIR}/swap-common.c)
 
 IF("${CPU_MODULE}" STREQUAL "ON")
-  SET(SOURCES ${SOURCES}
-    ${CPU_SOURCE_DIR}/cpu.c
-    )
+  FILE(GLOB FILES "${CPU_SOURCE_DIR}/*.c")
+  FOREACH(FILE ${FILES})
+      SET(SOURCES ${SOURCES} ${FILE})
+  ENDFOREACH()
 ENDIF()
 
 IF("${TIMER_SLACK}" STREQUAL "ON")
-  SET(SOURCES ${SOURCES}
-    ${TIMER_SOURCE_DIR}/timer-slack.c
-    )
+  FILE(GLOB FILES "${TIMER_SOURCE_DIR}/*.c")
+  FOREACH(FILE ${FILES})
+      SET(SOURCES ${SOURCES} ${FILE})
+  ENDFOREACH()
 ENDIF()
 
 IF("${BLOCK_MODULE}" STREQUAL "ON")
-  SET(SOURCES ${SOURCES}
-    ${BLOCK_SOURCE_DIR}/block.c
-    ${BLOCK_SOURCE_DIR}/block-monitor.c
-    )
+  FILE(GLOB FILES "${BLOCK_SOURCE_DIR}/*.c")
+  FOREACH(FILE ${FILES})
+      SET(SOURCES ${SOURCES} ${FILE})
+  ENDFOREACH()
 ENDIF()
 
 SET(REQUIRES_LIST ${REQUIRES_LIST}
@@ -218,8 +212,6 @@ ENDIF()
 IF("${CPU_MODULE}" STREQUAL "ON")
   INSTALL(FILES ${CPU_SOURCE_DIR}/cpu.conf
          DESTINATION ${RD_CONFIG_PATH} RENAME cpu.conf)
-ELSE()
-  INSTALL(PROGRAMS ${CMAKE_BINARY_DIR}/scripts/resourced-cpucgroup.sh DESTINATION bin)
 ENDIF()
 
 IF("${TIMER_SLACK}" STREQUAL "ON")

diff --git a/src/common/swap-common.h b/src/common/swap-common.h
index f740ae4..77ba0a3 100644 (file)
--- a/src/common/swap-common.h
+++ b/src/common/swap-common.h
@@ -49,6 +49,13 @@ enum swap_compact_reason {
        SWAP_COMPACT_RESASON_MAX,
 };
 
+#ifdef SWAP_SUPPORT
 enum swap_state swap_get_state(void);
+#else
+static inline enum swap_state swap_get_state(void)
+{
+       return SWAP_OFF;
+}
+#endif
 
 #endif /* __SWAP_COMMON_H__ */