Revamp resourced directory hierarchy

Done in preparation for resourced's new
role as a centralized resource management
framework. Makes the organization more
modular, with clearer responsibility.

Change-Id: I432f83537a6ca9dcfce00172942ca1bb422f3cf1

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 703ac01..965f189 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -37,25 +37,45 @@ SET(PREFIX ${CMAKE_INSTALL_PREFIX})
 SET(VERSION ${FULLVER})
 
 #init variables with sources
-SET(DATA_DIR                    ${CMAKE_SOURCE_DIR}/data)
-SET(CMAKELISTS_DIR              ${CMAKE_SOURCE_DIR}/CMakeLists)
-SET(INCLUDE_COMMON_DIR          ${CMAKE_SOURCE_DIR}/src/common)
-SET(INCLUDE_PUBLIC_DIR          ${CMAKE_SOURCE_DIR}/include)
-SET(RESOURCED_INCLUDEDIR        ${INCLUDE_COMMON_DIR} ${INCLUDE_PUBLIC_DIR})
-
-SET(SOURCE_DIR                  ${CMAKE_SOURCE_DIR}/src)
-SET(RESOURCED_SOURCE_DIR        ${SOURCE_DIR}/resourced)
-SET(PROCESS_SOURCE_DIR          ${SOURCE_DIR}/process)
-SET(MEMORY_SOURCE_DIR           ${SOURCE_DIR}/memory)
-SET(SWAP_SOURCE_DIR             ${SOURCE_DIR}/swap)
-SET(MODULES_SOURCE_DIR          ${SOURCE_DIR}/modules)
-SET(FREEZER_SOURCE_DIR          ${SOURCE_DIR}/freezer)
-SET(HEART_SOURCE_DIR            ${SOURCE_DIR}/heart)
-SET(COMMON_SOURCE_DIR           ${SOURCE_DIR}/common)
-SET(CPU_SOURCE_DIR              ${SOURCE_DIR}/cpu)
-SET(VIP_SOURCE_DIR              ${SOURCE_DIR}/vip-process)
-SET(BLOCK_SOURCE_DIR            ${SOURCE_DIR}/block)
-SET(DEDUP_SOURCE_DIR            ${SOURCE_DIR}/dedup)
+SET(DATA_DIR                                        ${CMAKE_SOURCE_DIR}/data)
+SET(CMAKELISTS_DIR                                  ${CMAKE_SOURCE_DIR}/CMakeLists)
+SET(INCLUDE_COMMON_DIR                              ${CMAKE_SOURCE_DIR}/src/common)
+SET(INCLUDE_PUBLIC_DIR                              ${CMAKE_SOURCE_DIR}/include)
+SET(RESOURCED_INCLUDEDIR                            ${INCLUDE_COMMON_DIR} ${INCLUDE_PUBLIC_DIR})
+
+#misc
+SET(SOURCE_DIR                                      ${CMAKE_SOURCE_DIR}/src)
+SET(RESOURCED_SOURCE_DIR                            ${SOURCE_DIR}/resourced)
+SET(COMMON_SOURCE_DIR                               ${SOURCE_DIR}/common)
+
+#resource-optimizer source folders
+SET(RESOURCE_OPTIMIZER_SOURCE_DIR                   ${SOURCE_DIR}/resource-optimizer)
+SET(MEMORY_RESOURCE_OPTIMIZER_SOURCE_DIR            ${RESOURCE_OPTIMIZER_SOURCE_DIR}/memory)
+SET(DEDUP_SOURCE_DIR                                ${RESOURCE_OPTIMIZER_SOURCE_DIR}/memory/dedup)
+SET(SWAP_SOURCE_DIR                                 ${RESOURCE_OPTIMIZER_SOURCE_DIR}/memory/swap)
+
+#resource-limiter source folders
+SET(RESOURCE_LIMITER_SOURCE_DIR                     ${SOURCE_DIR}/resource-limiter)
+SET(FREEZER_SOURCE_DIR                              ${RESOURCE_LIMITER_SOURCE_DIR}/freezer)
+SET(MEMORY_LIMITER_SOURCE_DIR                       ${RESOURCE_LIMITER_SOURCE_DIR}/memory)
+SET(CPU_LIMITER_SOURCE_DIR                          ${RESOURCE_LIMITER_SOURCE_DIR}/cpu)
+
+#resource-monitor source folders
+SET(RESOURCE_MONITOR_SOURCE_DIR                     ${SOURCE_DIR}/resource-monitor)
+SET(CPU_MONITOR_SOURCE_DIR                          ${RESOURCE_MONITOR_SOURCE_DIR}/cpu)
+SET(MEMORY_MONITOR_SOURCE_DIR                       ${RESOURCE_MONITOR_SOURCE_DIR}/memory)
+SET(STORAGE_MONITOR_SOURCE_DIR                      ${RESOURCE_MONITOR_SOURCE_DIR}/storage)
+SET(DBUS_MONITOR_SOURCE_DIR                         ${RESOURCE_MONITOR_SOURCE_DIR})
+SET(BATTERY_MONITOR_SOURCE_DIR                      ${RESOURCE_MONITOR_SOURCE_DIR}/battery)
+SET(ABNORMAL_MONITOR_SOURCE_DIR                     ${RESOURCE_MONITOR_SOURCE_DIR}/abnormal)
+
+#process
+SET(PROCESS_SOURCE_DIR                              ${SOURCE_DIR}/process)
+SET(VIP_SOURCE_DIR                                  ${PROCESS_SOURCE_DIR}/vip)
+SET(BLOCK_SOURCE_DIR                                ${PROCESS_SOURCE_DIR}/block)
+SET(WATCHDOG_SOURCE_DIR                             ${PROCESS_SOURCE_DIR}/watchdog)
+SET(PRIORITY_SOURCE_DIR                             ${PROCESS_SOURCE_DIR}/priority)
+
 
 INSTALL(FILES ${CMAKE_SOURCE_DIR}/resourced.conf DESTINATION /etc/dbus-1/system.d)
 

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 6c1e603..9aa8f8d 100644 (file)
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -29,6 +29,18 @@ INCLUDE(GNUInstallDirs)
 FILE(GLOB FILES "${PROCESS_SOURCE_DIR}/*.c")
 SET(RESOURCED_SHARED_SOURCES ${RESOURCED_SHARED_SOURCES} ${FILES})
 
