diff options
| author | Jessica Clarke <jrtc27@jrtc27.com> | 2022-01-15 02:27:53 +0000 |
|---|---|---|
| committer | BenBE <BenBE@geshi.org> | 2022-01-16 17:21:18 +0100 |
| commit | 9512fd793013ec603dcd083155ddb1d9a5872574 (patch) | |
| tree | 40debb57461b116bb652c79b4ff26ef6a2f77613 | |
| parent | 4a664c0df8093d770b3f254800a91215575dd726 (diff) | |
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.
| -rw-r--r-- | freebsd/FreeBSDProcess.c | 6 | ||||
| -rw-r--r-- | freebsd/FreeBSDProcess.h | 1 | ||||
| -rw-r--r-- | freebsd/FreeBSDProcessList.c | 2 | ||||
| -rw-r--r-- | freebsd/ProcessField.h | 1 |
4 files changed, 10 insertions, 0 deletions
diff --git a/freebsd/FreeBSDProcess.c b/freebsd/FreeBSDProcess.c index 345edffc..a6b14446 100644 --- a/freebsd/FreeBSDProcess.c +++ b/freebsd/FreeBSDProcess.c @@ -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, }, [JID] = { .name = "JID", .title = "JID", .description = "Jail prison ID", .flags = 0, .pidColumn = true, }, [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) { @@ -77,6 +78,9 @@ static void FreeBSDProcess_writeField(const Process* this, RichString* str, Proc case JAIL: Process_printLeftAlignedField(str, attr, fp->jname ? fp->jname : "N/A", 11); return; + case EMULATION: + Process_printLeftAlignedField(str, attr, fp->emul ? fp->emul : "N/A", 16); + return; default: Process_writeField(this, str, field); return; @@ -94,6 +98,8 @@ static int FreeBSDProcess_compareByKey(const Process* v1, const Process* v2, Pro return SPACESHIP_NUMBER(p1->jid, p2->jid); case JAIL: return SPACESHIP_NULLSTR(p1->jname, p2->jname); + case EMULATION: + return SPACESHIP_NULLSTR(p1->emul, p2->emul); default: return Process_compareByKey_Base(v1, v2, key); } diff --git a/freebsd/FreeBSDProcess.h b/freebsd/FreeBSDProcess.h index 2443f895..654f9cfa 100644 --- a/freebsd/FreeBSDProcess.h +++ b/freebsd/FreeBSDProcess.h @@ -18,6 +18,7 @@ typedef struct FreeBSDProcess_ { Process super; int jid; char* jname; + char* emul; } FreeBSDProcess; extern const ProcessClass FreeBSDProcess_class; diff --git a/freebsd/FreeBSDProcessList.c b/freebsd/FreeBSDProcessList.c index a4b6b837..486e49f2 100644 --- a/freebsd/FreeBSDProcessList.c +++ b/freebsd/FreeBSDProcessList.c @@ -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 proc->m_virt = kproc->ki_size / ONE_K; proc->m_resident = kproc->ki_rssize * pageSizeKb; diff --git a/freebsd/ProcessField.h b/freebsd/ProcessField.h index 8ed2746e..5d985cfb 100644 --- a/freebsd/ProcessField.h +++ b/freebsd/ProcessField.h @@ -11,6 +11,7 @@ in the source distribution for its full text. #define PLATFORM_PROCESS_FIELDS \ JID = 100, \ JAIL = 101, \ + EMULATION = 102, \ \ DUMMY_BUMP_FIELD = CWD, \ // End of list |