zeldon
/
htop
mirror of https://github.com/xzeldon/htop.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Include support for legacy LXC cgroup naming

This commit is contained in:
Benny Baumann 2021-11-28 20:08:45 +01:00 committed by BenBE
parent 55e073a455
commit b98a4f8d56
1 changed files with 30 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
linux/CGroupUtils.c
View File

@ -67,6 +67,8 @@ static bool CGroup_filterName_internal(const char *cgroup, StrBuf_state* s, StrB
const char* str_machine_slice = "machine.slice"; const char* str_machine_slice = "machine.slice";
const char* str_user_slice_prefix = "/user-"; const char* str_user_slice_prefix = "/user-";
const char* str_lxc_monitor_legacy = "lxc.monitor";
const char* str_lxc_payload_legacy = "lxc.payload";
const char* str_lxc_monitor_prefix = "lxc.monitor."; const char* str_lxc_monitor_prefix = "lxc.monitor.";
const char* str_lxc_payload_prefix = "lxc.payload."; const char* str_lxc_payload_prefix = "lxc.payload.";
@ -193,6 +195,34 @@ static bool CGroup_filterName_internal(const char *cgroup, StrBuf_state* s, StrB
continue; continue;
} }
// LXC legacy cgroup naming
if (Label_checkEqual(labelStart, labelLen, str_lxc_monitor_legacy) ||
Label_checkEqual(labelStart, labelLen, str_lxc_payload_legacy)) {
bool isMonitor = Label_checkEqual(labelStart, labelLen, str_lxc_monitor_legacy);
labelStart = nextSlash;
while (*labelStart == '/')
labelStart++;
nextSlash = strchrnul(labelStart, '/');
if (nextSlash - labelStart > 0) {
if (!StrBuf_putsz(s, w, isMonitor ? "[LXC:" : "[lxc:"))
return false;
if (!StrBuf_putsn(s, w, labelStart, nextSlash - labelStart))
return false;
if (!w(s, ']'))
return false;
cgroup = nextSlash;
continue;
}
labelStart = cgroup;
nextSlash = labelStart + labelLen;
}
if (Label_checkSuffix(labelStart, labelLen, str_service_suffix)) { if (Label_checkSuffix(labelStart, labelLen, str_service_suffix)) {
const size_t serviceNameLen = labelLen - strlen(str_service_suffix); const size_t serviceNameLen = labelLen - strlen(str_service_suffix);