allow used memory to be reported without cache
Costa Tsaousis (ktsaou) committed
Jan 18, 2017 at 01:50 UTC
63ca340820cda8d2f7e7004f75f0e7c38c5beea3
1 file changed
+8
-5
src/sys_fs_cgroup.c
+8
-5
@@ -20,8 +20,10 @@ static int cgroup_enable_blkio_throttle_io = CONFIG_ONDEMAND_ONDEMAND;
20
static int cgroup_enable_blkio_throttle_ops = CONFIG_ONDEMAND_ONDEMAND;
21
static int cgroup_enable_blkio_merged_ops = CONFIG_ONDEMAND_ONDEMAND;
22
static int cgroup_enable_blkio_queued_ops = CONFIG_ONDEMAND_ONDEMAND;
23
+
24
static int cgroup_enable_systemd_services = CONFIG_ONDEMAND_YES;
25
static int cgroup_enable_systemd_services_detailed_memory = CONFIG_ONDEMAND_NO;
26
+static int cgroup_used_memory_without_cache = CONFIG_ONDEMAND_YES;
27
28
static int cgroup_search_in_devices = 1;
29
@@ -163,6 +165,7 @@ void read_cgroup_plugin_configuration() {
165
166
cgroup_enable_systemd_services = config_get_boolean("plugin:cgroups", "enable systemd services", cgroup_enable_systemd_services);
167
cgroup_enable_systemd_services_detailed_memory = config_get_boolean("plugin:cgroups", "enable systemd services detailed memory", cgroup_enable_systemd_services_detailed_memory);
168
+ cgroup_used_memory_without_cache = config_get_boolean("plugin:cgroups", "report used memory without cache", cgroup_used_memory_without_cache);
169
170
char filename[FILENAME_MAX + 1], *s;
171
struct mountinfo *mi, *root = mountinfo_read(0);
@@ -1376,11 +1379,11 @@ static inline void find_all_cgroups() {
1379
debug(D_CGROUP, "cpuacct.usage_percpu file for cgroup '%s': '%s' does not exist.", cg->id, filename);
1380
}
1381
1379
- if(unlikely(cgroup_enable_detailed_memory && !cg->memory.filename_detailed && (cgroup_enable_systemd_services_detailed_memory || !(cg->options & CGROUP_OPTIONS_SYSTEM_SLICE_SERVICE)))) {
1382
+ if(unlikely((cgroup_enable_detailed_memory || cgroup_used_memory_without_cache) && !cg->memory.filename_detailed && (cgroup_used_memory_without_cache || cgroup_enable_systemd_services_detailed_memory || !(cg->options & CGROUP_OPTIONS_SYSTEM_SLICE_SERVICE)))) {
1383
snprintfz(filename, FILENAME_MAX, "%s%s/memory.stat", cgroup_memory_base, cg->id);
1384
if(likely(stat(filename, &buf) != -1)) {
1385
cg->memory.filename_detailed = strdupz(filename);
1383
- cg->memory.enabled_detailed = cgroup_enable_detailed_memory;
1386
+ cg->memory.enabled_detailed = (cgroup_enable_detailed_memory == CONFIG_ONDEMAND_YES)?CONFIG_ONDEMAND_YES:CONFIG_ONDEMAND_ONDEMAND;
1387
debug(D_CGROUP, "memory.stat filename for cgroup '%s': '%s'", cg->id, cg->memory.filename_detailed);
1388
}
1389
else
@@ -1775,7 +1778,7 @@ void update_services_charts(int update_every,
1778
if(unlikely(!cg->rd_mem_usage))
1779
cg->rd_mem_usage = rrddim_add(st_mem_usage, cg->chart_id, cg->chart_title, 1, 1024 * 1024, RRDDIM_ABSOLUTE);
1780
1778
- rrddim_set_by_pointer(st_mem_usage, cg->rd_mem_usage, cg->memory.usage_in_bytes);
1781
+ rrddim_set_by_pointer(st_mem_usage, cg->rd_mem_usage, cg->memory.usage_in_bytes - ((cgroup_used_memory_without_cache)?cg->memory.cache:0));
1782
}
1783
1784
if(likely(do_mem_detailed && cg->memory.updated_detailed)) {
@@ -1992,7 +1995,7 @@ void update_cgroup_charts(int update_every) {
1995
if(likely(cgroup_enable_systemd_services && cg->options & CGROUP_OPTIONS_SYSTEM_SLICE_SERVICE)) {
1996
if(cg->cpuacct_stat.updated && cg->cpuacct_stat.enabled == CONFIG_ONDEMAND_YES) services_do_cpu++;
1997
1995
- if(cg->memory.updated_detailed && cg->memory.enabled_detailed) services_do_mem_detailed++;
1998
+ if(cgroup_enable_systemd_services_detailed_memory && cg->memory.updated_detailed && cg->memory.enabled_detailed) services_do_mem_detailed++;
1999
if(cg->memory.updated_usage_in_bytes && cg->memory.enabled_usage_in_bytes == CONFIG_ONDEMAND_YES) services_do_mem_usage++;
2000
if(cg->memory.updated_failcnt && cg->memory.enabled_failcnt == CONFIG_ONDEMAND_YES) services_do_mem_failcnt++;
2001
if(cg->memory.updated_msw_usage_in_bytes && cg->memory.enabled_msw_usage_in_bytes == CONFIG_ONDEMAND_YES) services_do_swap_usage++;
@@ -2142,7 +2145,7 @@ void update_cgroup_charts(int update_every) {
2145
else
2146
rrdset_next(cg->st_mem_usage);
2147
2145
- rrddim_set(cg->st_mem_usage, "ram", cg->memory.usage_in_bytes);
2148
+ rrddim_set(cg->st_mem_usage, "ram", cg->memory.usage_in_bytes - ((cgroup_used_memory_without_cache)?cg->memory.cache:0));
2149
rrddim_set(cg->st_mem_usage, "swap", (cg->memory.msw_usage_in_bytes > cg->memory.usage_in_bytes)?cg->memory.msw_usage_in_bytes - cg->memory.usage_in_bytes:0);
2150
rrdset_done(cg->st_mem_usage);
2151
}