KSM: remove to_scan metric; fixes #3304
Costa Tsaousis (ktsaou) committed
Jan 20, 2018 at 11:16 UTC
568fd9414799be3340881f2dabc8ebc9d94c51dd
1 file changed
+16
-16
src/sys_kernel_mm_ksm.c
+16
-16
@@ -16,12 +16,12 @@ KSM_NAME_VALUE values[] = {
16
[PAGES_SHARING] = { "/sys/kernel/mm/ksm/pages_sharing", 0ULL },
17
[PAGES_UNSHARED] = { "/sys/kernel/mm/ksm/pages_unshared", 0ULL },
18
[PAGES_VOLATILE] = { "/sys/kernel/mm/ksm/pages_volatile", 0ULL },
19
- [PAGES_TO_SCAN] = { "/sys/kernel/mm/ksm/pages_to_scan", 0ULL },
19
+ // [PAGES_TO_SCAN] = { "/sys/kernel/mm/ksm/pages_to_scan", 0ULL },
20
};
21
22
int do_sys_kernel_mm_ksm(int update_every, usec_t dt) {
23
(void)dt;
24
- static procfile *ff_pages_shared = NULL, *ff_pages_sharing = NULL, *ff_pages_unshared = NULL, *ff_pages_volatile = NULL, *ff_pages_to_scan = NULL;
24
+ static procfile *ff_pages_shared = NULL, *ff_pages_sharing = NULL, *ff_pages_unshared = NULL, *ff_pages_volatile = NULL/*, *ff_pages_to_scan = NULL*/;
25
static unsigned long page_size = 0;
26
27
if(unlikely(page_size == 0))
@@ -51,16 +51,16 @@ int do_sys_kernel_mm_ksm(int update_every, usec_t dt) {
51
ff_pages_volatile = procfile_open(values[PAGES_VOLATILE].filename, " \t:", PROCFILE_FLAG_DEFAULT);
52
}
53
54
- if(unlikely(!ff_pages_to_scan)) {
55
- snprintfz(values[PAGES_TO_SCAN].filename, FILENAME_MAX, "%s%s", netdata_configured_host_prefix, "/sys/kernel/mm/ksm/pages_to_scan");
56
- snprintfz(values[PAGES_TO_SCAN].filename, FILENAME_MAX, "%s", config_get("plugin:proc:/sys/kernel/mm/ksm", "/sys/kernel/mm/ksm/pages_to_scan", values[PAGES_TO_SCAN].filename));
57
- ff_pages_to_scan = procfile_open(values[PAGES_TO_SCAN].filename, " \t:", PROCFILE_FLAG_DEFAULT);
58
- }
54
+ //if(unlikely(!ff_pages_to_scan)) {
55
+ // snprintfz(values[PAGES_TO_SCAN].filename, FILENAME_MAX, "%s%s", netdata_configured_host_prefix, "/sys/kernel/mm/ksm/pages_to_scan");
56
+ // snprintfz(values[PAGES_TO_SCAN].filename, FILENAME_MAX, "%s", config_get("plugin:proc:/sys/kernel/mm/ksm", "/sys/kernel/mm/ksm/pages_to_scan", values[PAGES_TO_SCAN].filename));
57
+ // ff_pages_to_scan = procfile_open(values[PAGES_TO_SCAN].filename, " \t:", PROCFILE_FLAG_DEFAULT);
58
+ //}
59
60
- if(unlikely(!ff_pages_shared || !ff_pages_sharing || !ff_pages_unshared || !ff_pages_volatile || !ff_pages_to_scan))
60
+ if(unlikely(!ff_pages_shared || !ff_pages_sharing || !ff_pages_unshared || !ff_pages_volatile /*|| !ff_pages_to_scan */))
61
return 1;
62
63
- unsigned long long pages_shared = 0, pages_sharing = 0, pages_unshared = 0, pages_volatile = 0, pages_to_scan = 0, offered = 0, saved = 0;
63
+ unsigned long long pages_shared = 0, pages_sharing = 0, pages_unshared = 0, pages_volatile = 0, /*pages_to_scan = 0,*/ offered = 0, saved = 0;
64
65
ff_pages_shared = procfile_readall(ff_pages_shared);
66
if(unlikely(!ff_pages_shared)) return 0; // we return 0, so that we will retry to open it next time
@@ -78,20 +78,20 @@ int do_sys_kernel_mm_ksm(int update_every, usec_t dt) {
78
if(unlikely(!ff_pages_volatile)) return 0; // we return 0, so that we will retry to open it next time
79
pages_volatile = str2ull(procfile_lineword(ff_pages_volatile, 0, 0));
80
81
- ff_pages_to_scan = procfile_readall(ff_pages_to_scan);
82
- if(unlikely(!ff_pages_to_scan)) return 0; // we return 0, so that we will retry to open it next time
83
- pages_to_scan = str2ull(procfile_lineword(ff_pages_to_scan, 0, 0));
81
+ //ff_pages_to_scan = procfile_readall(ff_pages_to_scan);
82
+ //if(unlikely(!ff_pages_to_scan)) return 0; // we return 0, so that we will retry to open it next time
83
+ //pages_to_scan = str2ull(procfile_lineword(ff_pages_to_scan, 0, 0));
84
85
offered = pages_sharing + pages_shared + pages_unshared + pages_volatile;
86
saved = pages_sharing;
87
88
- if(unlikely(!offered || !pages_to_scan)) return 0;
88
+ if(unlikely(!offered /*|| !pages_to_scan*/)) return 0;
89
90
// --------------------------------------------------------------------
91
92
{
93
static RRDSET *st_mem_ksm = NULL;
94
- static RRDDIM *rd_shared = NULL, *rd_unshared = NULL, *rd_sharing = NULL, *rd_volatile = NULL, *rd_to_scan = NULL;
94
+ static RRDDIM *rd_shared = NULL, *rd_unshared = NULL, *rd_sharing = NULL, *rd_volatile = NULL/*, *rd_to_scan = NULL*/;
95
96
if (unlikely(!st_mem_ksm)) {
97
st_mem_ksm = rrdset_create_localhost(
@@ -113,7 +113,7 @@ int do_sys_kernel_mm_ksm(int update_every, usec_t dt) {
113
rd_unshared = rrddim_add(st_mem_ksm, "unshared", NULL, -1, 1024 * 1024, RRD_ALGORITHM_ABSOLUTE);
114
rd_sharing = rrddim_add(st_mem_ksm, "sharing", NULL, 1, 1024 * 1024, RRD_ALGORITHM_ABSOLUTE);
115
rd_volatile = rrddim_add(st_mem_ksm, "volatile", NULL, -1, 1024 * 1024, RRD_ALGORITHM_ABSOLUTE);
116
- rd_to_scan = rrddim_add(st_mem_ksm, "to_scan", "to scan", -1, 1024 * 1024, RRD_ALGORITHM_ABSOLUTE);
116
+ //rd_to_scan = rrddim_add(st_mem_ksm, "to_scan", "to scan", -1, 1024 * 1024, RRD_ALGORITHM_ABSOLUTE);
117
}
118
else
119
rrdset_next(st_mem_ksm);
@@ -122,7 +122,7 @@ int do_sys_kernel_mm_ksm(int update_every, usec_t dt) {
122
rrddim_set_by_pointer(st_mem_ksm, rd_unshared, pages_unshared * page_size);
123
rrddim_set_by_pointer(st_mem_ksm, rd_sharing, pages_sharing * page_size);
124
rrddim_set_by_pointer(st_mem_ksm, rd_volatile, pages_volatile * page_size);
125
- rrddim_set_by_pointer(st_mem_ksm, rd_to_scan, pages_to_scan * page_size);
125
+ //rrddim_set_by_pointer(st_mem_ksm, rd_to_scan, pages_to_scan * page_size);
126
127
rrdset_done(st_mem_ksm);
128
}