zeldon/htop
1
0
Fork 0
mirror of https://github.com/xzeldon/htop.git synced 2024-12-23 22:55:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

Implements the NetBSD specific changes for makeCommandStr refactor.

Browse Source 
Refer to #388 PR for more details.
This commit is contained in:
fraggerfox 2021-05-23 15:00:48 +05:30 committed by BenBE
parent fa65c30976
commit 9de463e756
3 changed files with 28 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
netbsd/NetBSDProcess.c
View File

@ -183,6 +183,12 @@ const ProcessFieldData Process_fields[LAST_PROCESSFIELD] = {
.flags = 0,
.pidColumn = true,
},
[PROC_COMM] = {
.name = "COMM",
.title = "COMM ",
.description = "comm string of the process",
.flags = 0,
},
};
Process* NetBSDProcess_new(const Settings* settings) {
@ -235,7 +241,3 @@ const ProcessClass NetBSDProcess_class = {
.writeField = NetBSDProcess_writeField,
.compareByKey = NetBSDProcess_compareByKey
};
bool Process_isThread(const Process* this) {
return Process_isKernelThread(this) || Process_isUserlandThread(this);
}

6
netbsd/NetBSDProcess.h
View File

@ -21,10 +21,6 @@ typedef struct NetBSDProcess_ {
Process super;
} NetBSDProcess;
#define Process_isKernelThread(_process) (_process->pgrp == 0)
#define Process_isUserlandThread(_process) (_process->pid != _process->tgid)
extern const ProcessClass NetBSDProcess_class;
extern const ProcessFieldData Process_fields[LAST_PROCESSFIELD];
@ -33,6 +29,4 @@ Process* NetBSDProcess_new(const Settings* settings);
void Process_delete(Object* cast);
bool Process_isThread(const Process* this);
#endif

32
netbsd/NetBSDProcessList.c
View File

@ -114,15 +114,17 @@ static void NetBSDProcessList_scanMemoryInfo(ProcessList* pl) {
pl->usedSwap = uvmexp.swpginuse * pageSizeKB;
}
static char* NetBSDProcessList_readProcessName(kvm_t* kd, const struct kinfo_proc2* kproc, int* basenameEnd) {
static void NetBSDProcessList_updateProcessName(kvm_t* kd, const struct kinfo_proc2* kproc, Process* proc) {
Process_updateComm(proc, kproc->p_comm);
/*
* Like NetBSD's top(1), we try to fall back to the command name
* (argv[0]) if we fail to construct the full command.
*/
char** arg = kvm_getargv2(kd, kproc, 500);
if (arg == NULL || *arg == NULL) {
*basenameEnd = strlen(kproc->p_comm);
return xStrdup(kproc->p_comm);
Process_updateCmdline(proc, kproc->p_comm, 0, strlen(kproc->p_comm));
return;
}
size_t len = 0;
@ -133,22 +135,30 @@ static char* NetBSDProcessList_readProcessName(kvm_t* kd, const struct kinfo_pro
/* don't use xMalloc here - we want to handle huge argv's gracefully */
char* s;
if ((s = malloc(len)) == NULL) {
*basenameEnd = strlen(kproc->p_comm);
return xStrdup(kproc->p_comm);
Process_updateCmdline(proc, kproc->p_comm, 0, strlen(kproc->p_comm));
return;
}
*s = '\0';
int start = 0;
int end = 0;
for (int i = 0; arg[i] != NULL; i++) {
size_t n = strlcat(s, arg[i], len);
if (i == 0) {
*basenameEnd = MINIMUM(n, len - 1);
end = MINIMUM(n, len - 1);
/* check if cmdline ended earlier, e.g 'kdeinit5: Running...' */
for (int j = end; j > 0; j--) {
if (arg[0][j] == ' ' && arg[0][j-1] != '\\') {
end = (arg[0][j-1] == ':') ? (j-1) : j;
}
}
}
/* the trailing space should get truncated anyway */
strlcat(s, " ", len);
}
return s;
Process_updateCmdline(proc, s, start, end);
}
/*
@ -185,16 +195,18 @@ static void NetBSDProcessList_scanProcs(NetBSDProcessList* this) {
proc->session = kproc->p_sid;
proc->tty_nr = kproc->p_tdev;
proc->pgrp = kproc->p__pgid;
proc->isKernelThread = proc->pgrp == 0;
proc->isUserlandThread = proc->pid != proc->tgid;
proc->st_uid = kproc->p_uid;
proc->starttime_ctime = kproc->p_ustart_sec;
Process_fillStarttimeBuffer(proc);
proc->user = UsersTable_getRef(this->super.usersTable, proc->st_uid);
ProcessList_add(&this->super, proc);
proc->comm = NetBSDProcessList_readProcessName(this->kd, kproc, &proc->basenameOffset);
NetBSDProcessList_updateProcessName(this->kd, kproc, proc);
} else {
if (settings->updateProcessNames) {
free(proc->comm);
proc->comm = NetBSDProcessList_readProcessName(this->kd, kproc, &proc->basenameOffset);
NetBSDProcessList_updateProcessName(this->kd, kproc, proc);
}
}