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

FreeBSD: Add support for showing process emulation 

This displays the same output as ps's -o emul, which is the system call
emulation environment, or ABI, in use. This will typically be FreeBSD
ELF32 or ELF64, but can also be Linux ELF32 or Linux ELF64 when running
Linux binaries under FreeBSD's Linuxulator binary compatibility layer.
The column width of 16 is chosen to match KI_EMULNAMELEN's value of 16,
most of which is normally used up as FreeBSD ELF32/64 is 13 characters.
This commit is contained in:
Jessica Clarke 2022-01-15 02:27:53 +00:00 committed by BenBE
parent 4a664c0df8
commit 9512fd7930
4 changed files with 10 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
freebsd/FreeBSDProcess.c
View File

@ -49,6 +49,7 @@ const ProcessFieldData Process_fields[LAST_PROCESSFIELD] = {
[CWD] = { .name = "CWD", .title = "CWD ", .description = "The current working directory of the process", .flags = PROCESS_FLAG_CWD, }, [CWD] = { .name = "CWD", .title = "CWD ", .description = "The current working directory of the process", .flags = PROCESS_FLAG_CWD, },
[JID] = { .name = "JID", .title = "JID", .description = "Jail prison ID", .flags = 0, .pidColumn = true, }, [JID] = { .name = "JID", .title = "JID", .description = "Jail prison ID", .flags = 0, .pidColumn = true, },
[JAIL] = { .name = "JAIL", .title = "JAIL ", .description = "Jail prison name", .flags = 0, }, [JAIL] = { .name = "JAIL", .title = "JAIL ", .description = "Jail prison name", .flags = 0, },
[EMULATION] = { .name = "EMULATION", .title = "EMULATION ", .description = "System call emulation environment (ABI)", .flags = 0, },
}; };
Process* FreeBSDProcess_new(const Settings* settings) { Process* FreeBSDProcess_new(const Settings* settings) {
@ -77,6 +78,9 @@ static void FreeBSDProcess_writeField(const Process* this, RichString* str, Proc
case JAIL: case JAIL:
Process_printLeftAlignedField(str, attr, fp->jname ? fp->jname : "N/A", 11); Process_printLeftAlignedField(str, attr, fp->jname ? fp->jname : "N/A", 11);
return; return;
case EMULATION:
Process_printLeftAlignedField(str, attr, fp->emul ? fp->emul : "N/A", 16);
return;
default: default:
Process_writeField(this, str, field); Process_writeField(this, str, field);
return; return;
@ -94,6 +98,8 @@ static int FreeBSDProcess_compareByKey(const Process* v1, const Process* v2, Pro
return SPACESHIP_NUMBER(p1->jid, p2->jid); return SPACESHIP_NUMBER(p1->jid, p2->jid);
case JAIL: case JAIL:
return SPACESHIP_NULLSTR(p1->jname, p2->jname); return SPACESHIP_NULLSTR(p1->jname, p2->jname);
case EMULATION:
return SPACESHIP_NULLSTR(p1->emul, p2->emul);
default: default:
return Process_compareByKey_Base(v1, v2, key); return Process_compareByKey_Base(v1, v2, key);
} }

1
freebsd/FreeBSDProcess.h
View File

@ -18,6 +18,7 @@ typedef struct FreeBSDProcess_ {
Process super; Process super;
int jid; int jid;
char* jname; char* jname;
char* emul;
} FreeBSDProcess; } FreeBSDProcess;
extern const ProcessClass FreeBSDProcess_class; extern const ProcessClass FreeBSDProcess_class;

2
freebsd/FreeBSDProcessList.c
View File

@ -549,6 +549,8 @@ void ProcessList_goThroughEntries(ProcessList* super, bool pauseProcessUpdate) {
} }
} }
free_and_xStrdup(&fp->emul, kproc->ki_emul);
// from FreeBSD source /src/usr.bin/top/machine.c // from FreeBSD source /src/usr.bin/top/machine.c
proc->m_virt = kproc->ki_size / ONE_K; proc->m_virt = kproc->ki_size / ONE_K;
proc->m_resident = kproc->ki_rssize * pageSizeKb; proc->m_resident = kproc->ki_rssize * pageSizeKb;

1
freebsd/ProcessField.h
View File

@ -11,6 +11,7 @@ in the source distribution for its full text.
#define PLATFORM_PROCESS_FIELDS \ #define PLATFORM_PROCESS_FIELDS \
JID = 100, \ JID = 100, \
JAIL = 101, \ JAIL = 101, \
EMULATION = 102, \
\ \
DUMMY_BUMP_FIELD = CWD, \ DUMMY_BUMP_FIELD = CWD, \
// End of list // End of list