+FILE(GLOB FILES "${BLOCK_SOURCE_DIR}/*.c")
+SET(RESOURCED_SHARED_SOURCES ${RESOURCED_SHARED_SOURCES} ${FILES})
+
+FILE(GLOB FILES "${WATCHDOG_SOURCE_DIR}/*.c")
+SET(RESOURCED_SHARED_SOURCES ${RESOURCED_SHARED_SOURCES} ${FILES})
+
+FILE(GLOB FILES "${PRIORITY_SOURCE_DIR}/*.c")
+SET(RESOURCED_SHARED_SOURCES ${RESOURCED_SHARED_SOURCES} ${FILES})
+
+FILE(GLOB FILES "${VIP_SOURCE_DIR}/*.c")
+SET(RESOURCED_SHARED_SOURCES ${RESOURCED_SHARED_SOURCES} ${FILES})
+
 FILE(GLOB FILES "${COMMON_SOURCE_DIR}/*.c")
 SET(RESOURCED_SHARED_SOURCES ${RESOURCED_SHARED_SOURCES} ${FILES})
 
@@ -36,12 +48,13 @@ SET(CMAKE_EXTRA_INCLUDE_FILES unistd.h)
 
 INCLUDE_DIRECTORIES(${RESOURCED_INCLUDEDIR}
   ${RESOURCED_SOURCE_DIR}
-  ${HEART_SOURCE_DIR}/include
-  ${CPU_SOURCE_DIR}
-  ${MEMORY_SOURCE_DIR}
-  ${PROCESS_SOURCE_DIR}/include
-  ${BLOCK_SOURCE_DIR}/include
-  ${FREEZER_SOURCE_DIR}/include
+  ${RESOURCE_MONITOR_SOURCE_DIR}
+  ${CPU_LIMITER_SOURCE_DIR}
+  ${MEMORY_LIMITER_SOURCE_DIR}
+  #${MEMORY_LIMITER_SOURCE_DIR}/include
+  ${PROCESS_SOURCE_DIR}
+  ${BLOCK_SOURCE_DIR}
+  ${FREEZER_SOURCE_DIR}
 )
 
 
@@ -53,14 +66,14 @@ ENDIF()
 
 #memory module
 IF("${MEMORY_MODULE}" STREQUAL "ON")
