zeldon/htop
1
0
Fork 0
mirror of https://github.com/xzeldon/htop.git synced 2025-07-12 04:04:35 +03:00
Code Issues Packages Projects Releases Wiki Activity

Rename basenameOffset to cmdlineBasenameOffset

Browse Source
This commit is contained in:
Benny Baumann
2021-02-01 22:24:42 +01:00
committed by BenBE
parent d74e8b7554
commit b839987df7
9 changed files with 30 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
linux/LinuxProcessList.c
View File

@ -1013,7 +1013,7 @@ static bool LinuxProcessList_readCmdlineFile(Process* process, openat_arg_t proc
if (amtRead == 0) {
if (process->state == 'Z') {
process->basenameOffset = 0;
process->cmdlineBasenameOffset = 0;
} else {
((LinuxProcess*)process)->isKernelThread = true;
}
@ -1133,7 +1133,7 @@ static bool LinuxProcessList_readCmdlineFile(Process* process, openat_arg_t proc
LinuxProcess *lp = (LinuxProcess *)process;
lp->mergedCommand.maxLen = lastChar + 1; /* accommodate cmdline */
if (!process->cmdline || !String_eq(command, process->cmdline)) {
process->basenameOffset = tokenEnd;
process->cmdlineBasenameOffset = tokenEnd;
free_and_xStrdup(&process->cmdline, command);
lp->procCmdlineBasenameOffset = tokenStart;
lp->procCmdlineBasenameEnd = tokenEnd;
@ -1456,15 +1456,15 @@ static bool LinuxProcessList_recurseProcTree(LinuxProcessList* this, openat_arg_
LinuxProcessList_readCwd(lp, procFd);
}
if (proc->state == 'Z' && (proc->basenameOffset == 0)) {
proc->basenameOffset = -1;
if (proc->state == 'Z' && (proc->cmdlineBasenameOffset == 0)) {
proc->cmdlineBasenameOffset = -1;
free_and_xStrdup(&proc->cmdline, command);
lp->procCmdlineBasenameOffset = 0;
lp->procCmdlineBasenameEnd = 0;
lp->mergedCommand.commChanged = true;
} else if (Process_isThread(proc)) {
if (settings->showThreadNames || Process_isKernelThread(proc)) {
proc->basenameOffset = -1;
proc->cmdlineBasenameOffset = -1;
free_and_xStrdup(&proc->cmdline, command);
lp->procCmdlineBasenameOffset = 0;
lp->procCmdlineBasenameEnd = 0;