lowmem-controller: Move high memory action from lowmem to controller

For modulization, high memory action is moved from lowmem.c(core) to
lowmem-controller.c(controller) and this high memory action will be
assigned to lowmem.c by the initializer of controller.

Change-Id: Ic0f25890ff5372bfde5471bac27c441f19213960
Signed-off-by: SangYoun Kwak <sy.kwak@samsung.com>

diff --git a/src/resource-limiter/memory/lowmem-controller.c b/src/resource-limiter/memory/lowmem-controller.c
index 74f982c..db2c9e3 100644 (file)
--- a/src/resource-limiter/memory/lowmem-controller.c
+++ b/src/resource-limiter/memory/lowmem-controller.c
@@ -23,6 +23,9 @@
 
 #include <string.h>
 #include <limits.h>
+#include <vconf.h>
+#include <bundle.h>
+#include <eventsystem.h>
 
 #include "lowmem.h"
 #include "proc-common.h"
@@ -33,6 +36,9 @@
 #include "util.h"
 #include "safe-kill.h"
 #include "module.h"
+#include "notifier.h"
+#include "freezer.h"
+#include "swap-common.h"
 
 #define MAX_VICTIMS_BETWEEN_CHECK  3
 
@@ -193,9 +199,47 @@ static int lowmem_controller_kill_candidates(GArray *candidates,
        return victim_cnt;
 }
 
+/* lowmem actions */
+
+static int high_mem_act(void *data)
+{
+       int ret, status;
+
+       ret = vconf_get_int(VCONFKEY_SYSMAN_LOW_MEMORY, &status);
+       if (ret)
+               _D("vconf_get_int fail %s", VCONFKEY_SYSMAN_LOW_MEMORY);
+       if (status != VCONFKEY_SYSMAN_LOW_MEMORY_NORMAL) {
+               vconf_set_int(VCONFKEY_SYSMAN_LOW_MEMORY,
+                               VCONFKEY_SYSMAN_LOW_MEMORY_NORMAL);
+               lowmem_memory_level_send_system_event(MEM_LEVEL_HIGH);
+       }
+
+       lowmem_change_lowmem_state(MEM_LEVEL_HIGH);
+
+       if (swap_get_state() == SWAP_ON && lowmem_get_memcg_swap_status()) {
+               resourced_notify(RESOURCED_NOTIFIER_SWAP_UNSET_LIMIT, get_memcg_info(MEMCG_THROTTLING));
+               lowmem_set_memcg_swap_status(false);
+       }
+       if (proc_get_freezer_status() == CGROUP_FREEZER_PAUSED)
+               resourced_notify(RESOURCED_NOTIFIER_FREEZER_CGROUP_STATE,
+                       (void *)CGROUP_FREEZER_ENABLED);
+
+       return RESOURCED_ERROR_NONE;
+}
+
 static int lowmem_controller_initialize(void *data)
 {
+       /**
+        * FIXME: Consider to use one function to initialize the actions
+        * (killer for the lowmem killer and actions for the memory levels)
+        */
+
+       /* Initialize the action(killer) for the lowmem_worker(lowmem killer) */
        lowmem_initialize_kill_candidates(lowmem_controller_kill_candidates);
+
+       /* Initialize actions for the memory levels */
+       lowmem_initialize_controller_ops_action(MEM_LEVEL_HIGH, high_mem_act);
+
        return RESOURCED_ERROR_NONE;
 }
 

diff --git a/src/resource-limiter/memory/lowmem-governor.c b/src/resource-limiter/memory/lowmem-governor.c
index 0a7e800..c5e9e76 100644 (file)
--- a/src/resource-limiter/memory/lowmem-governor.c
+++ b/src/resource-limiter/memory/lowmem-governor.c
@@ -25,10 +25,26 @@
 
 #include "lowmem.h"
 #include "module.h"
+#include "memory-cgroup.h"
+
+static int mem_state_dummy_governor(void *data)
+{
+       return RESOURCED_ERROR_NONE;
+}
 
 static int lowmem_governor_initialize(void *data)
 {
+       /**
+        * FIXME: Consider to use one function to initialize the governors
+        * (governor for the lowmem killer and governors for the memory levels)
+        */
+
+       /* Initialize the governor for the lowmem_worker(lowmem killer) */
        lowmem_initialize_governor_ops(plugin_resourced_memory_lmk_get_kill_candidates);
+
+       /* Initialize governors for the memory levels */
+       lowmem_initialize_controller_ops_governor(MEM_LEVEL_HIGH, mem_state_dummy_governor);
+
        return RESOURCED_ERROR_NONE;
 }
 

