util: kernel: export apis for getting memory info

Change-Id: Ibd7c78f61de9ffcc8b9635a42c779af550c61124
Signed-off-by: Dongwoo Lee <dwoo08.lee@samsung.com>

diff --git a/include/util/kernel.h b/include/util/kernel.h
index ad76c83..4596ff6 100644 (file)
--- a/include/util/kernel.h
+++ b/include/util/kernel.h
@@ -40,4 +40,7 @@ int kernel_get_possible_cpu_num(void);
 int kernel_get_total_cpu_stat(struct cpu_stat *total);
 int kernel_get_per_cpu_stat(struct cpu_stat *cpus, int num_possible_cpus,
                            int *num_online_cpus);
+
+int kernel_get_memory_info(const char *key);
+int kernel_get_memory_total(void);
 #endif

diff --git a/src/resource/resource-memory.c b/src/resource/resource-memory.c
index 15131b1..6338d7a 100644 (file)
--- a/src/resource/resource-memory.c
+++ b/src/resource/resource-memory.c
@@ -32,42 +32,18 @@
 
 #include <tmonitor/tmonitor.h>
 
-#define PROC_MEM_INFO_PATH "/proc/meminfo"
-#define PROC_MEM_INFO_MEM_TOTAL "MemTotal"
 #define PROC_MEM_INFO_MEM_AVAILABLE "MemAvailable"
 #define PROC_MEM_INFO_MEM_FREE "MemFree"
 
-static int __memory_read_val_from_proc_node(const char *key)
-{
-       int ret = -EINVAL;
-       char buf[BUFF_MAX];
-       char str[BUFF_MAX];
-       FILE *fp = NULL;
-
-       fp = fopen(PROC_MEM_INFO_PATH, "r");
-       if (!fp)
-               return -EIO;
-
-       while (fgets(buf, BUFF_MAX, fp)) {
-               if (!strncmp(buf, key, strlen(key))) {
-                       sscanf(buf, "%s %d", str, &ret);
-                       break;
-               }
-       }
-       fclose(fp);
-
-       return ret;
-}
-
 static inline int memory_read_val_from_proc_node(uint32_t val_id)
 {
        switch (val_id) {
        case MEMORY_TOTAL:
-               return __memory_read_val_from_proc_node(PROC_MEM_INFO_MEM_TOTAL);
+               return kernel_get_memory_total();
        case MEMORY_AVAILABLE:
-               return __memory_read_val_from_proc_node(PROC_MEM_INFO_MEM_AVAILABLE);
+               return kernel_get_memory_info(PROC_MEM_INFO_MEM_AVAILABLE);
        case MEMORY_FREE:
-               return __memory_read_val_from_proc_node(PROC_MEM_INFO_MEM_FREE);
+               return kernel_get_memory_info(PROC_MEM_INFO_MEM_FREE);
        }
        return -EINVAL;
 }

diff --git a/src/util/kernel.c b/src/util/kernel.c
index 41c1637..6e9fb36 100644 (file)
--- a/src/util/kernel.c
+++ b/src/util/kernel.c
@@ -169,3 +169,35 @@ err:
 
        return ret;
 }
+
+int kernel_get_memory_info(const char *key)
+{
+       int ret = -EINVAL;
+       char buf[BUFF_MAX];
+       char str[BUFF_MAX];
+       FILE *fp = NULL;
+
+       fp = fopen("/proc/meminfo", "r");
+       if (!fp)
+               return -EIO;
+
+       while (fgets(buf, BUFF_MAX, fp)) {
+               if (!strncmp(buf, key, strlen(key))) {
+                       sscanf(buf, "%s %d", str, &ret);
+                       break;
+               }
+       }
+       fclose(fp);
+
+       return ret;
+}
+
+int kernel_get_memory_total(void)
+{
+       static u_int64_t mem_total = 0;
+
+       if (!mem_total)
+               mem_total = kernel_get_memory_info("MemTotal");
+
+       return mem_total;
+}