process: rename proc-stat to process

Change-Id: I546adc6e84d0995450ef85f4f7e6e79a8b18ea14
Signed-off-by: Youngjae Cho <y0.cho@samsung.com>

diff --git a/CMakeLists.txt b/CMakeLists.txt
index eb187d7..81c6fc0 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -45,7 +45,7 @@ SET(RESOURCED_INCLUDEDIR        ${INCLUDE_COMMON_DIR} ${INCLUDE_PUBLIC_DIR})
 
 SET(SOURCE_DIR                  ${CMAKE_SOURCE_DIR}/src)
 SET(RESOURCED_SOURCE_DIR        ${SOURCE_DIR}/resourced)
-SET(PROC-STAT_SOURCE_DIR        ${SOURCE_DIR}/proc-stat)
+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)

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 4c6a6c7..9ebf3df 100644 (file)
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -20,11 +20,17 @@ INCLUDE(GNUInstallDirs)
 # PROCESS_GPERF(${COMMON_SOURCE_DIR}/cgroup-memory-stat-lookup.gperf ${COMMON_SOURCE_DIR}/cgroup-memory-stat-lookup.c)
 # PROCESS_GPERF(${COMMON_SOURCE_DIR}/meminfo-lookup.gperf ${COMMON_SOURCE_DIR}/meminfo-lookup.c)
 
-SET(RESOURCED_SHARED_SOURCES ${RESOURCED_SHARED_SOURCES}
-  ${COMMON_SOURCE_DIR}/smaps-lookup.c
-  ${COMMON_SOURCE_DIR}/cgroup-memory-stat-lookup.c
-  ${COMMON_SOURCE_DIR}/meminfo-lookup.c
-  )
+#SET(RESOURCED_SHARED_SOURCES ${RESOURCED_SHARED_SOURCES}
+#  ${COMMON_SOURCE_DIR}/smaps-lookup.c
+#  ${COMMON_SOURCE_DIR}/cgroup-memory-stat-lookup.c
+#  ${COMMON_SOURCE_DIR}/meminfo-lookup.c
+#  )
+
+FILE(GLOB FILES "${PROCESS_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})
 
 SET(CMAKE_EXTRA_INCLUDE_FILES unistd.h)
 
@@ -33,23 +39,11 @@ INCLUDE_DIRECTORIES(${RESOURCED_INCLUDEDIR}
   ${HEART_SOURCE_DIR}/include
   ${CPU_SOURCE_DIR}
   ${MEMORY_SOURCE_DIR}
-  ${PROC-STAT_SOURCE_DIR}/include
+  ${PROCESS_SOURCE_DIR}/include
   ${BLOCK_SOURCE_DIR}/include
   ${FREEZER_SOURCE_DIR}/include
 )
 
-SET(RESOURCED_SHARED_SOURCES ${RESOURCED_SHARED_SOURCES}
-  ${PROC-STAT_SOURCE_DIR}/proc-handler.c
-  ${PROC-STAT_SOURCE_DIR}/proc-main.c
-  ${PROC-STAT_SOURCE_DIR}/proc-process.c
-  ${PROC-STAT_SOURCE_DIR}/proc-monitor.c
-  ${PROC-STAT_SOURCE_DIR}/proc-usage-stats.c
-  ${PROC-STAT_SOURCE_DIR}/proc-usage-stats-helper.c
-  ${PROC-STAT_SOURCE_DIR}/proc-appusage.c
-  ${PROC-STAT_SOURCE_DIR}/proc-priority.c
-  ${PROC-STAT_SOURCE_DIR}/proc-watchdog.c
-)
-
 
 IF("${VIP_AGENT}" STREQUAL "ON")
   SET(SOURCES ${SOURCES}
@@ -102,16 +96,11 @@ 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" "${PROC-STAT_SOURCE_DIR}/include/*.h" "${RESOURCED_SOURCE_DIR}/*.h")
+FILE(GLOB FILES "${INCLUDE_COMMON_DIR}/*.h" "${INCLUDE_PUBLIC_DIR}/*.h" "${PROCESS_SOURCE_DIR}/include/*.h" "${RESOURCED_SOURCE_DIR}/*.h")
 FOREACH(FILE ${FILES})
   SET(RESOURCED_HEADERS ${RESOURCED_HEADERS} ${FILE})
 ENDFOREACH()
 
-FILE(GLOB FILES "${COMMON_SOURCE_DIR}/*.c")
-FOREACH(FILE ${FILES})
-  SET(RESOURCED_SHARED_SOURCES ${RESOURCED_SHARED_SOURCES} ${FILE})
-ENDFOREACH()
-
 ADD_LIBRARY(resourced-private-api SHARED ${RESOURCED_SHARED_SOURCES})
 
 TARGET_LINK_LIBRARIES(resourced-private-api ${RESOURCED_REQUIRE_PKGS_LDFLAGS})
@@ -235,7 +224,7 @@ IF("${VIP_AGENT}" STREQUAL "ON")
   INSTALL(FILES ${VIP_SOURCE_DIR}/vip-process-iot-headless.conf DESTINATION ${RD_CONFIG_PATH})
 ENDIF()
 
-INSTALL(FILES ${PROC-STAT_SOURCE_DIR}/proc.conf
+INSTALL(FILES ${PROCESS_SOURCE_DIR}/proc.conf
        DESTINATION ${RD_CONFIG_PATH} RENAME proc.conf)
 
 IF("${MEM_STRESS}" STREQUAL "ON")

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
index c800f41..654e761 100644 (file)
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -44,7 +44,7 @@ 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${PROC-STAT_SOURCE_DIR}/include")
+SET(UNIT_TESTS_CFLAGS "${UNIT_TESTS_CFLAGS} -I${PROCESS_SOURCE_DIR}/include")
 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")