From 042cfa71e7cbe9c2f020b29474d31ee48d270cac Mon Sep 17 00:00:00 2001 From: Jim Warner Date: Wed, 30 Sep 2015 00:00:00 -0500 Subject: [PATCH] library: add abbreviated TTY_NUMBER to that API While not documented in the man page, ps allows 'tty4' as a valid output specifier complimenting 'tty8' & its derivatives. So, in order to eliminate a dev_to_name() call in the ps program the library will now offer this abbreviated tty version (consisting of a number only). Signed-off-by: Jim Warner --- proc/pids.c | 2 ++ proc/pids.h | 1 + 2 files changed, 3 insertions(+) diff --git a/proc/pids.c b/proc/pids.c index be96ec84..9d0a8021 100644 --- a/proc/pids.c +++ b/proc/pids.c @@ -210,6 +210,7 @@ REG_set(TICS_USER_C, ull_int, cutime) REG_set(TIME_START, ull_int, start_time) REG_set(TTY, s_int, tty) setDECL(TTY_NAME) { char buf[64]; (void)I; dev_to_tty(buf, sizeof(buf), P->tty, P->tid, ABBREV_DEV); R->result.str = strdup(buf); } +setDECL(TTY_NUMBER) { char buf[64]; (void)I; dev_to_tty(buf, sizeof(buf), P->tty, P->tid, ABBREV_DEV|ABBREV_TTY|ABBREV_PTS); R->result.str = strdup(buf); } REG_set(VM_DATA, ul_int, vm_data) REG_set(VM_EXE, ul_int, vm_exe) REG_set(VM_LIB, ul_int, vm_lib) @@ -456,6 +457,7 @@ static struct { { RS(TIME_START), f_stat, NULL, QS(ull_int), 0 }, { RS(TTY), f_stat, NULL, QS(s_int), 0 }, { RS(TTY_NAME), f_stat, FF(str), QS(strvers), 0 }, + { RS(TTY_NUMBER), f_stat, FF(str), QS(strvers), 0 }, { RS(VM_DATA), f_status, NULL, QS(ul_int), 0 }, { RS(VM_EXE), f_status, NULL, QS(ul_int), 0 }, { RS(VM_LIB), f_status, NULL, QS(ul_int), 0 }, diff --git a/proc/pids.h b/proc/pids.h index dc9ee6b5..55be7f83 100644 --- a/proc/pids.h +++ b/proc/pids.h @@ -123,6 +123,7 @@ enum pids_item { PROCPS_PIDS_TIME_START, // ull_int PROCPS_PIDS_TTY, // s_int PROCPS_PIDS_TTY_NAME, // str + PROCPS_PIDS_TTY_NUMBER, // str PROCPS_PIDS_VM_DATA, // ul_int PROCPS_PIDS_VM_EXE, // ul_int PROCPS_PIDS_VM_LIB, // ul_int