diff --git a/src/resource-limiter/memory/lowmem.c b/src/resource-limiter/memory/lowmem.c
index 51e4059..da729a6 100644 (file)
--- a/src/resource-limiter/memory/lowmem.c
+++ b/src/resource-limiter/memory/lowmem.c
@@ -276,11 +276,35 @@ static void lowmem_request_destroy(gpointer data)
 
 /* low memory action function for cgroup */
 /* low memory action function */
-static void high_mem_act(void);
 static void swap_activate_act(void);
 static void swap_compact_act(void);
 static void lmk_act(void);
 
+struct lowmem_controller_ops {
+       int (*governor)(void *data);
+       int (*action)(void *data);
+};
+static struct lowmem_controller_ops lowmem_actions[MEM_LEVEL_MAX] = { NULL };
+void lowmem_initialize_controller_ops_governor(int mem_state, int (*governor)(void *data))
+{
+       switch (mem_state) {
+       case MEM_LEVEL_HIGH:
+               lowmem_actions[mem_state].governor = governor;
+               return;
+       default:
+               assert(0);
+       }
+}
+void lowmem_initialize_controller_ops_action(int mem_state, int (*action)(void *data))
+{
+       switch (mem_state) {
+       case MEM_LEVEL_HIGH:
+               lowmem_actions[mem_state].action = action;
+               return;
+       default:
+               assert(0);
+       }
+}
 
 static size_t cur_mem_state = MEM_LEVEL_HIGH;
 static int num_max_victims = MAX_MEMORY_CGROUP_VICTIMS;
@@ -291,6 +315,14 @@ static unsigned long totalram_kb;
 static bool oom_popup_enable;
 static bool oom_popup;
 static bool memcg_swap_status;
+bool lowmem_get_memcg_swap_status()
+{
+       return memcg_swap_status;
+}
+void lowmem_set_memcg_swap_status(bool status)
+{
+       memcg_swap_status = status;
+}
 static int fragmentation_size;
 
 const char *lowmem_convert_cgroup_type_to_str(int type)
@@ -911,7 +943,7 @@ process_again:
        pthread_exit(NULL);
 }
 
-static void change_lowmem_state(unsigned int mem_state)
+void lowmem_change_lowmem_state(unsigned int mem_state)
 {
        cur_mem_state = mem_state;
        lmk_start_threshold_mb = get_root_memcg_info()->threshold_mb[MEM_LEVEL_OOM];
@@ -978,7 +1010,7 @@ void lowmem_trigger_swap(pid_t pid, char *path, bool move)
        resourced_notify(RESOURCED_NOTIFIER_SWAP_START, path);
 }
 
-static void memory_level_send_system_event(int lv)
+void lowmem_memory_level_send_system_event(int lv)
 {
        bundle *b;
        const char *str;
@@ -1011,30 +1043,6 @@ static void memory_level_send_system_event(int lv)
        bundle_free(b);
 }
 