-  FILE(GLOB FILES "${MEMORY_SOURCE_DIR}/*.c")
+  FILE(GLOB FILES "${MEMORY_LIMITER_SOURCE_DIR}/*.c")
   FOREACH(FILE ${FILES})
       SET(SOURCES ${SOURCES} ${FILE})
   ENDFOREACH()
 ENDIF()
 
 IF("${CPU_MODULE}" STREQUAL "ON")
-  FILE(GLOB FILES "${CPU_SOURCE_DIR}/*.c")
+  FILE(GLOB FILES "${CPU_LIMITER_SOURCE_DIR}/*.c")
   FOREACH(FILE ${FILES})
       SET(SOURCES ${SOURCES} ${FILE})
   ENDFOREACH()
@@ -98,7 +111,7 @@ CONFIGURE_FILE(${INCLUDE_COMMON_DIR}/config.h.in
   ${INCLUDE_COMMON_DIR}/config.h)
 
 # resourced internal private API
-FILE(GLOB FILES "${INCLUDE_COMMON_DIR}/*.h" "${INCLUDE_PUBLIC_DIR}/*.h" "${PROCESS_SOURCE_DIR}/include/*.h" "${RESOURCED_SOURCE_DIR}/*.h")
+FILE(GLOB FILES "${INCLUDE_COMMON_DIR}/*.h" "${INCLUDE_PUBLIC_DIR}/*.h" "${PROCESS_SOURCE_DIR}/*.h" "${RESOURCED_SOURCE_DIR}/*.h")
 FOREACH(FILE ${FILES})
   SET(RESOURCED_HEADERS ${RESOURCED_HEADERS} ${FILE})
 ENDFOREACH()
