From 208c456922dd6e740e7bbf888ace74757e08a7db Mon Sep 17 00:00:00 2001 From: Sung-hun Kim Date: Tue, 25 Jun 2024 10:49:27 +0900 Subject: [PATCH] memory: Rename paths, enums, and macros in the dedup module Signed-off-by: Sung-hun Kim --- src/common/conf/dedup-common.c | 2 +- src/common/conf/dedup-common.h | 6 +++--- src/resource-limiter/memory/lowmem-controller.c | 2 +- src/resource-optimizer/memory/dedup.c | 24 ++++++++++++------------ 4 files changed, 17 insertions(+), 17 deletions(-) diff --git a/src/common/conf/dedup-common.c b/src/common/conf/dedup-common.c index c45be8c..ee2b3ea 100644 --- a/src/common/conf/dedup-common.c +++ b/src/common/conf/dedup-common.c @@ -56,7 +56,7 @@ enum dedup_state dedup_get_state(void) void dedup_set_state(enum dedup_state state) { if ((state != DEDUP_ON) && (state != DEDUP_OFF) && - state != DEDUP_ONE_SHOT) + state != DEDUP_ON_DEMAND) return; dedup_state = state; diff --git a/src/common/conf/dedup-common.h b/src/common/conf/dedup-common.h index be10294..93b4db3 100644 --- a/src/common/conf/dedup-common.h +++ b/src/common/conf/dedup-common.h @@ -38,20 +38,20 @@ extern "C" { /* KSM operations */ #define DEDUP_SYSFS_KSM_RUN "/sys/kernel/mm/ksm/run" -#define DEDUP_SYSFS_KSM_ONESHOT "/sys/kernel/mm/ksm/one_shot_scanning" +#define DEDUP_SYSFS_KSM_TRIGGER "/sys/kernel/mm/ksm/on_demand_scanning_trigger" enum dedup_state { DEDUP_ARG_START = -1, DEDUP_OFF, DEDUP_ON, - DEDUP_ONE_SHOT, + DEDUP_ON_DEMAND, DEDUP_ARG_END, }; enum dedup_mode { DEDUP_MODE_NONE = 0, DEDUP_MODE_PERIODIC, - DEDUP_MODE_ONESHOT, + DEDUP_MODE_ON_DEMAND, DEDUP_MODE_MAX, }; diff --git a/src/resource-limiter/memory/lowmem-controller.c b/src/resource-limiter/memory/lowmem-controller.c index 379257a..5fb3be6 100644 --- a/src/resource-limiter/memory/lowmem-controller.c +++ b/src/resource-limiter/memory/lowmem-controller.c @@ -208,7 +208,7 @@ static int lowmem_controller_kill_candidates(GArray *candidates, static int dedup_prepare(void) { - if (dedup_get_state() != DEDUP_ONE_SHOT) + if (dedup_get_state() != DEDUP_ON_DEMAND) return RESOURCED_ERROR_FAIL; if (proc_get_freezer_status() == CGROUP_FREEZER_PAUSED) diff --git a/src/resource-optimizer/memory/dedup.c b/src/resource-optimizer/memory/dedup.c index 1ad966d..d0819d5 100644 --- a/src/resource-optimizer/memory/dedup.c +++ b/src/resource-optimizer/memory/dedup.c @@ -131,7 +131,7 @@ static const char *ksm_stat_path[2] = { enum ksm_sysfs_state_val { DEDUP_SYSFS_STOP = 0, DEDUP_SYSFS_RUN = 1, - DEDUP_SYSFS_ONE_SHOT = 8, + DEDUP_SYSFS_ON_DEMAND = 8, }; static inline int dedup_set_ksm_state(enum dedup_state state) @@ -140,8 +140,8 @@ static inline int dedup_set_ksm_state(enum dedup_state state) if (state == DEDUP_ON) val = DEDUP_SYSFS_RUN; - else if (state == DEDUP_ONE_SHOT) - val = DEDUP_SYSFS_ONE_SHOT; + else if (state == DEDUP_ON_DEMAND) + val = DEDUP_SYSFS_ON_DEMAND; else val = DEDUP_SYSFS_STOP; /* write value to /sys/kernel/mm/ksm/run */ @@ -163,9 +163,9 @@ static void dedup_set_ksm_params(void) static int dedup_check_and_scanning_once(enum ksm_scan_mode mode) { int val; - fread_int(DEDUP_SYSFS_KSM_ONESHOT, &val); + fread_int(DEDUP_SYSFS_KSM_TRIGGER, &val); if (val == KSM_SCAN_NONE) - return fwrite_int(DEDUP_SYSFS_KSM_ONESHOT, mode); + return fwrite_int(DEDUP_SYSFS_KSM_TRIGGER, mode); return 0; } @@ -208,7 +208,7 @@ static int dedup_record_stat(void) static gboolean dedup_scanning_timer_cb(gpointer data) { dedup_scanning_timer = NULL; - if (dedup_get_state() == DEDUP_ONE_SHOT) + if (dedup_get_state() == DEDUP_ON_DEMAND) dedup_do_scan(KSM_SCAN_FULL); return false; } @@ -266,8 +266,8 @@ static enum dedup_state parse_dedup_state(enum dedup_mode mode) { if (mode == DEDUP_MODE_PERIODIC) return DEDUP_ON; - else if (mode == DEDUP_MODE_ONESHOT) - return DEDUP_ONE_SHOT; + else if (mode == DEDUP_MODE_ON_DEMAND) + return DEDUP_ON_DEMAND; else return DEDUP_OFF; } @@ -277,7 +277,7 @@ static void dedup_activate_in_module(void) enum dedup_state state; if (dedup_get_state() == DEDUP_ON - || dedup_get_state() == DEDUP_ONE_SHOT) + || dedup_get_state() == DEDUP_ON_DEMAND) return; if (dedup_activated) @@ -385,7 +385,7 @@ static int dedup_scan_handler(void *data) { int *scan_mode; - if (dedup_get_state() != DEDUP_ONE_SHOT) + if (dedup_get_state() != DEDUP_ON_DEMAND) return 0; if (dedup_scanning_timer) { @@ -456,7 +456,7 @@ static int dedup_parse_config_file(void) goto free_dedup_conf; if (!strncmp(dedup_conf->ksm.mode, "oneshot", 8)) - dedup_mode = DEDUP_MODE_ONESHOT; + dedup_mode = DEDUP_MODE_ON_DEMAND; else if(!strncmp(dedup_conf->ksm.mode, "periodic", 9)) dedup_mode = DEDUP_MODE_PERIODIC; else { @@ -544,7 +544,7 @@ static int resourced_dedup_check_runtime_support(void *data) _I("the kernel doesn't support KSM, please check kernel configuration"); return -ENOENT; } - if (access("/sys/kernel/mm/ksm/one_shot_scanning", R_OK) != 0) { + if (access("/sys/kernel/mm/ksm/on_demand_scanning_trigger", R_OK) != 0) { _I("the kernel support KSM but not LKSM, please check kernel configuration"); return -ENOENT; } -- 2.7.4