FreeBSD: rework tty process column

This commit is contained in:
Christian Goettsche 2020-10-21 13:56:26 +02:00 committed by cgzones
parent ddbb0c2c35
commit 88eec2dc00
4 changed files with 100 additions and 2 deletions

View File

@ -17,6 +17,8 @@ in the source distribution for its full text.
#include <sys/syscall.h> #include <sys/syscall.h>
const char* const nodevStr = "nodev";
const ProcessClass FreeBSDProcess_class = { const ProcessClass FreeBSDProcess_class = {
.super = { .super = {
.extends = Class(Process), .extends = Class(Process),
@ -35,7 +37,7 @@ ProcessFieldData Process_fields[] = {
[PPID] = { .name = "PPID", .title = " PPID ", .description = "Parent process ID", .flags = 0, }, [PPID] = { .name = "PPID", .title = " PPID ", .description = "Parent process ID", .flags = 0, },
[PGRP] = { .name = "PGRP", .title = " PGRP ", .description = "Process group ID", .flags = 0, }, [PGRP] = { .name = "PGRP", .title = " PGRP ", .description = "Process group ID", .flags = 0, },
[SESSION] = { .name = "SESSION", .title = " SID ", .description = "Process's session ID", .flags = 0, }, [SESSION] = { .name = "SESSION", .title = " SID ", .description = "Process's session ID", .flags = 0, },
[TTY_NR] = { .name = "TTY_NR", .title = " TTY ", .description = "Controlling terminal", .flags = 0, }, [TTY_NR] = { .name = "TTY_NR", .title = " TTY ", .description = "Controlling terminal", .flags = PROCESS_FLAG_FREEBSD_TTY, },
[TPGID] = { .name = "TPGID", .title = " TPGID ", .description = "Process ID of the fg process group of the controlling terminal", .flags = 0, }, [TPGID] = { .name = "TPGID", .title = " TPGID ", .description = "Process ID of the fg process group of the controlling terminal", .flags = 0, },
[MINFLT] = { .name = "MINFLT", .title = " MINFLT ", .description = "Number of minor faults which have not required loading a memory page from disk", .flags = 0, }, [MINFLT] = { .name = "MINFLT", .title = " MINFLT ", .description = "Number of minor faults which have not required loading a memory page from disk", .flags = 0, },
[MAJFLT] = { .name = "MAJFLT", .title = " MAJFLT ", .description = "Number of major faults which have required loading a memory page from disk", .flags = 0, }, [MAJFLT] = { .name = "MAJFLT", .title = " MAJFLT ", .description = "Number of major faults which have required loading a memory page from disk", .flags = 0, },
@ -99,6 +101,16 @@ void FreeBSDProcess_writeField(const Process* this, RichString* str, ProcessFiel
} }
break; break;
} }
case TTY_NR:
if (fp->ttyPath) {
if (fp->ttyPath == nodevStr)
attr = CRT_colors[PROCESS_SHADOW];
xSnprintf(buffer, n, "%-8s", fp->ttyPath);
} else {
attr = CRT_colors[PROCESS_SHADOW];
xSnprintf(buffer, n, "? ");
}
break;
default: default:
Process_writeField(this, str, field); Process_writeField(this, str, field);
return; return;
@ -122,6 +134,8 @@ long FreeBSDProcess_compare(const void* v1, const void* v2) {
return (p1->jid - p2->jid); return (p1->jid - p2->jid);
case JAIL: case JAIL:
return strcmp(p1->jname ? p1->jname : "", p2->jname ? p2->jname : ""); return strcmp(p1->jname ? p1->jname : "", p2->jname ? p2->jname : "");
case TTY_NR:
return strcmp(p1->ttyPath ? p1->ttyPath : "", p2->ttyPath ? p2->ttyPath : "");
default: default:
return Process_compare(v1, v2); return Process_compare(v1, v2);
} }

View File

@ -15,6 +15,10 @@ in the source distribution for its full text.
#include "Settings.h" #include "Settings.h"
#define PROCESS_FLAG_FREEBSD_TTY 0x0100
extern const char* const nodevStr;
typedef enum FreeBSDProcessFields_ { typedef enum FreeBSDProcessFields_ {
// Add platform-specific fields here, with ids >= 100 // Add platform-specific fields here, with ids >= 100
JID = 100, JID = 100,
@ -27,6 +31,7 @@ typedef struct FreeBSDProcess_ {
int kernel; int kernel;
int jid; int jid;
char* jname; char* jname;
const char* ttyPath;
} FreeBSDProcess; } FreeBSDProcess;
#define Process_isKernelThread(_process) (_process->kernel == 1) #define Process_isKernelThread(_process) (_process->kernel == 1)

View File

@ -8,6 +8,7 @@ in the source distribution for its full text.
#include "FreeBSDProcessList.h" #include "FreeBSDProcessList.h"
#include <assert.h> #include <assert.h>
#include <dirent.h>
#include <err.h> #include <err.h>
#include <fcntl.h> #include <fcntl.h>
#include <limits.h> #include <limits.h>
@ -16,8 +17,10 @@ in the source distribution for its full text.
#include <time.h> #include <time.h>
#include <unistd.h> #include <unistd.h>
#include <sys/types.h> #include <sys/types.h>
#include <sys/stat.h>
#include <sys/sysctl.h> #include <sys/sysctl.h>
#include <sys/user.h> #include <sys/user.h>
#include <unistd.h>
#include "CRT.h" #include "CRT.h"
#include "FreeBSDProcess.h" #include "FreeBSDProcess.h"
@ -138,11 +141,16 @@ ProcessList* ProcessList_new(UsersTable* usersTable, Hashtable* pidMatchList, ui
errx(1, "kvm_open: %s", errbuf); errx(1, "kvm_open: %s", errbuf);
} }
fpl->ttys = Hashtable_new(20, true);
return pl; return pl;
} }
void ProcessList_delete(ProcessList* this) { void ProcessList_delete(ProcessList* this) {
const FreeBSDProcessList* fpl = (FreeBSDProcessList*) this; const FreeBSDProcessList* fpl = (FreeBSDProcessList*) this;
Hashtable_delete(fpl->ttys);
if (fpl->kd) kvm_close(fpl->kd); if (fpl->kd) kvm_close(fpl->kd);
free(fpl->cp_time_o); free(fpl->cp_time_o);
@ -311,6 +319,70 @@ static inline void FreeBSDProcessList_scanMemoryInfo(ProcessList* pl) {
pl->sharedMem = 0; // currently unused pl->sharedMem = 0; // currently unused
} }
static void FreeBSDProcessList_scanTTYs(ProcessList* pl) {
FreeBSDProcessList* fpl = (FreeBSDProcessList*) pl;
// scan /dev/tty*
{
DIR* dirPtr = opendir("/dev");
if (!dirPtr)
return;
int dirFd = dirfd(dirPtr);
if (dirFd < 0)
goto err1;
const struct dirent* entry;
while ((entry = readdir(dirPtr))) {
if (!String_startsWith(entry->d_name, "tty"))
continue;
struct stat info;
if (fstatat(dirFd, entry->d_name, &info, 0) < 0)
continue;
if (!S_ISCHR(info.st_mode))
continue;
if (!Hashtable_get(fpl->ttys, info.st_rdev))
Hashtable_put(fpl->ttys, info.st_rdev, xStrdup(entry->d_name));
}
err1:
closedir(dirPtr);
}
// scan /dev/pts/*
{
DIR* dirPtr = opendir("/dev/pts");
if (!dirPtr)
return;
int dirFd = dirfd(dirPtr);
if (dirFd < 0)
goto err2;
const struct dirent* entry;
while ((entry = readdir(dirPtr))) {
struct stat info;
if (fstatat(dirFd, entry->d_name, &info, 0) < 0)
continue;
if (!S_ISCHR(info.st_mode))
continue;
if (!Hashtable_get(fpl->ttys, info.st_rdev)) {
char* path;
xAsprintf(&path, "pts/%s", entry->d_name);
Hashtable_put(fpl->ttys, info.st_rdev, path);
}
}
err2:
closedir(dirPtr);
}
}
char* FreeBSDProcessList_readProcessName(kvm_t* kd, struct kinfo_proc* kproc, int* basenameEnd) { char* FreeBSDProcessList_readProcessName(kvm_t* kd, struct kinfo_proc* kproc, int* basenameEnd) {
char** argv = kvm_getargv(kd, kproc, 0); char** argv = kvm_getargv(kd, kproc, 0);
if (!argv) { if (!argv) {
@ -394,6 +466,9 @@ void ProcessList_goThroughEntries(ProcessList* super, bool pauseProcessUpdate) {
if (pauseProcessUpdate) if (pauseProcessUpdate)
return; return;
if (settings->flags & PROCESS_FLAG_FREEBSD_TTY)
FreeBSDProcessList_scanTTYs(super);
int count = 0; int count = 0;
struct kinfo_proc* kprocs = kvm_getprocs(fpl->kd, KERN_PROC_PROC, 0, &count); struct kinfo_proc* kprocs = kvm_getprocs(fpl->kd, KERN_PROC_PROC, 0, &count);
@ -417,7 +492,6 @@ void ProcessList_goThroughEntries(ProcessList* super, bool pauseProcessUpdate) {
proc->tpgid = kproc->ki_tpgid; proc->tpgid = kproc->ki_tpgid;
proc->tgid = kproc->ki_pid; proc->tgid = kproc->ki_pid;
proc->session = kproc->ki_sid; proc->session = kproc->ki_sid;
proc->tty_nr = kproc->ki_tdev;
proc->pgrp = kproc->ki_pgid; proc->pgrp = kproc->ki_pgid;
proc->st_uid = kproc->ki_uid; proc->st_uid = kproc->ki_uid;
proc->starttime_ctime = kproc->ki_start.tv_sec; proc->starttime_ctime = kproc->ki_start.tv_sec;
@ -490,6 +564,9 @@ void ProcessList_goThroughEntries(ProcessList* super, bool pauseProcessUpdate) {
default: proc->state = '?'; default: proc->state = '?';
} }
if (settings->flags & PROCESS_FLAG_FREEBSD_TTY)
fp->ttyPath = (kproc->ki_tdev == NODEV) ? nodevStr : Hashtable_get(fpl->ttys, kproc->ki_tdev);
if (Process_isKernelThread(fp)) { if (Process_isKernelThread(fp)) {
super->kernelThreads++; super->kernelThreads++;
} }

View File

@ -46,6 +46,8 @@ typedef struct FreeBSDProcessList_ {
CPUData* cpus; CPUData* cpus;
Hashtable* ttys;
unsigned long *cp_time_o; unsigned long *cp_time_o;
unsigned long *cp_time_n; unsigned long *cp_time_n;