@@ -140,19 +153,19 @@ INSTALL(TARGETS dedup DESTINATION ${MAKE_INSTALL_PREFIX}${RD_PLUGIN_PATH})
 INSTALL(FILES ${DEDUP_SOURCE_DIR}/dedup.conf DESTINATION ${RD_CONFIG_PATH})
 
 ADD_LIBRARY(heart MODULE
-       ${HEART_SOURCE_DIR}/heart.c
-       ${HEART_SOURCE_DIR}/heart-abnormal.c
-       ${HEART_SOURCE_DIR}/heart-battery.c
-       ${HEART_SOURCE_DIR}/heart-cpu.c
-       ${HEART_SOURCE_DIR}/heart-dbus.c
-       ${HEART_SOURCE_DIR}/heart-memory.c
-       ${HEART_SOURCE_DIR}/heart-storage.c
-       ${HEART_SOURCE_DIR}/logging.c)
+       ${RESOURCE_MONITOR_SOURCE_DIR}/heart.c
+       ${ABNORMAL_MONITOR_SOURCE_DIR}/heart-abnormal.c
+       ${BATTERY_MONITOR_SOURCE_DIR}/heart-battery.c
+       ${CPU_MONITOR_SOURCE_DIR}/heart-cpu.c
+       ${DBUS_MONITOR_SOURCE_DIR}/heart-dbus.c
+       ${MEMORY_MONITOR_SOURCE_DIR}/heart-memory.c
+       ${STORAGE_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})
-INSTALL(FILES ${HEART_SOURCE_DIR}/heart.conf DESTINATION ${RD_CONFIG_PATH})
-CONFIGURE_FILE(${HEART_SOURCE_DIR}/dump_heart_data.sh.in ${HEART_SOURCE_DIR}/dump_heart_data.sh @ONLY)
-INSTALL(FILES ${HEART_SOURCE_DIR}/dump_heart_data.sh DESTINATION ${RD_SYS_ETC}/dump.d/module.d)
+INSTALL(FILES ${RESOURCE_MONITOR_SOURCE_DIR}/heart.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)
 
 ADD_EXECUTABLE(${RD_BINARY_NAME}
   ${RESOURCED_SOURCE_DIR}/init.c
@@ -203,15 +216,15 @@ INSTALL(TARGETS ${RD_BINARY_NAME}
   PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE WORLD_EXECUTE)
 
 IF("${MEMORY_MODULE}" STREQUAL "ON")
-       INSTALL(FILES ${MEMORY_SOURCE_DIR}/memory.conf DESTINATION ${RD_CONFIG_PATH})
-       INSTALL(FILES ${MEMORY_SOURCE_DIR}/memory-tv.conf DESTINATION ${RD_CONFIG_PATH})
-       INSTALL(FILES ${MEMORY_SOURCE_DIR}/memory-iot-headless.conf DESTINATION ${RD_CONFIG_PATH})
+       INSTALL(FILES ${MEMORY_LIMITER_SOURCE_DIR}/memory.conf DESTINATION ${RD_CONFIG_PATH})
+       INSTALL(FILES ${MEMORY_LIMITER_SOURCE_DIR}/memory-tv.conf DESTINATION ${RD_CONFIG_PATH})
+       INSTALL(FILES ${MEMORY_LIMITER_SOURCE_DIR}/memory-iot-headless.conf DESTINATION ${RD_CONFIG_PATH})
 ENDIF()
 
 IF("${CPU_MODULE}" STREQUAL "ON")
-  INSTALL(FILES ${CPU_SOURCE_DIR}/cpu.conf
+  INSTALL(FILES ${CPU_LIMITER_SOURCE_DIR}/cpu.conf
          DESTINATION ${RD_CONFIG_PATH} RENAME cpu.conf)
-  INSTALL(FILES ${CPU_SOURCE_DIR}/cpu-sched.conf
+  INSTALL(FILES ${CPU_LIMITER_SOURCE_DIR}/cpu-sched.conf
          DESTINATION ${RD_CONFIG_PATH} RENAME cpu-sched.conf)
 ENDIF()
 

diff --git a/src/block/block-monitor.c b/src/process/block/block-monitor.c
similarity index 100%
rename from src/block/block-monitor.c
rename to src/process/block/block-monitor.c

diff --git a/src/block/block.c b/src/process/block/block.c
similarity index 100%
rename from src/block/block.c
rename to src/process/block/block.c

diff --git a/src/block/block.conf b/src/process/block/block.conf
similarity index 100%
rename from src/block/block.conf
rename to src/process/block/block.conf

diff --git a/src/block/include/block.h b/src/process/block/block.h
similarity index 100%
rename from src/block/include/block.h
rename to src/process/block/block.h

diff --git a/src/process/proc-priority.c b/src/process/priority/proc-priority.c
similarity index 100%
rename from src/process/proc-priority.c
rename to src/process/priority/proc-priority.c

diff --git a/src/process/include/proc-appusage.h b/src/process/proc-appusage.h
similarity index 100%
rename from src/process/include/proc-appusage.h
rename to src/process/proc-appusage.h

diff --git a/src/process/include/proc-handler.h b/src/process/proc-handler.h
similarity index 100%
rename from src/process/include/proc-handler.h
rename to src/process/proc-handler.h

diff --git a/src/process/include/proc-main.h b/src/process/proc-main.h
similarity index 100%
rename from src/process/include/proc-main.h
rename to src/process/proc-main.h

diff --git a/src/process/include/proc-monitor.h b/src/process/proc-monitor.h
similarity index 100%
rename from src/process/include/proc-monitor.h
rename to src/process/proc-monitor.h

diff --git a/src/process/include/proc-process.h b/src/process/proc-process.h
similarity index 100%
rename from src/process/include/proc-process.h
rename to src/process/proc-process.h

diff --git a/src/process/include/proc-usage-stats-helper.h b/src/process/proc-usage-stats-helper.h
similarity index 100%
rename from src/process/include/proc-usage-stats-helper.h
rename to src/process/proc-usage-stats-helper.h

diff --git a/src/process/include/proc-usage-stats.h b/src/process/proc-usage-stats.h
similarity index 100%
rename from src/process/include/proc-usage-stats.h
rename to src/process/proc-usage-stats.h

diff --git a/src/vip-process/vip-process.c b/src/process/vip/vip-process.c
similarity index 100%
rename from src/vip-process/vip-process.c
rename to src/process/vip/vip-process.c

diff --git a/src/vip-process/vip-process.h b/src/process/vip/vip-process.h
similarity index 100%
rename from src/vip-process/vip-process.h
rename to src/process/vip/vip-process.h

diff --git a/src/vip-process/vip-release-agent.c b/src/process/vip/vip-release-agent.c
similarity index 100%
rename from src/vip-process/vip-release-agent.c
rename to src/process/vip/vip-release-agent.c

diff --git a/src/process/proc-watchdog.c b/src/process/watchdog/proc-watchdog.c
similarity index 100%
rename from src/process/proc-watchdog.c
rename to src/process/watchdog/proc-watchdog.c

diff --git a/src/cpu/cpu-hotplug.c b/src/resource-limiter/cpu/cpu-hotplug.c
similarity index 100%
rename from src/cpu/cpu-hotplug.c
rename to src/resource-limiter/cpu/cpu-hotplug.c

diff --git a/src/cpu/cpu-hotplug.h b/src/resource-limiter/cpu/cpu-hotplug.h
similarity index 100%
rename from src/cpu/cpu-hotplug.h
rename to src/resource-limiter/cpu/cpu-hotplug.h

diff --git a/src/cpu/cpu-sched.c b/src/resource-limiter/cpu/cpu-sched.c
similarity index 100%
rename from src/cpu/cpu-sched.c
rename to src/resource-limiter/cpu/cpu-sched.c

diff --git a/src/cpu/cpu-sched.conf b/src/resource-limiter/cpu/cpu-sched.conf
similarity index 100%
rename from src/cpu/cpu-sched.conf
rename to src/resource-limiter/cpu/cpu-sched.conf

diff --git a/src/cpu/cpu.c b/src/resource-limiter/cpu/cpu.c
similarity index 100%
rename from src/cpu/cpu.c
rename to src/resource-limiter/cpu/cpu.c

diff --git a/src/cpu/cpu.conf b/src/resource-limiter/cpu/cpu.conf
similarity index 100%
rename from src/cpu/cpu.conf
rename to src/resource-limiter/cpu/cpu.conf

diff --git a/src/freezer/freezer.c b/src/resource-limiter/freezer/freezer.c
similarity index 100%
rename from src/freezer/freezer.c
rename to src/resource-limiter/freezer/freezer.c

diff --git a/src/freezer/include/freezer.h b/src/resource-limiter/freezer/freezer.h
similarity index 100%
rename from src/freezer/include/freezer.h
rename to src/resource-limiter/freezer/freezer.h

diff --git a/src/memory/compaction.c b/src/resource-limiter/memory/compaction.c
similarity index 100%
rename from src/memory/compaction.c
rename to src/resource-limiter/memory/compaction.c

diff --git a/src/memory/lowmem-dbus.c b/src/resource-limiter/memory/lowmem-dbus.c
similarity index 100%
rename from src/memory/lowmem-dbus.c
rename to src/resource-limiter/memory/lowmem-dbus.c

diff --git a/src/memory/lowmem-handler.h b/src/resource-limiter/memory/lowmem-handler.h
similarity index 100%
rename from src/memory/lowmem-handler.h
rename to src/resource-limiter/memory/lowmem-handler.h

diff --git a/src/memory/lowmem-limit.c b/src/resource-limiter/memory/lowmem-limit.c
similarity index 100%
rename from src/memory/lowmem-limit.c
rename to src/resource-limiter/memory/lowmem-limit.c

diff --git a/src/memory/lowmem-system.c b/src/resource-limiter/memory/lowmem-system.c
similarity index 100%
rename from src/memory/lowmem-system.c
rename to src/resource-limiter/memory/lowmem-system.c

diff --git a/src/memory/memcontrol.c b/src/resource-limiter/memory/memcontrol.c
similarity index 100%
rename from src/memory/memcontrol.c
rename to src/resource-limiter/memory/memcontrol.c

diff --git a/src/memory/memory-iot-headless.conf b/src/resource-limiter/memory/memory-iot-headless.conf
similarity index 100%
rename from src/memory/memory-iot-headless.conf
rename to src/resource-limiter/memory/memory-iot-headless.conf

diff --git a/src/memory/memory-tv.conf b/src/resource-limiter/memory/memory-tv.conf
similarity index 100%
rename from src/memory/memory-tv.conf
rename to src/resource-limiter/memory/memory-tv.conf

diff --git a/src/memory/memory.conf b/src/resource-limiter/memory/memory.conf
similarity index 100%
rename from src/memory/memory.conf
rename to src/resource-limiter/memory/memory.conf

diff --git a/src/memory/vmpressure-lowmem-handler.c b/src/resource-limiter/memory/vmpressure-lowmem-handler.c
similarity index 100%
rename from src/memory/vmpressure-lowmem-handler.c
rename to src/resource-limiter/memory/vmpressure-lowmem-handler.c

diff --git a/src/heart/heart-abnormal.c b/src/resource-monitor/abnormal/heart-abnormal.c
similarity index 100%
rename from src/heart/heart-abnormal.c
rename to src/resource-monitor/abnormal/heart-abnormal.c

diff --git a/src/heart/heart-battery.c b/src/resource-monitor/battery/heart-battery.c
similarity index 100%
rename from src/heart/heart-battery.c
rename to src/resource-monitor/battery/heart-battery.c

diff --git a/src/heart/heart-cpu.c b/src/resource-monitor/cpu/heart-cpu.c
similarity index 100%
rename from src/heart/heart-cpu.c
rename to src/resource-monitor/cpu/heart-cpu.c

diff --git a/src/heart/dump_heart_data.sh.in b/src/resource-monitor/dump_heart_data.sh.in
similarity index 100%
rename from src/heart/dump_heart_data.sh.in
rename to src/resource-monitor/dump_heart_data.sh.in

diff --git a/src/heart/heart-dbus.c b/src/resource-monitor/heart-dbus.c
similarity index 100%
rename from src/heart/heart-dbus.c
rename to src/resource-monitor/heart-dbus.c

diff --git a/src/heart/heart.c b/src/resource-monitor/heart.c
similarity index 100%
rename from src/heart/heart.c
rename to src/resource-monitor/heart.c

diff --git a/src/heart/heart.conf b/src/resource-monitor/heart.conf
similarity index 100%
rename from src/heart/heart.conf
rename to src/resource-monitor/heart.conf

diff --git a/src/heart/include/heart.h b/src/resource-monitor/heart.h
similarity index 100%
rename from src/heart/include/heart.h
rename to src/resource-monitor/heart.h

diff --git a/src/heart/logging.c b/src/resource-monitor/logging.c
similarity index 100%
rename from src/heart/logging.c
rename to src/resource-monitor/logging.c

diff --git a/src/heart/include/logging.h b/src/resource-monitor/logging.h
similarity index 100%
rename from src/heart/include/logging.h
rename to src/resource-monitor/logging.h

diff --git a/src/heart/heart-memory.c b/src/resource-monitor/memory/heart-memory.c
similarity index 100%
rename from src/heart/heart-memory.c
rename to src/resource-monitor/memory/heart-memory.c

diff --git a/src/heart/heart-storage.c b/src/resource-monitor/storage/heart-storage.c
similarity index 100%
rename from src/heart/heart-storage.c
rename to src/resource-monitor/storage/heart-storage.c

diff --git a/src/dedup/dedup.c b/src/resource-optimizer/memory/dedup/dedup.c
similarity index 100%
rename from src/dedup/dedup.c
rename to src/resource-optimizer/memory/dedup/dedup.c

diff --git a/src/dedup/dedup.conf b/src/resource-optimizer/memory/dedup/dedup.conf
similarity index 100%
rename from src/dedup/dedup.conf
rename to src/resource-optimizer/memory/dedup/dedup.conf

diff --git a/src/swap/fileswap.c b/src/resource-optimizer/memory/swap/fileswap.c
similarity index 100%
rename from src/swap/fileswap.c
rename to src/resource-optimizer/memory/swap/fileswap.c

diff --git a/src/swap/swap.c b/src/resource-optimizer/memory/swap/swap.c
similarity index 100%
rename from src/swap/swap.c
rename to src/resource-optimizer/memory/swap/swap.c

diff --git a/src/swap/swap.conf b/src/resource-optimizer/memory/swap/swap.conf
similarity index 100%
rename from src/swap/swap.conf
rename to src/resource-optimizer/memory/swap/swap.conf

diff --git a/src/swap/zramswap.c b/src/resource-optimizer/memory/swap/zramswap.c
similarity index 100%
rename from src/swap/zramswap.c
rename to src/resource-optimizer/memory/swap/zramswap.c

diff --git a/src/swap/zswap.c b/src/resource-optimizer/memory/swap/zswap.c
similarity index 100%
rename from src/swap/zswap.c
rename to src/resource-optimizer/memory/swap/zswap.c

diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
index 654e761..7e103b4 100644 (file)
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -40,11 +40,11 @@ SET(UNIT_TESTS_CFLAGS "-O0 -D_UNIT_TEST -D_GNU_SOURCE ${GLIB2_CFLAGS}")
 SET(UNIT_TESTS_CFLAGS "${UNIT_TESTS_CFLAGS} -I${COMMON_SOURCE_DIR}")
 SET(UNIT_TESTS_CFLAGS "${UNIT_TESTS_CFLAGS} -I${INCLUDE_COMMON_DIR}")
 SET(UNIT_TESTS_CFLAGS "${UNIT_TESTS_CFLAGS} -I${INCLUDE_PUBLIC_DIR}")
-SET(UNIT_TESTS_CFLAGS "${UNIT_TESTS_CFLAGS} -I${BLOCK_SOURCE_DIR}/include")
-SET(UNIT_TESTS_CFLAGS "${UNIT_TESTS_CFLAGS} -I${FREEZER_SOURCE_DIR}/include")
-SET(UNIT_TESTS_CFLAGS "${UNIT_TESTS_CFLAGS} -I${HEART_SOURCE_DIR}/include")
-SET(UNIT_TESTS_CFLAGS "${UNIT_TESTS_CFLAGS} -I${MEMORY_SOURCE_DIR}")
-SET(UNIT_TESTS_CFLAGS "${UNIT_TESTS_CFLAGS} -I${PROCESS_SOURCE_DIR}/include")
+SET(UNIT_TESTS_CFLAGS "${UNIT_TESTS_CFLAGS} -I${BLOCK_SOURCE_DIR}")
+SET(UNIT_TESTS_CFLAGS "${UNIT_TESTS_CFLAGS} -I${FREEZER_SOURCE_DIR}")
+SET(UNIT_TESTS_CFLAGS "${UNIT_TESTS_CFLAGS} -I${RESOURCE_MONITOR_SOURCE_DIR}")
+SET(UNIT_TESTS_CFLAGS "${UNIT_TESTS_CFLAGS} -I${MEMORY_LIMITER_SOURCE_DIR}")
+SET(UNIT_TESTS_CFLAGS "${UNIT_TESTS_CFLAGS} -I${PROCESS_SOURCE_DIR}")
 SET(UNIT_TESTS_CFLAGS "${UNIT_TESTS_CFLAGS} -I${RESOURCED_SOURCE_DIR}")
 SET(UNIT_TESTS_CFLAGS "${UNIT_TESTS_CFLAGS} -I${VIP_SOURCE_DIR}")
 SET(UNIT_TESTS_CFLAGS "${UNIT_TESTS_CFLAGS} -Wno-psabi")
@@ -117,7 +117,7 @@ function(ADD_MEMORY_TESTS name libs wraps sources)
        TARGET_INCLUDE_DIRECTORIES(${name}
                                   PRIVATE ${COMMON_SOURCE_DIR}
                                                                   ../include
-                                                                  ../src/memory
+                                                                  ../src/resource-limiter/memory
                                                                   ../src/resourced
                                                                   ../src/common
                                   PUBLIC ${RESOURCED_REQUIRE_PKGS_INCLUDE_DIRS})
@@ -131,16 +131,16 @@ ADD_MEMORY_TESTS(lowmem-limit-test "${GLIB2_LDFLAGS}"
                       "-Wl,--wrap=kill,--wrap=read,--wrap=access"
                lowmem-limit-test.cpp lowmem-limit-mock.cpp lowmem-limit-env.cpp lowmem-env.cpp lowmem-env-mock.cpp
                ../src/common/safe-kill.c
-               ../src/memory/lowmem-limit.c)
+               ../src/resource-limiter/memory/lowmem-limit.c)
 # lowmem-system unit test
 ADD_MEMORY_TESTS(lowmem-system-test "${GLIB2_LDFLAGS}"
                       "-Wl,--wrap=opendir,--wrap=readdir,--wrap=closedir,--wrap=opendir64,--wrap=readdir64,--wrap=closedir64"
                lowmem-system-test.cpp lowmem-system-mock.cpp lowmem-system-env.cpp lowmem-env.cpp lowmem-env-mock.cpp
-                          ../src/memory/lowmem-system.c)
+                          ../src/resource-limiter/memory/lowmem-system.c)
 # lowmem-dbus unit test
 ADD_MEMORY_TESTS(lowmem-dbus-test "${GLIB2_LDFLAGS}" ""
                lowmem-dbus-test.cpp lowmem-dbus-mock.cpp lowmem-dbus-env.cpp lowmem-env.cpp lowmem-env-mock.cpp
-                          ../src/memory/lowmem-dbus.c)
+                          ../src/resource-limiter/memory/lowmem-dbus.c)
 
 INSTALL(TARGETS watchdog-test
   DESTINATION ${RD_TESTS_PATH})