-static void high_mem_act(void)
-{
-       int ret, status;
-
-       ret = vconf_get_int(VCONFKEY_SYSMAN_LOW_MEMORY, &status);
-       if (ret)
-               _D("vconf_get_int fail %s", VCONFKEY_SYSMAN_LOW_MEMORY);
-       if (status != VCONFKEY_SYSMAN_LOW_MEMORY_NORMAL) {
-               vconf_set_int(VCONFKEY_SYSMAN_LOW_MEMORY,
-                             VCONFKEY_SYSMAN_LOW_MEMORY_NORMAL);
-               memory_level_send_system_event(MEM_LEVEL_HIGH);
-       }
-
-       change_lowmem_state(MEM_LEVEL_HIGH);
-
-       if (swap_get_state() == SWAP_ON && memcg_swap_status) {
-               resourced_notify(RESOURCED_NOTIFIER_SWAP_UNSET_LIMIT, get_memcg_info(MEMCG_THROTTLING));
-               memcg_swap_status = false;
-       }
-       if (proc_get_freezer_status() == CGROUP_FREEZER_PAUSED)
-               resourced_notify(RESOURCED_NOTIFIER_FREEZER_CGROUP_STATE,
-                       (void *)CGROUP_FREEZER_ENABLED);
-}
-
 static void swap_activate_act(void)
 {
        int ret, status;
@@ -1046,9 +1054,9 @@ static void swap_activate_act(void)
        if (status != VCONFKEY_SYSMAN_LOW_MEMORY_NORMAL) {
                vconf_set_int(VCONFKEY_SYSMAN_LOW_MEMORY,
                                VCONFKEY_SYSMAN_LOW_MEMORY_NORMAL);
-               memory_level_send_system_event(MEM_LEVEL_LOW);
+               lowmem_memory_level_send_system_event(MEM_LEVEL_LOW);
        }
-       change_lowmem_state(MEM_LEVEL_LOW);
+       lowmem_change_lowmem_state(MEM_LEVEL_LOW);
        if (proc_get_freezer_status() == CGROUP_FREEZER_PAUSED)
                resourced_notify(RESOURCED_NOTIFIER_FREEZER_CGROUP_STATE,
                        (void *)CGROUP_FREEZER_ENABLED);
@@ -1077,9 +1085,9 @@ static void dedup_act(enum ksm_scan_mode mode)
                if (status != VCONFKEY_SYSMAN_LOW_MEMORY_NORMAL) {
                        vconf_set_int(VCONFKEY_SYSMAN_LOW_MEMORY,
                                        VCONFKEY_SYSMAN_LOW_MEMORY_NORMAL);
-                       memory_level_send_system_event(MEM_LEVEL_MEDIUM);
+                       lowmem_memory_level_send_system_event(MEM_LEVEL_MEDIUM);
                }
-               change_lowmem_state(MEM_LEVEL_MEDIUM);
+               lowmem_change_lowmem_state(MEM_LEVEL_MEDIUM);
 
                data = KSM_SCAN_PARTIAL;
                resourced_notify(RESOURCED_NOTIFIER_DEDUP_SCAN, &data);
@@ -1091,9 +1099,9 @@ static void dedup_act(enum ksm_scan_mode mode)
 
 static void swap_compact_act(void)
 {
-       change_lowmem_state(MEM_LEVEL_CRITICAL);
+       lowmem_change_lowmem_state(MEM_LEVEL_CRITICAL);
        resourced_notify(RESOURCED_NOTIFIER_SWAP_COMPACT, (void *)SWAP_COMPACT_MEM_LEVEL_CRITICAL);
-       memory_level_send_system_event(MEM_LEVEL_CRITICAL);
+       lowmem_memory_level_send_system_event(MEM_LEVEL_CRITICAL);
 }
 
 static void medium_cb(struct lowmem_control *ctl)
@@ -1120,7 +1128,7 @@ static void lmk_act(void)
        if (ret)
                _D("vconf_get_int fail %s", VCONFKEY_SYSMAN_LOW_MEMORY);
 
-       memory_level_send_system_event(MEM_LEVEL_OOM);
+       lowmem_memory_level_send_system_event(MEM_LEVEL_OOM);
        if (status != VCONFKEY_SYSMAN_LOW_MEMORY_HARD_WARNING) {
                if (proc_get_freezer_status() == CGROUP_FREEZER_ENABLED)
                        resourced_notify(RESOURCED_NOTIFIER_FREEZER_CGROUP_STATE,
@@ -1130,7 +1138,7 @@ static void lmk_act(void)
        }
        available_mb = proc_get_mem_available();
 
-       change_lowmem_state(MEM_LEVEL_OOM);
+       lowmem_change_lowmem_state(MEM_LEVEL_OOM);
 
        if (available_mb < get_root_memcg_info()->threshold_leave_mb) {
                struct lowmem_control *ctl;
@@ -1167,7 +1175,11 @@ void lowmem_trigger_memory_state_action(int mem_state)
 
        switch (mem_state) {
        case MEM_LEVEL_HIGH:
-               high_mem_act();
+               assert(lowmem_actions[mem_state].governor != NULL);
+               assert(lowmem_actions[mem_state].action != NULL);
+               if (lowmem_actions[mem_state].governor(NULL) < 0)
+                       break;
+               lowmem_actions[mem_state].action(NULL);
                break;
        case MEM_LEVEL_MEDIUM:
                dedup_act(KSM_SCAN_PARTIAL);

diff --git a/src/resource-limiter/memory/lowmem.h b/src/resource-limiter/memory/lowmem.h
index c454a5c..4003e25 100644 (file)
--- a/src/resource-limiter/memory/lowmem.h
+++ b/src/resource-limiter/memory/lowmem.h
@@ -100,7 +100,12 @@ void lowmem_initialize_kill_candidates(int(*kill_candidates)(GArray *, unsigned,
                                                unsigned int, int, int, int *,
                                                unsigned int *, unsigned,
                                                void(*)(void)));
-
+void lowmem_initialize_controller_ops_governor(int mem_state, int (*governor)(void *data));
+void lowmem_initialize_controller_ops_action(int mem_state, int (*action)(void *data));
+void lowmem_change_lowmem_state(unsigned int mem_state);
+void lowmem_memory_level_send_system_event(int lv);
+bool lowmem_get_memcg_swap_status();
+void lowmem_set_memcg_swap_status(bool status);
 
 #ifdef __cplusplus
 }