2002-05-30 09:14:46 +05:30
|
|
|
|
/* top.c - Source file: show Linux processes */
|
2002-02-02 04:17:29 +05:30
|
|
|
|
/*
|
2020-04-15 10:30:00 +05:30
|
|
|
|
* Copyright (c) 2002-2020, by: James C. Warner
|
2002-06-19 05:15:30 +05:30
|
|
|
|
*
|
2002-05-30 09:14:46 +05:30
|
|
|
|
* This file may be used subject to the terms and conditions of the
|
|
|
|
|
* GNU Library General Public License Version 2, or any later version
|
|
|
|
|
* at your option, as published by the Free Software Foundation.
|
|
|
|
|
* This program is distributed in the hope that it will be useful,
|
|
|
|
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
|
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
|
|
|
* GNU Library General Public License for more details.
|
2011-03-31 16:45:12 +05:30
|
|
|
|
*/
|
|
|
|
|
/* For contributions to this program, the author wishes to thank:
|
2002-12-06 12:23:29 +05:30
|
|
|
|
* Craig Small, <csmall@small.dropbear.id.au>
|
2011-03-31 16:45:12 +05:30
|
|
|
|
* Albert D. Cahalan, <albert@users.sf.net>
|
2011-10-12 00:32:59 +05:30
|
|
|
|
* Sami Kerola, <kerolasa@iki.fi>
|
2002-06-19 05:15:30 +05:30
|
|
|
|
*/
|
2011-11-02 23:00:03 +05:30
|
|
|
|
|
2002-05-30 09:14:46 +05:30
|
|
|
|
#include <ctype.h>
|
|
|
|
|
#include <curses.h>
|
2002-02-02 04:17:29 +05:30
|
|
|
|
#include <errno.h>
|
2002-12-05 04:18:30 +05:30
|
|
|
|
#include <fcntl.h>
|
2014-08-01 10:30:00 +05:30
|
|
|
|
#include <float.h>
|
|
|
|
|
#include <limits.h>
|
2011-03-31 16:45:12 +05:30
|
|
|
|
#include <pwd.h>
|
2002-05-30 09:14:46 +05:30
|
|
|
|
#include <signal.h>
|
|
|
|
|
#include <stdarg.h>
|
2002-02-02 04:17:29 +05:30
|
|
|
|
#include <stdio.h>
|
|
|
|
|
#include <stdlib.h>
|
|
|
|
|
#include <string.h>
|
2014-02-25 11:30:00 +05:30
|
|
|
|
#include <term.h> // foul sob, defines all sorts of stuff...
|
2017-12-15 10:30:00 +05:30
|
|
|
|
#undef raw
|
2011-03-31 16:45:12 +05:30
|
|
|
|
#undef tab
|
|
|
|
|
#undef TTY
|
2002-02-02 04:17:29 +05:30
|
|
|
|
#include <termios.h>
|
2002-05-30 09:14:46 +05:30
|
|
|
|
#include <time.h>
|
|
|
|
|
#include <unistd.h>
|
2018-01-06 11:30:00 +05:30
|
|
|
|
#include <wchar.h>
|
2002-11-08 06:01:28 +05:30
|
|
|
|
|
2014-02-25 11:30:00 +05:30
|
|
|
|
#include <sys/ioctl.h>
|
|
|
|
|
#include <sys/resource.h>
|
|
|
|
|
#include <sys/select.h> // also available via <sys/types.h>
|
2017-01-12 00:48:39 +05:30
|
|
|
|
#include <sys/stat.h>
|
2014-02-25 11:30:00 +05:30
|
|
|
|
#include <sys/time.h>
|
|
|
|
|
#include <sys/types.h> // also available via <stdlib.h>
|
|
|
|
|
|
2012-03-23 18:02:24 +05:30
|
|
|
|
#include "../include/fileutils.h"
|
2011-11-04 04:01:00 +05:30
|
|
|
|
#include "../include/nls.h"
|
|
|
|
|
|
2017-11-14 10:30:00 +05:30
|
|
|
|
#include "../proc/alloc.h"
|
2011-10-14 22:15:44 +05:30
|
|
|
|
#include "../proc/devname.h"
|
2017-05-13 10:33:00 +05:30
|
|
|
|
#include "../proc/numa.h"
|
2011-10-14 22:15:44 +05:30
|
|
|
|
#include "../proc/procps.h"
|
|
|
|
|
#include "../proc/readproc.h"
|
|
|
|
|
#include "../proc/sig.h"
|
|
|
|
|
#include "../proc/sysinfo.h"
|
|
|
|
|
#include "../proc/version.h"
|
|
|
|
|
#include "../proc/wchan.h"
|
|
|
|
|
#include "../proc/whattime.h"
|
2002-02-02 04:17:29 +05:30
|
|
|
|
|
2002-05-30 09:14:46 +05:30
|
|
|
|
#include "top.h"
|
2011-10-12 00:32:59 +05:30
|
|
|
|
#include "top_nls.h"
|
2002-05-30 09:14:46 +05:30
|
|
|
|
|
2013-04-08 12:30:00 +05:30
|
|
|
|
|
2002-05-30 09:14:46 +05:30
|
|
|
|
/*###### Miscellaneous global stuff ####################################*/
|
|
|
|
|
|
2011-03-31 16:45:12 +05:30
|
|
|
|
/* The original and new terminal definitions
|
|
|
|
|
(only set when not in 'Batch' mode) */
|
|
|
|
|
static struct termios Tty_original, // our inherited terminal definition
|
2013-02-15 11:30:00 +05:30
|
|
|
|
#ifdef TERMIOS_ONLY
|
2011-03-31 16:45:12 +05:30
|
|
|
|
Tty_tweaked, // for interactive 'line' input
|
|
|
|
|
#endif
|
|
|
|
|
Tty_raw; // for unsolicited input
|
2002-12-05 04:18:30 +05:30
|
|
|
|
static int Ttychanged = 0;
|
2002-05-30 09:14:46 +05:30
|
|
|
|
|
2013-07-06 10:30:00 +05:30
|
|
|
|
/* Last established cursor state/shape */
|
2013-01-29 11:30:00 +05:30
|
|
|
|
static const char *Cursor_state = "";
|
|
|
|
|
|
2002-08-26 06:25:30 +05:30
|
|
|
|
/* Program name used in error messages and local 'rc' file name */
|
2002-06-19 05:15:30 +05:30
|
|
|
|
static char *Myname;
|
2002-05-30 09:14:46 +05:30
|
|
|
|
|
2013-01-16 11:30:00 +05:30
|
|
|
|
/* Our constant sigset, so we need initialize it but once */
|
|
|
|
|
static sigset_t Sigwinch_set;
|
|
|
|
|
|
2011-03-31 16:45:12 +05:30
|
|
|
|
/* The 'local' config file support */
|
2002-12-05 04:18:30 +05:30
|
|
|
|
static char Rc_name [OURPATHSZ];
|
|
|
|
|
static RCF_t Rc = DEF_RCFILE;
|
2012-12-02 11:30:00 +05:30
|
|
|
|
static int Rc_questions;
|
2020-05-29 10:30:00 +05:30
|
|
|
|
static int Rc_compatibilty;
|
2002-12-05 04:18:30 +05:30
|
|
|
|
|
2011-03-31 16:45:12 +05:30
|
|
|
|
/* The run-time acquired page stuff */
|
|
|
|
|
static unsigned Pg2K_shft = 0;
|
2002-05-30 09:14:46 +05:30
|
|
|
|
|
2011-03-31 16:45:12 +05:30
|
|
|
|
/* SMP, Irix/Solaris mode, Linux 2.5.xx support */
|
2017-03-23 10:30:00 +05:30
|
|
|
|
static CPU_t *Cpu_tics;
|
2012-02-01 11:30:00 +05:30
|
|
|
|
static int Cpu_faux_tot;
|
2011-08-30 17:35:45 +05:30
|
|
|
|
static float Cpu_pmax;
|
2011-10-12 00:32:59 +05:30
|
|
|
|
static const char *Cpu_States_fmts;
|
2020-05-30 10:30:00 +05:30
|
|
|
|
#ifdef PRETEND48CPU
|
|
|
|
|
static int Cpu_true_tot;
|
|
|
|
|
#endif
|
2002-05-30 09:14:46 +05:30
|
|
|
|
|
|
|
|
|
/* Specific process id monitoring support */
|
2019-08-03 03:49:57 +05:30
|
|
|
|
static pid_t Monpids [MONPIDMAX+1] = { 0 };
|
2002-12-05 04:18:30 +05:30
|
|
|
|
static int Monpidsidx = 0;
|
2002-05-30 09:14:46 +05:30
|
|
|
|
|
2002-06-19 05:15:30 +05:30
|
|
|
|
/* Current screen dimensions.
|
|
|
|
|
note: the number of processes displayed is tracked on a per window
|
|
|
|
|
basis (see the WIN_t). Max_lines is the total number of
|
|
|
|
|
screen rows after deducting summary information overhead. */
|
|
|
|
|
/* Current terminal screen size. */
|
2002-12-05 04:18:30 +05:30
|
|
|
|
static int Screen_cols, Screen_rows, Max_lines;
|
2002-06-19 05:15:30 +05:30
|
|
|
|
|
|
|
|
|
/* This is really the number of lines needed to display the summary
|
|
|
|
|
information (0 - nn), but is used as the relative row where we
|
|
|
|
|
stick the cursor between frames. */
|
2002-12-05 04:18:30 +05:30
|
|
|
|
static int Msg_row;
|
2002-11-30 21:26:53 +05:30
|
|
|
|
|
2002-06-19 05:15:30 +05:30
|
|
|
|
/* Global/Non-windows mode stuff that is NOT persistent */
|
2015-06-18 10:30:00 +05:30
|
|
|
|
static int Batch = 0, // batch mode, collect no input, dumb output
|
2002-12-05 04:18:30 +05:30
|
|
|
|
Loops = -1, // number of iterations, -1 loops forever
|
2011-03-31 16:45:12 +05:30
|
|
|
|
Secure_mode = 0, // set if some functionality restricted
|
2011-08-11 03:12:14 +05:30
|
|
|
|
Thread_mode = 0, // set w/ 'H' - show threads via readeither()
|
2011-05-26 15:03:32 +05:30
|
|
|
|
Width_mode = 0; // set w/ 'w' - potential output override
|
2011-03-31 16:45:12 +05:30
|
|
|
|
|
|
|
|
|
/* Unchangeable cap's stuff built just once (if at all) and
|
2012-04-23 22:20:49 +05:30
|
|
|
|
thus NOT saved in a WIN_t's RCW_t. To accommodate 'Batch'
|
2011-03-31 16:45:12 +05:30
|
|
|
|
mode, they begin life as empty strings so the overlying
|
|
|
|
|
logic need not change ! */
|
|
|
|
|
static char Cap_clr_eol [CAPBUFSIZ] = "", // global and/or static vars
|
|
|
|
|
Cap_nl_clreos [CAPBUFSIZ] = "", // are initialized to zeros!
|
|
|
|
|
Cap_clr_scr [CAPBUFSIZ] = "", // the assignments used here
|
|
|
|
|
Cap_curs_norm [CAPBUFSIZ] = "", // cost nothing but DO serve
|
|
|
|
|
Cap_curs_huge [CAPBUFSIZ] = "", // to remind people of those
|
|
|
|
|
Cap_curs_hide [CAPBUFSIZ] = "", // batch requirements!
|
2013-01-16 11:30:00 +05:30
|
|
|
|
Cap_clr_eos [CAPBUFSIZ] = "",
|
2011-03-31 16:45:12 +05:30
|
|
|
|
Cap_home [CAPBUFSIZ] = "",
|
|
|
|
|
Cap_norm [CAPBUFSIZ] = "",
|
|
|
|
|
Cap_reverse [CAPBUFSIZ] = "",
|
|
|
|
|
Caps_off [CAPBUFSIZ] = "",
|
|
|
|
|
Caps_endline [CAPBUFSIZ] = "";
|
|
|
|
|
#ifndef RMAN_IGNORED
|
|
|
|
|
static char Cap_rmam [CAPBUFSIZ] = "",
|
|
|
|
|
Cap_smam [CAPBUFSIZ] = "";
|
|
|
|
|
/* set to 1 if writing to the last column would be troublesome
|
|
|
|
|
(we don't distinguish the lowermost row from the other rows) */
|
|
|
|
|
static int Cap_avoid_eol = 0;
|
|
|
|
|
#endif
|
2002-06-19 05:15:30 +05:30
|
|
|
|
static int Cap_can_goto = 0;
|
2002-05-30 09:14:46 +05:30
|
|
|
|
|
2002-12-05 04:18:30 +05:30
|
|
|
|
/* Some optimization stuff, to reduce output demands...
|
2011-03-31 16:45:12 +05:30
|
|
|
|
The Pseudo_ guys are managed by adj_geometry and frame_make. They
|
2002-11-27 05:54:01 +05:30
|
|
|
|
are exploited in a macro and represent 90% of our optimization.
|
2002-11-25 03:34:03 +05:30
|
|
|
|
The Stdout_buf is transparent to our code and regardless of whose
|
|
|
|
|
buffer is used, stdout is flushed at frame end or if interactive. */
|
2011-03-31 16:45:12 +05:30
|
|
|
|
static char *Pseudo_screen;
|
2012-01-09 22:56:45 +05:30
|
|
|
|
static int Pseudo_row = PROC_XTRA;
|
2011-03-31 16:45:12 +05:30
|
|
|
|
static size_t Pseudo_size;
|
|
|
|
|
#ifndef OFF_STDIOLBF
|
2002-11-27 05:54:01 +05:30
|
|
|
|
// less than stdout's normal buffer but with luck mostly '\n' anyway
|
2002-11-25 03:34:03 +05:30
|
|
|
|
static char Stdout_buf[2048];
|
|
|
|
|
#endif
|
|
|
|
|
|
2011-03-31 16:45:12 +05:30
|
|
|
|
/* Our four WIN_t's, and which of those is considered the 'current'
|
|
|
|
|
window (ie. which window is associated with any summ info displayed
|
|
|
|
|
and to which window commands are directed) */
|
|
|
|
|
static WIN_t Winstk [GROUPSMAX];
|
|
|
|
|
static WIN_t *Curwin;
|
2002-06-19 05:15:30 +05:30
|
|
|
|
|
|
|
|
|
/* Frame oriented stuff that can't remain local to any 1 function
|
2002-11-25 03:34:03 +05:30
|
|
|
|
and/or that would be too cumbersome managed as parms,
|
2002-12-05 04:18:30 +05:30
|
|
|
|
and/or that are simply more efficiently handled as globals
|
2011-03-31 16:45:12 +05:30
|
|
|
|
[ 'Frames_...' (plural) stuff persists beyond 1 frame ]
|
|
|
|
|
[ or are used in response to async signals received ! ] */
|
2013-06-30 10:30:00 +05:30
|
|
|
|
static volatile int Frames_signal; // time to rebuild all column headers
|
2011-03-31 16:45:12 +05:30
|
|
|
|
static int Frames_libflags; // PROC_FILLxxx flags
|
|
|
|
|
static int Frame_maxtask; // last known number of active tasks
|
|
|
|
|
// ie. current 'size' of proc table
|
|
|
|
|
static float Frame_etscale; // so we can '*' vs. '/' WHEN 'pcpu'
|
|
|
|
|
static unsigned Frame_running, // state categories for this frame
|
|
|
|
|
Frame_sleepin,
|
|
|
|
|
Frame_stopped,
|
|
|
|
|
Frame_zombied;
|
|
|
|
|
static int Frame_srtflg, // the subject window's sort direction
|
|
|
|
|
Frame_ctimes, // the subject window's ctimes flag
|
|
|
|
|
Frame_cmdlin; // the subject window's cmdlin flag
|
|
|
|
|
|
|
|
|
|
/* Support for 'history' processing so we can calculate %cpu */
|
|
|
|
|
static int HHist_siz; // max number of HST_t structs
|
|
|
|
|
static HST_t *PHist_sav, // alternating 'old/new' HST_t anchors
|
|
|
|
|
*PHist_new;
|
|
|
|
|
#ifndef OFF_HST_HASH
|
2020-10-01 10:30:00 +05:30
|
|
|
|
#define HHASH_SIZ 4096
|
2011-03-31 16:45:12 +05:30
|
|
|
|
static int HHash_one [HHASH_SIZ], // actual hash tables ( hereafter known
|
|
|
|
|
HHash_two [HHASH_SIZ], // as PHash_sav/PHash_new )
|
|
|
|
|
HHash_nul [HHASH_SIZ]; // 'empty' hash table image
|
|
|
|
|
static int *PHash_sav = HHash_one, // alternating 'old/new' hash tables
|
|
|
|
|
*PHash_new = HHash_two;
|
|
|
|
|
#endif
|
2012-10-03 23:43:13 +05:30
|
|
|
|
|
|
|
|
|
/* Support for automatically sized fixed-width column expansions.
|
|
|
|
|
* (hopefully, the macros help clarify/document our new 'feature') */
|
2014-02-25 11:30:00 +05:30
|
|
|
|
static int Autox_array [EU_MAXPFLGS],
|
2012-10-03 23:43:13 +05:30
|
|
|
|
Autox_found;
|
2014-02-25 11:30:00 +05:30
|
|
|
|
#define AUTOX_NO EU_MAXPFLGS
|
1970-01-01 05:30:00 +05:30
|
|
|
|
#define AUTOX_COL(f) if (EU_MAXPFLGS > f && f >= 0) Autox_array[f] = Autox_found = 1
|
2012-10-03 23:43:13 +05:30
|
|
|
|
#define AUTOX_MODE (0 > Rc.fixed_widest)
|
top: provide the means to adjust scaled process memory
This commit is an unrequested outgrowth of the earlier
change dealing with summary area memory field scaling.
That user selectable scaling provision is now extended
to include 6 (at present) task oriented memory fields.
The new companion 'e' (lower case) interactive command
has been added and, like the 'E' command, it can cycle
each of the currently displayed memory columns between
KiB through TiB. There are, however, some differences.
Where '+' indicates summary area truncation at a given
radix, task memory fields are automatically scaled for
their column. Thus, not all rows use the same scaling.
And, while summary area field widths were not changed,
the task memory columns were widened in order to offer
more meaningful data when the radix was increased. The
precision is automatically increased in step with each
radix: MiB displays 2 decimal places, GiB 3 and TiB 4.
To compliment that additional precision, both the %CPU
and %MEM fields were widened by 1 column and now offer
precision up to 3 decimal places. But, unique to %CPU,
widening could already have occurred due to the number
of processors in some massively parallel boxes. At any
rate, total extra width for both memory and percentage
fields could amount to twenty (precious) columns more.
So for both the memory and % fields the original width
(along with loss of precision) can be restored via new
compiler conditionals which this commit also provides.
p.s. and it will be rcfile preserved for any restarts!
(now that we know a '.' + 2 spaces is squeezed to one)
(everything's perfectly justified, but it's just luck)
Reference(s):
http://www.freelists.org/post/procps/top-regression-reports
Signed-off-by: Jim Warner <james.warner@comcast.net>
2012-12-14 11:30:00 +05:30
|
|
|
|
|
|
|
|
|
/* Support for scale_mem and scale_num (to avoid duplication. */
|
2013-01-02 11:30:00 +05:30
|
|
|
|
#ifdef CASEUP_SUFIX // nls_maybe
|
2012-12-18 11:30:00 +05:30
|
|
|
|
static char Scaled_sfxtab[] = { 'K', 'M', 'G', 'T', 'P', 'E', 0 };
|
2013-01-02 11:30:00 +05:30
|
|
|
|
#else // nls_maybe
|
2012-12-18 11:30:00 +05:30
|
|
|
|
static char Scaled_sfxtab[] = { 'k', 'm', 'g', 't', 'p', 'e', 0 };
|
top: provide the means to adjust scaled process memory
This commit is an unrequested outgrowth of the earlier
change dealing with summary area memory field scaling.
That user selectable scaling provision is now extended
to include 6 (at present) task oriented memory fields.
The new companion 'e' (lower case) interactive command
has been added and, like the 'E' command, it can cycle
each of the currently displayed memory columns between
KiB through TiB. There are, however, some differences.
Where '+' indicates summary area truncation at a given
radix, task memory fields are automatically scaled for
their column. Thus, not all rows use the same scaling.
And, while summary area field widths were not changed,
the task memory columns were widened in order to offer
more meaningful data when the radix was increased. The
precision is automatically increased in step with each
radix: MiB displays 2 decimal places, GiB 3 and TiB 4.
To compliment that additional precision, both the %CPU
and %MEM fields were widened by 1 column and now offer
precision up to 3 decimal places. But, unique to %CPU,
widening could already have occurred due to the number
of processors in some massively parallel boxes. At any
rate, total extra width for both memory and percentage
fields could amount to twenty (precious) columns more.
So for both the memory and % fields the original width
(along with loss of precision) can be restored via new
compiler conditionals which this commit also provides.
p.s. and it will be rcfile preserved for any restarts!
(now that we know a '.' + 2 spaces is squeezed to one)
(everything's perfectly justified, but it's just luck)
Reference(s):
http://www.freelists.org/post/procps/top-regression-reports
Signed-off-by: Jim Warner <james.warner@comcast.net>
2012-12-14 11:30:00 +05:30
|
|
|
|
#endif
|
2013-04-08 12:30:00 +05:30
|
|
|
|
|
2017-05-13 10:33:00 +05:30
|
|
|
|
/* Support for NUMA Node display and node expansion/targeting */
|
2014-02-20 11:30:00 +05:30
|
|
|
|
#ifndef OFF_STDERROR
|
|
|
|
|
static int Stderr_save = -1;
|
|
|
|
|
#endif
|
2013-04-08 12:30:00 +05:30
|
|
|
|
static int Numa_node_tot;
|
|
|
|
|
static int Numa_node_sel = -1;
|
2014-06-18 10:30:00 +05:30
|
|
|
|
|
|
|
|
|
/* Support for Graphing of the View_STATES ('t') and View_MEMORY ('m')
|
|
|
|
|
commands -- which are now both 4-way toggles */
|
2014-06-23 10:30:00 +05:30
|
|
|
|
#define GRAPH_prefix 25 // beginning text + opening '['
|
|
|
|
|
#define GRAPH_actual 100 // the actual bars or blocks
|
|
|
|
|
#define GRAPH_suffix 2 // ending ']' + trailing space
|
|
|
|
|
static float Graph_adj; // bars/blocks scaling factor
|
|
|
|
|
static int Graph_len; // scaled length (<= GRAPH_actual)
|
2014-06-18 10:30:00 +05:30
|
|
|
|
static const char Graph_blks[] = " ";
|
|
|
|
|
static const char Graph_bars[] = "||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||";
|
2018-06-17 10:30:00 +05:30
|
|
|
|
|
|
|
|
|
/* Support for 'Other Filters' in the configuration file */
|
|
|
|
|
static const char Osel_delim_1_txt[] = "begin: saved other filter data -------------------\n";
|
|
|
|
|
static const char Osel_delim_2_txt[] = "end : saved other filter data -------------------\n";
|
|
|
|
|
static const char Osel_window_fmts[] = "window #%d, osel_tot=%d\n";
|
|
|
|
|
#define OSEL_FILTER "filter="
|
|
|
|
|
static const char Osel_filterO_fmt[] = "\ttype=%d,\t" OSEL_FILTER "%s\n";
|
|
|
|
|
static const char Osel_filterI_fmt[] = "\ttype=%d,\t" OSEL_FILTER "%*s\n";
|
2020-05-13 10:30:00 +05:30
|
|
|
|
|
|
|
|
|
/* Support for 2 abreast Cpu display (if terminal is wide enough) */
|
|
|
|
|
static char Double_sp[] = " ";
|
|
|
|
|
#define DOUBLE_space (sizeof(Double_sp) - 1)
|
2020-05-28 10:30:00 +05:30
|
|
|
|
#ifdef TOG4_NOTRUNC
|
|
|
|
|
#define DOUBLE_limit (160 + DOUBLE_space)
|
|
|
|
|
#else
|
|
|
|
|
#define DOUBLE_limit ( 80 )
|
|
|
|
|
#endif
|
2002-05-30 09:14:46 +05:30
|
|
|
|
|
|
|
|
|
/*###### Sort callbacks ################################################*/
|
|
|
|
|
|
2002-10-02 05:40:30 +05:30
|
|
|
|
/*
|
2011-03-31 16:45:12 +05:30
|
|
|
|
* These happen to be coded in the enum identifier alphabetic order,
|
|
|
|
|
* not the order of the enum 'pflgs' value. Also note that a callback
|
|
|
|
|
* routine may serve more than one column.
|
2002-10-02 05:40:30 +05:30
|
|
|
|
*/
|
2002-12-06 12:23:29 +05:30
|
|
|
|
|
2016-07-03 10:30:00 +05:30
|
|
|
|
SCB_STRS(CGN, cgname)
|
2012-06-30 10:30:55 +05:30
|
|
|
|
SCB_STRS(CGR, cgroup[0])
|
2011-05-18 14:03:44 +05:30
|
|
|
|
SCB_STRV(CMD, Frame_cmdlin, cmdline, cmd)
|
2011-03-31 16:45:12 +05:30
|
|
|
|
SCB_NUM1(COD, trs)
|
|
|
|
|
SCB_NUMx(CPN, processor)
|
|
|
|
|
SCB_NUM1(CPU, pcpu)
|
|
|
|
|
SCB_NUM1(DAT, drs)
|
|
|
|
|
SCB_NUM1(DRT, dt)
|
2012-07-01 10:30:22 +05:30
|
|
|
|
SCB_STRS(ENV, environ[0])
|
2011-03-31 16:45:12 +05:30
|
|
|
|
SCB_NUM1(FL1, maj_flt)
|
|
|
|
|
SCB_NUM1(FL2, min_flt)
|
2013-11-29 11:30:00 +05:30
|
|
|
|
SCB_NUM1(FLG, flags)
|
2012-07-08 14:32:58 +05:30
|
|
|
|
SCB_NUM1(FV1, maj_delta)
|
|
|
|
|
SCB_NUM1(FV2, min_delta)
|
2011-03-31 16:45:12 +05:30
|
|
|
|
SCB_NUMx(GID, egid)
|
|
|
|
|
SCB_STRS(GRP, egroup)
|
2015-06-13 10:30:00 +05:30
|
|
|
|
SCB_STRS(LXC, lxcname)
|
2011-03-31 16:45:12 +05:30
|
|
|
|
SCB_NUMx(NCE, nice)
|
2017-05-13 10:33:00 +05:30
|
|
|
|
static int SCB_NAME(NMA) (const proc_t **P, const proc_t **Q) {
|
|
|
|
|
/* this is a terrible cost to pay for sorting on numa nodes, but it's
|
2017-12-15 10:30:00 +05:30
|
|
|
|
necessary if we're to avoid ABI breakage via changes to the proc_t */
|
2017-05-13 10:33:00 +05:30
|
|
|
|
int p = numa_node_of_cpu((*P)->processor);
|
|
|
|
|
int q = numa_node_of_cpu((*Q)->processor);
|
|
|
|
|
return Frame_srtflg * ( q - p );
|
|
|
|
|
}
|
2013-11-11 11:30:00 +05:30
|
|
|
|
SCB_NUM1(NS1, ns[IPCNS])
|
|
|
|
|
SCB_NUM1(NS2, ns[MNTNS])
|
|
|
|
|
SCB_NUM1(NS3, ns[NETNS])
|
|
|
|
|
SCB_NUM1(NS4, ns[PIDNS])
|
|
|
|
|
SCB_NUM1(NS5, ns[USERNS])
|
|
|
|
|
SCB_NUM1(NS6, ns[UTSNS])
|
2011-04-14 02:38:14 +05:30
|
|
|
|
SCB_NUM1(OOA, oom_adj)
|
|
|
|
|
SCB_NUM1(OOM, oom_score)
|
2011-03-31 16:45:12 +05:30
|
|
|
|
SCB_NUMx(PGD, pgrp)
|
|
|
|
|
SCB_NUMx(PID, tid)
|
|
|
|
|
SCB_NUMx(PPD, ppid)
|
|
|
|
|
SCB_NUMx(PRI, priority)
|
2016-08-20 10:30:00 +05:30
|
|
|
|
SCB_NUM1(RES, resident) // also serves MEM !
|
2016-04-13 10:30:00 +05:30
|
|
|
|
SCB_NUM1(RZA, vm_rss_anon)
|
|
|
|
|
SCB_NUM1(RZF, vm_rss_file)
|
|
|
|
|
SCB_NUM1(RZL, vm_lock)
|
|
|
|
|
SCB_NUM1(RZS, vm_rss_shared)
|
2011-08-01 16:58:46 +05:30
|
|
|
|
SCB_STRX(SGD, supgid)
|
|
|
|
|
SCB_STRS(SGN, supgrp)
|
2011-03-31 16:45:12 +05:30
|
|
|
|
SCB_NUM1(SHR, share)
|
|
|
|
|
SCB_NUM1(SID, session)
|
|
|
|
|
SCB_NUMx(STA, state)
|
2011-06-02 15:45:14 +05:30
|
|
|
|
SCB_NUM1(SWP, vm_swap)
|
2011-08-17 16:31:35 +05:30
|
|
|
|
SCB_NUMx(TGD, tgid)
|
2011-03-31 16:45:12 +05:30
|
|
|
|
SCB_NUMx(THD, nlwp)
|
|
|
|
|
// also serves TM2 !
|
|
|
|
|
static int SCB_NAME(TME) (const proc_t **P, const proc_t **Q) {
|
|
|
|
|
if (Frame_ctimes) {
|
|
|
|
|
if (((*P)->cutime + (*P)->cstime + (*P)->utime + (*P)->stime)
|
|
|
|
|
< ((*Q)->cutime + (*Q)->cstime + (*Q)->utime + (*Q)->stime))
|
|
|
|
|
return SORT_lt;
|
|
|
|
|
if (((*P)->cutime + (*P)->cstime + (*P)->utime + (*P)->stime)
|
|
|
|
|
> ((*Q)->cutime + (*Q)->cstime + (*Q)->utime + (*Q)->stime))
|
|
|
|
|
return SORT_gt;
|
|
|
|
|
} else {
|
|
|
|
|
if (((*P)->utime + (*P)->stime) < ((*Q)->utime + (*Q)->stime))
|
|
|
|
|
return SORT_lt;
|
|
|
|
|
if (((*P)->utime + (*P)->stime) > ((*Q)->utime + (*Q)->stime))
|
|
|
|
|
return SORT_gt;
|
|
|
|
|
}
|
|
|
|
|
return SORT_eq;
|
2002-05-30 09:14:46 +05:30
|
|
|
|
}
|
2011-03-31 16:45:12 +05:30
|
|
|
|
SCB_NUM1(TPG, tpgid)
|
|
|
|
|
SCB_NUMx(TTY, tty)
|
|
|
|
|
SCB_NUMx(UED, euid)
|
|
|
|
|
SCB_STRS(UEN, euser)
|
|
|
|
|
SCB_NUMx(URD, ruid)
|
|
|
|
|
SCB_STRS(URN, ruser)
|
|
|
|
|
SCB_NUMx(USD, suid)
|
2015-07-31 10:30:00 +05:30
|
|
|
|
SCB_NUM2(USE, vm_rss, vm_swap)
|
2011-03-31 16:45:12 +05:30
|
|
|
|
SCB_STRS(USN, suser)
|
|
|
|
|
SCB_NUM1(VRT, size)
|
|
|
|
|
SCB_NUM1(WCH, wchan)
|
|
|
|
|
|
|
|
|
|
#ifdef OFF_HST_HASH
|
2012-02-07 22:41:11 +05:30
|
|
|
|
/* special sort for procs_hlp() ! ------------------------ */
|
2011-03-31 16:45:12 +05:30
|
|
|
|
static int sort_HST_t (const HST_t *P, const HST_t *Q) {
|
2002-12-09 04:21:09 +05:30
|
|
|
|
return P->pid - Q->pid;
|
2002-11-08 06:01:28 +05:30
|
|
|
|
}
|
2011-03-31 16:45:12 +05:30
|
|
|
|
#endif
|
|
|
|
|
|
2002-05-30 09:14:46 +05:30
|
|
|
|
/*###### Tiny useful routine(s) ########################################*/
|
|
|
|
|
|
|
|
|
|
/*
|
2011-03-31 16:45:12 +05:30
|
|
|
|
* This routine simply formats whatever the caller wants and
|
|
|
|
|
* returns a pointer to the resulting 'const char' string... */
|
2006-06-25 06:44:24 +05:30
|
|
|
|
static const char *fmtmk (const char *fmts, ...) __attribute__((format(printf,1,2)));
|
2011-03-31 16:45:12 +05:30
|
|
|
|
static const char *fmtmk (const char *fmts, ...) {
|
2004-07-07 22:57:26 +05:30
|
|
|
|
static char buf[BIGBUFSIZ]; // with help stuff, our buffer
|
2011-03-31 16:45:12 +05:30
|
|
|
|
va_list va; // requirements now exceed 1k
|
2002-05-30 09:14:46 +05:30
|
|
|
|
|
|
|
|
|
va_start(va, fmts);
|
2002-09-13 17:12:44 +05:30
|
|
|
|
vsnprintf(buf, sizeof(buf), fmts, va);
|
2002-05-30 09:14:46 +05:30
|
|
|
|
va_end(va);
|
|
|
|
|
return (const char *)buf;
|
2011-03-31 16:45:12 +05:30
|
|
|
|
} // end: fmtmk
|
2002-02-02 04:17:29 +05:30
|
|
|
|
|
2002-05-30 09:14:46 +05:30
|
|
|
|
|
2011-03-31 16:45:12 +05:30
|
|
|
|
/*
|
|
|
|
|
* This guy is just our way of avoiding the overhead of the standard
|
|
|
|
|
* strcat function (should the caller choose to participate) */
|
2018-05-18 10:30:00 +05:30
|
|
|
|
static inline char *scat (char *dst, const char *src) {
|
|
|
|
|
while (*dst) dst++;
|
|
|
|
|
while ((*(dst++) = *(src++)));
|
2002-11-25 03:34:03 +05:30
|
|
|
|
return --dst;
|
2011-03-31 16:45:12 +05:30
|
|
|
|
} // end: scat
|
2002-11-25 03:34:03 +05:30
|
|
|
|
|
|
|
|
|
|
2011-03-31 16:45:12 +05:30
|
|
|
|
/*
|
|
|
|
|
* This guy just facilitates Batch and protects against dumb ttys
|
|
|
|
|
* -- we'd 'inline' him but he's only called twice per frame,
|
|
|
|
|
* yet used in many other locations. */
|
|
|
|
|
static const char *tg2 (int x, int y) {
|
|
|
|
|
// it's entirely possible we're trying for an invalid row...
|
2002-10-02 05:40:30 +05:30
|
|
|
|
return Cap_can_goto ? tgoto(cursor_address, x, y) : "";
|
2011-03-31 16:45:12 +05:30
|
|
|
|
} // end: tg2
|
|
|
|
|
|
2002-06-19 05:15:30 +05:30
|
|
|
|
/*###### Exit/Interrput routines #######################################*/
|
|
|
|
|
|
2011-03-31 16:45:12 +05:30
|
|
|
|
/*
|
2012-12-12 11:30:00 +05:30
|
|
|
|
* Reset the tty, if necessary */
|
|
|
|
|
static void at_eoj (void) {
|
2011-03-31 16:45:12 +05:30
|
|
|
|
if (Ttychanged) {
|
|
|
|
|
tcsetattr(STDIN_FILENO, TCSAFLUSH, &Tty_original);
|
2013-01-16 11:30:00 +05:30
|
|
|
|
if (keypad_local) putp(keypad_local);
|
2013-07-06 10:30:00 +05:30
|
|
|
|
putp(tg2(0, Screen_rows));
|
top: inoculated against a window manager like 'screen'
If top were invoked under the 'screen' window manager,
writing the terminfo string 'exit_ca_mode' at top exit
would not restore the display to the state existing at
the time top was started. That's what occurs normally.
The net result of that failure was a corrupted screen.
However, there is a 'screen' configuration option that
will produce proper 'rmcup' behavior, but it is off by
default. That screencr option is known as 'altscreen'.
I stumbled across this provision by cloning the screen
git repository then searching for references to 'cup'.
If 'altscreen on' had been in either the /etc/screenrc
or the $HOME/.screenrc configuration file, my poor old
top would never have been accused of such corruptions.
Of course, the Programming Gods decree that any simple
solution for our problem must always be revealed last.
So before discovering that rc option, another approach
was taken involving top only. With just a little extra
refactoring of top display logic he was made immune to
any such quirk in the implementation of 'smcup/rmcup'.
I always feel good about any enhancement that actually
reduces the total number of lines of code. Even though
this change involved mostly rearranging some logic, it
yielded one less line (can't judge by diffstat because
of braces & notes). Anyway, rather than requiring some
change to a screenrc file, now we are self-sufficient.
Reference(s):
procps ---------------------------------------------
https://bugzilla.redhat.com/show_bug.cgi?id=962022
http://www.freelists.org/post/procps/top-procpsng337-no-screen-cleaning-at-exit,3
. top : disable tty scrollback buffer to improve SIGWINCH
commit dedaf6e1a81738ff08ee8e8523871e12f555ad6d
screen ---------------------------------------------
git://git.sv.gnu.org/screen.git
. Improve cursor store/restore on smcup/rmcup.
commit f95352946080be803b794c9f2733d8c809c1a39a
. Fix using alternate screen buffers in some cases.
commit ad56f746c6243d45124485d198d577bdbb78071c
http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=558724
Signed-off-by: Jim Warner <james.warner@comcast.net>
2013-05-18 10:30:00 +05:30
|
|
|
|
putp("\n");
|
2013-06-28 10:30:00 +05:30
|
|
|
|
#ifdef OFF_SCROLLBK
|
top: inoculated against a window manager like 'screen'
If top were invoked under the 'screen' window manager,
writing the terminfo string 'exit_ca_mode' at top exit
would not restore the display to the state existing at
the time top was started. That's what occurs normally.
The net result of that failure was a corrupted screen.
However, there is a 'screen' configuration option that
will produce proper 'rmcup' behavior, but it is off by
default. That screencr option is known as 'altscreen'.
I stumbled across this provision by cloning the screen
git repository then searching for references to 'cup'.
If 'altscreen on' had been in either the /etc/screenrc
or the $HOME/.screenrc configuration file, my poor old
top would never have been accused of such corruptions.
Of course, the Programming Gods decree that any simple
solution for our problem must always be revealed last.
So before discovering that rc option, another approach
was taken involving top only. With just a little extra
refactoring of top display logic he was made immune to
any such quirk in the implementation of 'smcup/rmcup'.
I always feel good about any enhancement that actually
reduces the total number of lines of code. Even though
this change involved mostly rearranging some logic, it
yielded one less line (can't judge by diffstat because
of braces & notes). Anyway, rather than requiring some
change to a screenrc file, now we are self-sufficient.
Reference(s):
procps ---------------------------------------------
https://bugzilla.redhat.com/show_bug.cgi?id=962022
http://www.freelists.org/post/procps/top-procpsng337-no-screen-cleaning-at-exit,3
. top : disable tty scrollback buffer to improve SIGWINCH
commit dedaf6e1a81738ff08ee8e8523871e12f555ad6d
screen ---------------------------------------------
git://git.sv.gnu.org/screen.git
. Improve cursor store/restore on smcup/rmcup.
commit f95352946080be803b794c9f2733d8c809c1a39a
. Fix using alternate screen buffers in some cases.
commit ad56f746c6243d45124485d198d577bdbb78071c
http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=558724
Signed-off-by: Jim Warner <james.warner@comcast.net>
2013-05-18 10:30:00 +05:30
|
|
|
|
if (exit_ca_mode) {
|
2013-01-31 11:30:00 +05:30
|
|
|
|
// this next will also replace top's most recent screen with the
|
|
|
|
|
// original display contents that were visible at our invocation
|
|
|
|
|
putp(exit_ca_mode);
|
|
|
|
|
}
|
2013-06-28 10:30:00 +05:30
|
|
|
|
#endif
|
2011-03-31 16:45:12 +05:30
|
|
|
|
putp(Cap_curs_norm);
|
top: inoculated against a window manager like 'screen'
If top were invoked under the 'screen' window manager,
writing the terminfo string 'exit_ca_mode' at top exit
would not restore the display to the state existing at
the time top was started. That's what occurs normally.
The net result of that failure was a corrupted screen.
However, there is a 'screen' configuration option that
will produce proper 'rmcup' behavior, but it is off by
default. That screencr option is known as 'altscreen'.
I stumbled across this provision by cloning the screen
git repository then searching for references to 'cup'.
If 'altscreen on' had been in either the /etc/screenrc
or the $HOME/.screenrc configuration file, my poor old
top would never have been accused of such corruptions.
Of course, the Programming Gods decree that any simple
solution for our problem must always be revealed last.
So before discovering that rc option, another approach
was taken involving top only. With just a little extra
refactoring of top display logic he was made immune to
any such quirk in the implementation of 'smcup/rmcup'.
I always feel good about any enhancement that actually
reduces the total number of lines of code. Even though
this change involved mostly rearranging some logic, it
yielded one less line (can't judge by diffstat because
of braces & notes). Anyway, rather than requiring some
change to a screenrc file, now we are self-sufficient.
Reference(s):
procps ---------------------------------------------
https://bugzilla.redhat.com/show_bug.cgi?id=962022
http://www.freelists.org/post/procps/top-procpsng337-no-screen-cleaning-at-exit,3
. top : disable tty scrollback buffer to improve SIGWINCH
commit dedaf6e1a81738ff08ee8e8523871e12f555ad6d
screen ---------------------------------------------
git://git.sv.gnu.org/screen.git
. Improve cursor store/restore on smcup/rmcup.
commit f95352946080be803b794c9f2733d8c809c1a39a
. Fix using alternate screen buffers in some cases.
commit ad56f746c6243d45124485d198d577bdbb78071c
http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=558724
Signed-off-by: Jim Warner <james.warner@comcast.net>
2013-05-18 10:30:00 +05:30
|
|
|
|
putp(Cap_clr_eol);
|
2011-03-31 16:45:12 +05:30
|
|
|
|
#ifndef RMAN_IGNORED
|
|
|
|
|
putp(Cap_smam);
|
|
|
|
|
#endif
|
|
|
|
|
}
|
2002-11-25 03:34:03 +05:30
|
|
|
|
fflush(stdout);
|
2014-02-20 11:30:00 +05:30
|
|
|
|
#ifndef OFF_STDERROR
|
|
|
|
|
/* we gotta reverse the stderr redirect which was employed during start up
|
|
|
|
|
and needed because the two libnuma 'weak' functions were useless to us! */
|
|
|
|
|
if (-1 < Stderr_save) {
|
|
|
|
|
dup2(Stderr_save, fileno(stderr));
|
|
|
|
|
close(Stderr_save);
|
|
|
|
|
Stderr_save = -1; // we'll be ending soon anyway but what the heck
|
|
|
|
|
}
|
|
|
|
|
#endif
|
2013-01-16 11:30:00 +05:30
|
|
|
|
} // end: at_eoj
|
2012-12-12 11:30:00 +05:30
|
|
|
|
|
2002-06-19 05:15:30 +05:30
|
|
|
|
|
2012-12-12 11:30:00 +05:30
|
|
|
|
/*
|
|
|
|
|
* The real program end */
|
|
|
|
|
static void bye_bye (const char *str) NORETURN;
|
|
|
|
|
static void bye_bye (const char *str) {
|
2019-08-06 10:30:00 +05:30
|
|
|
|
sigset_t ss;
|
|
|
|
|
|
|
|
|
|
// POSIX.1-2004 async-signal-safe: sigfillset, sigprocmask
|
|
|
|
|
sigfillset(&ss);
|
|
|
|
|
sigprocmask(SIG_BLOCK, &ss, NULL);
|
2012-12-12 11:30:00 +05:30
|
|
|
|
at_eoj(); // restore tty in preparation for exit
|
2011-04-14 02:38:14 +05:30
|
|
|
|
#ifdef ATEOJ_RPTSTD
|
2011-03-31 16:45:12 +05:30
|
|
|
|
{ proc_t *p;
|
2013-06-30 10:30:00 +05:30
|
|
|
|
if (!str && !Frames_signal && Ttychanged) { fprintf(stderr,
|
2011-10-12 00:32:59 +05:30
|
|
|
|
"\n%s's Summary report:"
|
|
|
|
|
"\n\tProgram"
|
2015-06-20 10:30:00 +05:30
|
|
|
|
"\n\t %s"
|
2011-10-12 00:32:59 +05:30
|
|
|
|
"\n\t Hertz = %u (%u bytes, %u-bit time)"
|
2014-07-17 22:42:12 +05:30
|
|
|
|
"\n\t page_bytes = %d, Cpu_faux_tot = %d, smp_num_cpus = %d"
|
|
|
|
|
"\n\t sizeof(CPU_t) = %u, sizeof(HST_t) = %u (%d HST_t's/Page), HHist_siz = %u"
|
2018-08-08 10:30:00 +05:30
|
|
|
|
"\n\t sizeof(proc_t) = %u, sizeof(proc_t.cmd) = %u, sizeof(proc_t *) = %u"
|
2011-10-12 00:32:59 +05:30
|
|
|
|
"\n\t Frames_libflags = %08lX"
|
|
|
|
|
"\n\t SCREENMAX = %u, ROWMINSIZ = %u, ROWMAXSIZ = %u"
|
2012-01-04 19:35:58 +05:30
|
|
|
|
"\n\t PACKAGE = '%s', LOCALEDIR = '%s'"
|
2011-10-12 00:32:59 +05:30
|
|
|
|
"\n\tTerminal: %s"
|
|
|
|
|
"\n\t device = %s, ncurses = v%s"
|
|
|
|
|
"\n\t max_colors = %d, max_pairs = %d"
|
|
|
|
|
"\n\t Cap_can_goto = %s"
|
|
|
|
|
"\n\t Screen_cols = %d, Screen_rows = %d"
|
|
|
|
|
"\n\t Max_lines = %d, most recent Pseudo_size = %u"
|
2011-03-31 16:45:12 +05:30
|
|
|
|
#ifndef OFF_STDIOLBF
|
2011-10-12 00:32:59 +05:30
|
|
|
|
"\n\t Stdout_buf = %u, BUFSIZ = %u"
|
2011-03-31 16:45:12 +05:30
|
|
|
|
#endif
|
2011-10-12 00:32:59 +05:30
|
|
|
|
"\n\tWindows and Curwin->"
|
|
|
|
|
"\n\t sizeof(WIN_t) = %u, GROUPSMAX = %d"
|
|
|
|
|
"\n\t winname = %s, grpname = %s"
|
2011-03-31 16:45:12 +05:30
|
|
|
|
#ifdef CASEUP_HEXES
|
2011-10-12 00:32:59 +05:30
|
|
|
|
"\n\t winflags = %08X, maxpflgs = %d"
|
2011-03-31 16:45:12 +05:30
|
|
|
|
#else
|
2011-10-12 00:32:59 +05:30
|
|
|
|
"\n\t winflags = %08x, maxpflgs = %d"
|
2011-03-31 16:45:12 +05:30
|
|
|
|
#endif
|
2012-10-06 01:45:15 +05:30
|
|
|
|
"\n\t sortindx = %d, fieldscur = %s"
|
2011-10-12 00:32:59 +05:30
|
|
|
|
"\n\t maxtasks = %d, varcolsz = %d, winlines = %d"
|
|
|
|
|
"\n\t strlen(columnhdr) = %d"
|
|
|
|
|
"\n"
|
2011-03-31 16:45:12 +05:30
|
|
|
|
, __func__
|
2015-06-18 18:07:24 +05:30
|
|
|
|
, PACKAGE_STRING
|
2011-03-31 16:45:12 +05:30
|
|
|
|
, (unsigned)Hertz, (unsigned)sizeof(Hertz), (unsigned)sizeof(Hertz) * 8
|
2014-07-17 22:42:12 +05:30
|
|
|
|
, (int)page_bytes, Cpu_faux_tot, (int)smp_num_cpus, (unsigned)sizeof(CPU_t)
|
|
|
|
|
, (unsigned)sizeof(HST_t), ((int)page_bytes / (int)sizeof(HST_t)), HHist_siz
|
2018-08-08 10:30:00 +05:30
|
|
|
|
, (unsigned)sizeof(proc_t), (unsigned)sizeof(p->cmd), (unsigned)sizeof(proc_t *)
|
2011-03-31 16:45:12 +05:30
|
|
|
|
, (long)Frames_libflags
|
2011-04-14 02:38:14 +05:30
|
|
|
|
, (unsigned)SCREENMAX, (unsigned)ROWMINSIZ, (unsigned)ROWMAXSIZ
|
2012-01-04 19:35:58 +05:30
|
|
|
|
, PACKAGE, LOCALEDIR
|
2002-06-19 05:15:30 +05:30
|
|
|
|
#ifdef PRETENDNOCAP
|
|
|
|
|
, "dumb"
|
|
|
|
|
#else
|
|
|
|
|
, termname()
|
|
|
|
|
#endif
|
|
|
|
|
, ttyname(STDOUT_FILENO), NCURSES_VERSION
|
|
|
|
|
, max_colors, max_pairs
|
|
|
|
|
, Cap_can_goto ? "yes" : "No!"
|
|
|
|
|
, Screen_cols, Screen_rows
|
2011-03-31 16:45:12 +05:30
|
|
|
|
, Max_lines, (unsigned)Pseudo_size
|
|
|
|
|
#ifndef OFF_STDIOLBF
|
|
|
|
|
, (unsigned)sizeof(Stdout_buf), (unsigned)BUFSIZ
|
2002-11-25 03:34:03 +05:30
|
|
|
|
#endif
|
2011-03-31 16:45:12 +05:30
|
|
|
|
, (unsigned)sizeof(WIN_t), GROUPSMAX
|
2002-11-30 06:52:01 +05:30
|
|
|
|
, Curwin->rc.winname, Curwin->grpname
|
|
|
|
|
, Curwin->rc.winflags, Curwin->maxpflgs
|
2012-01-04 19:35:58 +05:30
|
|
|
|
, Curwin->rc.sortindx, Curwin->rc.fieldscur
|
2011-04-15 04:54:29 +05:30
|
|
|
|
, Curwin->rc.maxtasks, Curwin->varcolsz, Curwin->winlines
|
2011-03-31 16:45:12 +05:30
|
|
|
|
, (int)strlen(Curwin->columnhdr)
|
2004-07-07 22:57:26 +05:30
|
|
|
|
);
|
2011-03-31 16:45:12 +05:30
|
|
|
|
}
|
2002-06-19 05:15:30 +05:30
|
|
|
|
}
|
2011-04-14 02:38:14 +05:30
|
|
|
|
#endif // end: ATEOJ_RPTSTD
|
2002-06-19 05:15:30 +05:30
|
|
|
|
|
2011-03-31 16:45:12 +05:30
|
|
|
|
#ifndef OFF_HST_HASH
|
2011-04-14 02:38:14 +05:30
|
|
|
|
#ifdef ATEOJ_RPTHSH
|
2013-06-30 10:30:00 +05:30
|
|
|
|
if (!str && !Frames_signal && Ttychanged) {
|
2011-04-14 02:38:14 +05:30
|
|
|
|
int i, j, pop, total_occupied, maxdepth, maxdepth_sav, numdepth
|
|
|
|
|
, cross_foot, sz = HHASH_SIZ * (unsigned)sizeof(int);
|
|
|
|
|
int depths[HHASH_SIZ];
|
|
|
|
|
|
|
|
|
|
for (i = 0, total_occupied = 0, maxdepth = 0; i < HHASH_SIZ; i++) {
|
|
|
|
|
int V = PHash_new[i];
|
|
|
|
|
j = 0;
|
|
|
|
|
if (-1 < V) {
|
|
|
|
|
++total_occupied;
|
|
|
|
|
while (-1 < V) {
|
|
|
|
|
V = PHist_new[V].lnk;
|
|
|
|
|
if (-1 < V) j++;
|
|
|
|
|
}
|
2011-03-31 16:45:12 +05:30
|
|
|
|
}
|
2011-04-14 02:38:14 +05:30
|
|
|
|
depths[i] = j;
|
|
|
|
|
if (maxdepth < j) maxdepth = j;
|
2011-03-31 16:45:12 +05:30
|
|
|
|
}
|
2011-04-14 02:38:14 +05:30
|
|
|
|
maxdepth_sav = maxdepth;
|
2002-06-19 05:15:30 +05:30
|
|
|
|
|
2011-03-31 16:45:12 +05:30
|
|
|
|
fprintf(stderr,
|
2011-10-12 00:32:59 +05:30
|
|
|
|
"\n%s's Supplementary HASH report:"
|
|
|
|
|
"\n\tTwo Tables providing for %d entries each + 1 extra for 'empty' image"
|
|
|
|
|
"\n\t%dk (%d bytes) per table, %d total bytes (including 'empty' image)"
|
|
|
|
|
"\n\tResults from latest hash (PHash_new + PHist_new)..."
|
|
|
|
|
"\n"
|
|
|
|
|
"\n\tTotal hashed = %d"
|
|
|
|
|
"\n\tLevel-0 hash entries = %d (%d%% occupied)"
|
|
|
|
|
"\n\tMax Depth = %d"
|
|
|
|
|
"\n\n"
|
2011-04-14 02:38:14 +05:30
|
|
|
|
, __func__
|
|
|
|
|
, HHASH_SIZ, sz / 1024, sz, sz * 3
|
|
|
|
|
, Frame_maxtask
|
|
|
|
|
, total_occupied, (total_occupied * 100) / HHASH_SIZ
|
|
|
|
|
, maxdepth + 1);
|
|
|
|
|
|
|
|
|
|
if (total_occupied) {
|
|
|
|
|
for (pop = total_occupied, cross_foot = 0; maxdepth; maxdepth--) {
|
|
|
|
|
for (i = 0, numdepth = 0; i < HHASH_SIZ; i++)
|
|
|
|
|
if (depths[i] == maxdepth) ++numdepth;
|
2020-10-19 10:30:00 +05:30
|
|
|
|
if (numdepth) fprintf(stderr,
|
2011-10-12 00:32:59 +05:30
|
|
|
|
"\t %5d (%3d%%) hash table entries at depth %d\n"
|
2011-04-14 02:38:14 +05:30
|
|
|
|
, numdepth, (numdepth * 100) / total_occupied, maxdepth + 1);
|
|
|
|
|
pop -= numdepth;
|
|
|
|
|
cross_foot += numdepth;
|
|
|
|
|
if (0 == pop && cross_foot == total_occupied) break;
|
|
|
|
|
}
|
|
|
|
|
if (pop) {
|
2011-10-12 00:32:59 +05:30
|
|
|
|
fprintf(stderr, "\t %5d (%3d%%) unchained hash table entries\n"
|
2011-04-14 02:38:14 +05:30
|
|
|
|
, pop, (pop * 100) / total_occupied);
|
|
|
|
|
cross_foot += pop;
|
|
|
|
|
}
|
|
|
|
|
fprintf(stderr,
|
|
|
|
|
"\t -----\n"
|
2011-10-12 00:32:59 +05:30
|
|
|
|
"\t %5d total entries occupied\n", cross_foot);
|
2011-04-14 02:38:14 +05:30
|
|
|
|
|
2015-10-23 10:30:00 +05:30
|
|
|
|
if (maxdepth_sav > 1) {
|
2011-10-12 00:32:59 +05:30
|
|
|
|
fprintf(stderr, "\nPIDs at max depth: ");
|
2011-04-14 02:38:14 +05:30
|
|
|
|
for (i = 0; i < HHASH_SIZ; i++)
|
|
|
|
|
if (depths[i] == maxdepth_sav) {
|
|
|
|
|
j = PHash_new[i];
|
|
|
|
|
fprintf(stderr, "\n\tpos %4d: %05d", i, PHist_new[j].pid);
|
|
|
|
|
while (-1 < j) {
|
|
|
|
|
j = PHist_new[j].lnk;
|
|
|
|
|
if (-1 < j) fprintf(stderr, ", %05d", PHist_new[j].pid);
|
|
|
|
|
}
|
2011-03-31 16:45:12 +05:30
|
|
|
|
}
|
2011-04-14 02:38:14 +05:30
|
|
|
|
fprintf(stderr, "\n");
|
|
|
|
|
}
|
2011-03-31 16:45:12 +05:30
|
|
|
|
}
|
|
|
|
|
}
|
2011-04-14 02:38:14 +05:30
|
|
|
|
#endif // end: ATEOJ_RPTHSH
|
2011-03-31 16:45:12 +05:30
|
|
|
|
#endif // end: OFF_HST_HASH
|
2002-06-19 05:15:30 +05:30
|
|
|
|
|
2017-05-13 10:33:00 +05:30
|
|
|
|
numa_uninit();
|
2011-03-31 16:45:12 +05:30
|
|
|
|
if (str) {
|
|
|
|
|
fputs(str, stderr);
|
2012-04-11 14:41:12 +05:30
|
|
|
|
exit(EXIT_FAILURE);
|
2002-06-19 05:15:30 +05:30
|
|
|
|
}
|
top: address the argument parsing quirk involving '-h'
There exists the possibility that a 'putp' call can be
issued before the 'setupterm' invocation has occurred,
as is reflected in a bugzilla report referenced below.
Strangely, such a SEGV isn't always triggered as logic
would suggest it ought to be. I experienced a fault in
these environments with the associated curses version:
. archlinux, procps-ng 3.3.12, ncurses 6.0.20170429
. fedora-25, procps-ng 3.3.10, ncurses 6.0.20160709
. opensuse-42.2, procps-ng 3.3.9, ncurses 5.9.20140201
. gentoo, procps-ng 3.3.12, ncurses 6.0.20150808
. slackw-14.2, procps-ng 3.3.12, ncurses 6.0.20160910
Whereas under these environments there was no problem:
. ubuntu-17.04, procps-ng 3.3.12, ncurses 6.0.20160625
. debian-test, procps-ng 3.3.12, ncurses 6.0.20161126
. mageia-5.1, procps-ng 3.3.9, ncurses 5.9.20140323
[ as an aside, the expected result in the bug report ]
[ is incorrect and should mention the '1' parameter. ]
[ however, until release 3.3.13 when the '1' becomes ]
[ a valid switch, numbers are not detected when used ]
[ with any switch which doesn't require an argument. ]
[ you're welcome to treat that as a separate bugglet ]
Reference(s):
https://bugzilla.redhat.com/show_bug.cgi?id=1450429
Signed-off-by: Jim Warner <james.warner@comcast.net>
2017-05-17 10:30:00 +05:30
|
|
|
|
if (Batch) fputs("\n", stdout);
|
2012-04-11 14:41:12 +05:30
|
|
|
|
exit(EXIT_SUCCESS);
|
2011-03-31 16:45:12 +05:30
|
|
|
|
} // end: bye_bye
|
2005-01-06 01:59:26 +05:30
|
|
|
|
|
|
|
|
|
|
|
|
|
|
/*
|
2011-03-31 16:45:12 +05:30
|
|
|
|
* Standard error handler to normalize the look of all err output */
|
|
|
|
|
static void error_exit (const char *str) NORETURN;
|
|
|
|
|
static void error_exit (const char *str) {
|
|
|
|
|
static char buf[MEDBUFSIZ];
|
2005-01-06 01:59:26 +05:30
|
|
|
|
|
2013-01-11 11:30:00 +05:30
|
|
|
|
/* we'll use our own buffer so callers can still use fmtmk() and, after
|
|
|
|
|
twelve long years, 2013 was the year we finally eliminated the leading
|
|
|
|
|
tab character -- now our message can get lost in screen clutter too! */
|
|
|
|
|
snprintf(buf, sizeof(buf), "%s: %s\n", Myname, str);
|
2011-03-31 16:45:12 +05:30
|
|
|
|
bye_bye(buf);
|
|
|
|
|
} // end: error_exit
|
2002-06-19 05:15:30 +05:30
|
|
|
|
|
|
|
|
|
|
2011-09-12 17:48:23 +05:30
|
|
|
|
/*
|
|
|
|
|
* Catches all remaining signals not otherwise handled */
|
2020-01-03 11:30:00 +05:30
|
|
|
|
static void sig_abexit (int sig) NORETURN;
|
2011-09-12 17:48:23 +05:30
|
|
|
|
static void sig_abexit (int sig) {
|
|
|
|
|
sigset_t ss;
|
|
|
|
|
|
2020-01-03 11:30:00 +05:30
|
|
|
|
// POSIX.1-2004 async-signal-safe: sigfillset, sigprocmask, signal, sigemptyset, sigaddset, raise
|
2011-09-12 17:48:23 +05:30
|
|
|
|
sigfillset(&ss);
|
|
|
|
|
sigprocmask(SIG_BLOCK, &ss, NULL);
|
2012-12-12 11:30:00 +05:30
|
|
|
|
at_eoj(); // restore tty in preparation for exit
|
|
|
|
|
fprintf(stderr, N_fmt(EXIT_signals_fmt)
|
|
|
|
|
, sig, signal_number_to_name(sig), Myname);
|
|
|
|
|
signal(sig, SIG_DFL); // allow core dumps, if applicable
|
2020-01-03 11:30:00 +05:30
|
|
|
|
sigemptyset(&ss);
|
|
|
|
|
sigaddset(&ss, sig);
|
|
|
|
|
sigprocmask(SIG_UNBLOCK, &ss, NULL);
|
2012-12-12 11:30:00 +05:30
|
|
|
|
raise(sig); // ( plus set proper return code )
|
2020-01-03 11:30:00 +05:30
|
|
|
|
_exit(EXIT_FAILURE); // if default sig action is ignore
|
2011-09-12 17:48:23 +05:30
|
|
|
|
} // end: sig_abexit
|
|
|
|
|
|
|
|
|
|
|
2011-03-31 16:45:12 +05:30
|
|
|
|
/*
|
|
|
|
|
* Catches:
|
2012-12-12 11:30:00 +05:30
|
|
|
|
* SIGALRM, SIGHUP, SIGINT, SIGPIPE, SIGQUIT, SIGTERM,
|
|
|
|
|
* SIGUSR1 and SIGUSR2 */
|
2011-09-12 17:48:23 +05:30
|
|
|
|
static void sig_endpgm (int dont_care_sig) NORETURN;
|
2011-03-31 16:45:12 +05:30
|
|
|
|
static void sig_endpgm (int dont_care_sig) {
|
2020-01-22 11:30:00 +05:30
|
|
|
|
Frames_signal = BREAK_sig;
|
2011-09-12 17:48:23 +05:30
|
|
|
|
bye_bye(NULL);
|
2011-03-31 16:45:12 +05:30
|
|
|
|
(void)dont_care_sig;
|
|
|
|
|
} // end: sig_endpgm
|
2002-05-30 09:14:46 +05:30
|
|
|
|
|
2004-02-24 00:17:42 +05:30
|
|
|
|
|
2002-05-30 09:14:46 +05:30
|
|
|
|
/*
|
2011-03-31 16:45:12 +05:30
|
|
|
|
* Catches:
|
2013-06-28 10:30:00 +05:30
|
|
|
|
* SIGTSTP, SIGTTIN and SIGTTOU */
|
2011-03-31 16:45:12 +05:30
|
|
|
|
static void sig_paused (int dont_care_sig) {
|
2013-01-16 11:30:00 +05:30
|
|
|
|
// POSIX.1-2004 async-signal-safe: tcsetattr, tcdrain, raise
|
|
|
|
|
if (-1 == tcsetattr(STDIN_FILENO, TCSAFLUSH, &Tty_original))
|
|
|
|
|
error_exit(fmtmk(N_fmt(FAIL_tty_set_fmt), strerror(errno)));
|
|
|
|
|
if (keypad_local) putp(keypad_local);
|
2013-07-06 10:30:00 +05:30
|
|
|
|
putp(tg2(0, Screen_rows));
|
2013-01-16 11:30:00 +05:30
|
|
|
|
putp(Cap_curs_norm);
|
|
|
|
|
#ifndef RMAN_IGNORED
|
|
|
|
|
putp(Cap_smam);
|
|
|
|
|
#endif
|
2013-01-31 11:30:00 +05:30
|
|
|
|
// tcdrain(STDOUT_FILENO) was not reliable prior to ncurses-5.9.20121017,
|
|
|
|
|
// so we'll risk POSIX's wrath with good ol' fflush, lest 'Stopped' gets
|
|
|
|
|
// co-mingled with our most recent output...
|
|
|
|
|
fflush(stdout);
|
2013-01-16 11:30:00 +05:30
|
|
|
|
raise(SIGSTOP);
|
|
|
|
|
// later, after SIGCONT...
|
|
|
|
|
if (-1 == tcsetattr(STDIN_FILENO, TCSAFLUSH, &Tty_raw))
|
|
|
|
|
error_exit(fmtmk(N_fmt(FAIL_tty_set_fmt), strerror(errno)));
|
|
|
|
|
#ifndef RMAN_IGNORED
|
|
|
|
|
putp(Cap_rmam);
|
|
|
|
|
#endif
|
|
|
|
|
if (keypad_xmit) putp(keypad_xmit);
|
2013-01-29 11:30:00 +05:30
|
|
|
|
putp(Cursor_state);
|
2013-06-30 10:30:00 +05:30
|
|
|
|
Frames_signal = BREAK_sig;
|
2011-09-12 17:48:23 +05:30
|
|
|
|
(void)dont_care_sig;
|
2011-03-31 16:45:12 +05:30
|
|
|
|
} // end: sig_paused
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
/*
|
|
|
|
|
* Catches:
|
|
|
|
|
* SIGCONT and SIGWINCH */
|
|
|
|
|
static void sig_resize (int dont_care_sig) {
|
2013-01-16 11:30:00 +05:30
|
|
|
|
// POSIX.1-2004 async-signal-safe: tcdrain
|
|
|
|
|
tcdrain(STDOUT_FILENO);
|
2013-06-30 10:30:00 +05:30
|
|
|
|
Frames_signal = BREAK_sig;
|
2011-03-31 16:45:12 +05:30
|
|
|
|
(void)dont_care_sig;
|
|
|
|
|
} // end: sig_resize
|
2017-11-14 10:30:00 +05:30
|
|
|
|
|
|
|
|
|
|
|
|
|
|
/*
|
|
|
|
|
* Handles libproc memory errors, so our tty can be reset */
|
|
|
|
|
static void xalloc_our_handler (const char *fmts, ...) {
|
|
|
|
|
static char buf[MEDBUFSIZ];
|
|
|
|
|
va_list va;
|
|
|
|
|
|
|
|
|
|
va_start(va, fmts);
|
|
|
|
|
vsnprintf(buf, sizeof(buf), fmts, va);
|
|
|
|
|
va_end(va);
|
2018-05-18 10:30:00 +05:30
|
|
|
|
scat(buf, "\n");
|
2017-11-14 10:30:00 +05:30
|
|
|
|
bye_bye(buf);
|
|
|
|
|
} // end: xalloc_our_handler
|
2011-03-31 16:45:12 +05:30
|
|
|
|
|
top: refactored for correct multi-byte string handling
When this project first began implementing translation
support nearly 6 years ago, we overcame many 'gettext'
obstacles and limitations. And, of course, there were
not any actual translations at the time so our testing
was quite limited plus, in many cases, only simulated.
None of that, however, can justify or excuse the total
lack of attention to top's approach to NLS, especially
since some actual translations have existed for years.
When the issue referenced below was raised, I suffered
immediate feelings of anxiety, doubt and pending doom.
This was mostly because top strives to avoid line wrap
at all costs and that did not bode well for multi-byte
translated strings, using several bytes per character.
I was also concerned over possible performance impact,
assuming it was even possible to properly handle utf8.
But, after wrestling with the problem for several days
those initial feelings have now been replaced by guilt
over any trouble I initially caused those translators.
One can only imagine how frustrating it must have been
after the translation effort to then see top display a
misaligned column header and fields management page or
truncated screens like those of help or color mapping.
------------------------------------------------------
Ok, with that off my chest let's review these changes,
now that top properly handles UTF8 multi-byte strings.
. Performance - virtually all of this newly added cost
for multi-byte support is incurred during interactions
with the user. So, performance is not really an issue.
The one occasion when performance is impacted is found
during 'summary_show()' processing, due to an addition
of one new call to 'utf8_delta()' in 'show_special()'.
. Extra Wide Characters - I have not yet and may never
figure out a way to support languages like zh_CN where
the characters can be wider than most other languages.
. Translated User Name - at some future point we could
implement translation of user names. But as the author
of the issue acknowledged such names are non-standard.
Thus task display still incurs no new multi-byte costs
beyond those already incurred in that escape.c module.
For raising the issue I extend my sincerest thanks to:
Göran Uddeborg
Reference(s):
https://gitlab.com/procps-ng/procps/issues/68
Signed-off-by: Jim Warner <james.warner@comcast.net>
2017-09-27 10:32:22 +05:30
|
|
|
|
/*###### Special UTF-8 Multi-Byte support ##############################*/
|
|
|
|
|
|
2017-09-30 11:41:11 +05:30
|
|
|
|
/* Support for NLS translated multi-byte strings */
|
top: refactored for correct multi-byte string handling
When this project first began implementing translation
support nearly 6 years ago, we overcame many 'gettext'
obstacles and limitations. And, of course, there were
not any actual translations at the time so our testing
was quite limited plus, in many cases, only simulated.
None of that, however, can justify or excuse the total
lack of attention to top's approach to NLS, especially
since some actual translations have existed for years.
When the issue referenced below was raised, I suffered
immediate feelings of anxiety, doubt and pending doom.
This was mostly because top strives to avoid line wrap
at all costs and that did not bode well for multi-byte
translated strings, using several bytes per character.
I was also concerned over possible performance impact,
assuming it was even possible to properly handle utf8.
But, after wrestling with the problem for several days
those initial feelings have now been replaced by guilt
over any trouble I initially caused those translators.
One can only imagine how frustrating it must have been
after the translation effort to then see top display a
misaligned column header and fields management page or
truncated screens like those of help or color mapping.
------------------------------------------------------
Ok, with that off my chest let's review these changes,
now that top properly handles UTF8 multi-byte strings.
. Performance - virtually all of this newly added cost
for multi-byte support is incurred during interactions
with the user. So, performance is not really an issue.
The one occasion when performance is impacted is found
during 'summary_show()' processing, due to an addition
of one new call to 'utf8_delta()' in 'show_special()'.
. Extra Wide Characters - I have not yet and may never
figure out a way to support languages like zh_CN where
the characters can be wider than most other languages.
. Translated User Name - at some future point we could
implement translation of user names. But as the author
of the issue acknowledged such names are non-standard.
Thus task display still incurs no new multi-byte costs
beyond those already incurred in that escape.c module.
For raising the issue I extend my sincerest thanks to:
Göran Uddeborg
Reference(s):
https://gitlab.com/procps-ng/procps/issues/68
Signed-off-by: Jim Warner <james.warner@comcast.net>
2017-09-27 10:32:22 +05:30
|
|
|
|
static char UTF8_tab[] = {
|
|
|
|
|
1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, // 0x00 - 0x0F
|
|
|
|
|
1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, // 0x10 - 0x1F
|
|
|
|
|
1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, // 0x20 - 0x2F
|
|
|
|
|
1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, // 0x30 - 0x3F
|
|
|
|
|
1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, // 0x40 - 0x4F
|
|
|
|
|
1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, // 0x50 - 0x5F
|
|
|
|
|
1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, // 0x60 - 0x6F
|
|
|
|
|
1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, // 0x70 - 0x7F
|
|
|
|
|
-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1, // 0x80 - 0x8F
|
|
|
|
|
-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1, // 0x90 - 0x9F
|
|
|
|
|
-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1, // 0xA0 - 0xAF
|
|
|
|
|
-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1, // 0xB0 - 0xBF
|
|
|
|
|
-1,-1, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, // 0xC0 - 0xCF, 0xC2 = begins 2
|
|
|
|
|
2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, // 0xD0 - 0xDF
|
|
|
|
|
3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, // 0xE0 - 0xEF, 0xE0 = begins 3
|
|
|
|
|
4, 4, 4, 4, 4,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1, // 0xF0 - 0xFF, 0xF0 = begins 4
|
|
|
|
|
}; // ( 0xF5 & beyond invalid )
|
|
|
|
|
|
|
|
|
|
|
2018-01-06 11:30:00 +05:30
|
|
|
|
/*
|
|
|
|
|
* Accommodate any potential differences between some multibyte
|
|
|
|
|
* character sequence and the screen columns needed to print it */
|
|
|
|
|
static inline int utf8_cols (const unsigned char *p, int n) {
|
|
|
|
|
#ifndef OFF_XTRAWIDE
|
|
|
|
|
wchar_t wc;
|
|
|
|
|
|
2018-01-23 11:30:00 +05:30
|
|
|
|
if (n > 1) {
|
|
|
|
|
(void)mbtowc(&wc, (const char *)p, n);
|
2020-06-19 10:30:00 +05:30
|
|
|
|
// allow a zero as valid, as with a 'combining acute accent'
|
|
|
|
|
if ((n = wcwidth(wc)) < 0) n = 1;
|
2018-01-23 11:30:00 +05:30
|
|
|
|
}
|
|
|
|
|
return n;
|
2018-01-06 11:30:00 +05:30
|
|
|
|
#else
|
|
|
|
|
(void)p; (void)n;
|
|
|
|
|
return 1;
|
|
|
|
|
#endif
|
|
|
|
|
} // end: utf8_cols
|
|
|
|
|
|
|
|
|
|
|
top: refactored for correct multi-byte string handling
When this project first began implementing translation
support nearly 6 years ago, we overcame many 'gettext'
obstacles and limitations. And, of course, there were
not any actual translations at the time so our testing
was quite limited plus, in many cases, only simulated.
None of that, however, can justify or excuse the total
lack of attention to top's approach to NLS, especially
since some actual translations have existed for years.
When the issue referenced below was raised, I suffered
immediate feelings of anxiety, doubt and pending doom.
This was mostly because top strives to avoid line wrap
at all costs and that did not bode well for multi-byte
translated strings, using several bytes per character.
I was also concerned over possible performance impact,
assuming it was even possible to properly handle utf8.
But, after wrestling with the problem for several days
those initial feelings have now been replaced by guilt
over any trouble I initially caused those translators.
One can only imagine how frustrating it must have been
after the translation effort to then see top display a
misaligned column header and fields management page or
truncated screens like those of help or color mapping.
------------------------------------------------------
Ok, with that off my chest let's review these changes,
now that top properly handles UTF8 multi-byte strings.
. Performance - virtually all of this newly added cost
for multi-byte support is incurred during interactions
with the user. So, performance is not really an issue.
The one occasion when performance is impacted is found
during 'summary_show()' processing, due to an addition
of one new call to 'utf8_delta()' in 'show_special()'.
. Extra Wide Characters - I have not yet and may never
figure out a way to support languages like zh_CN where
the characters can be wider than most other languages.
. Translated User Name - at some future point we could
implement translation of user names. But as the author
of the issue acknowledged such names are non-standard.
Thus task display still incurs no new multi-byte costs
beyond those already incurred in that escape.c module.
For raising the issue I extend my sincerest thanks to:
Göran Uddeborg
Reference(s):
https://gitlab.com/procps-ng/procps/issues/68
Signed-off-by: Jim Warner <james.warner@comcast.net>
2017-09-27 10:32:22 +05:30
|
|
|
|
/*
|
|
|
|
|
* Determine difference between total bytes versus printable
|
|
|
|
|
* characters in that passed, potentially multi-byte, string */
|
|
|
|
|
static int utf8_delta (const char *str) {
|
2017-10-06 10:30:00 +05:30
|
|
|
|
const unsigned char *p = (const unsigned char *)str;
|
|
|
|
|
int clen, cnum = 0;
|
|
|
|
|
|
|
|
|
|
while (*p) {
|
|
|
|
|
// -1 represents a decoding error, pretend it's untranslated ...
|
|
|
|
|
if (0 > (clen = UTF8_tab[*p])) return 0;
|
2018-01-06 11:30:00 +05:30
|
|
|
|
cnum += utf8_cols(p, clen);
|
2017-10-06 10:30:00 +05:30
|
|
|
|
p += clen;
|
|
|
|
|
}
|
|
|
|
|
return (int)((const char *)p - str) - cnum;
|
top: refactored for correct multi-byte string handling
When this project first began implementing translation
support nearly 6 years ago, we overcame many 'gettext'
obstacles and limitations. And, of course, there were
not any actual translations at the time so our testing
was quite limited plus, in many cases, only simulated.
None of that, however, can justify or excuse the total
lack of attention to top's approach to NLS, especially
since some actual translations have existed for years.
When the issue referenced below was raised, I suffered
immediate feelings of anxiety, doubt and pending doom.
This was mostly because top strives to avoid line wrap
at all costs and that did not bode well for multi-byte
translated strings, using several bytes per character.
I was also concerned over possible performance impact,
assuming it was even possible to properly handle utf8.
But, after wrestling with the problem for several days
those initial feelings have now been replaced by guilt
over any trouble I initially caused those translators.
One can only imagine how frustrating it must have been
after the translation effort to then see top display a
misaligned column header and fields management page or
truncated screens like those of help or color mapping.
------------------------------------------------------
Ok, with that off my chest let's review these changes,
now that top properly handles UTF8 multi-byte strings.
. Performance - virtually all of this newly added cost
for multi-byte support is incurred during interactions
with the user. So, performance is not really an issue.
The one occasion when performance is impacted is found
during 'summary_show()' processing, due to an addition
of one new call to 'utf8_delta()' in 'show_special()'.
. Extra Wide Characters - I have not yet and may never
figure out a way to support languages like zh_CN where
the characters can be wider than most other languages.
. Translated User Name - at some future point we could
implement translation of user names. But as the author
of the issue acknowledged such names are non-standard.
Thus task display still incurs no new multi-byte costs
beyond those already incurred in that escape.c module.
For raising the issue I extend my sincerest thanks to:
Göran Uddeborg
Reference(s):
https://gitlab.com/procps-ng/procps/issues/68
Signed-off-by: Jim Warner <james.warner@comcast.net>
2017-09-27 10:32:22 +05:30
|
|
|
|
} // end: utf8_delta
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
/*
|
2017-09-30 11:41:11 +05:30
|
|
|
|
* Determine a physical end within a potential multi-byte string
|
top: refactored for correct multi-byte string handling
When this project first began implementing translation
support nearly 6 years ago, we overcame many 'gettext'
obstacles and limitations. And, of course, there were
not any actual translations at the time so our testing
was quite limited plus, in many cases, only simulated.
None of that, however, can justify or excuse the total
lack of attention to top's approach to NLS, especially
since some actual translations have existed for years.
When the issue referenced below was raised, I suffered
immediate feelings of anxiety, doubt and pending doom.
This was mostly because top strives to avoid line wrap
at all costs and that did not bode well for multi-byte
translated strings, using several bytes per character.
I was also concerned over possible performance impact,
assuming it was even possible to properly handle utf8.
But, after wrestling with the problem for several days
those initial feelings have now been replaced by guilt
over any trouble I initially caused those translators.
One can only imagine how frustrating it must have been
after the translation effort to then see top display a
misaligned column header and fields management page or
truncated screens like those of help or color mapping.
------------------------------------------------------
Ok, with that off my chest let's review these changes,
now that top properly handles UTF8 multi-byte strings.
. Performance - virtually all of this newly added cost
for multi-byte support is incurred during interactions
with the user. So, performance is not really an issue.
The one occasion when performance is impacted is found
during 'summary_show()' processing, due to an addition
of one new call to 'utf8_delta()' in 'show_special()'.
. Extra Wide Characters - I have not yet and may never
figure out a way to support languages like zh_CN where
the characters can be wider than most other languages.
. Translated User Name - at some future point we could
implement translation of user names. But as the author
of the issue acknowledged such names are non-standard.
Thus task display still incurs no new multi-byte costs
beyond those already incurred in that escape.c module.
For raising the issue I extend my sincerest thanks to:
Göran Uddeborg
Reference(s):
https://gitlab.com/procps-ng/procps/issues/68
Signed-off-by: Jim Warner <james.warner@comcast.net>
2017-09-27 10:32:22 +05:30
|
|
|
|
* where maximum printable chars could be accommodated in width */
|
|
|
|
|
static int utf8_embody (const char *str, int width) {
|
2017-10-06 10:30:00 +05:30
|
|
|
|
const unsigned char *p = (const unsigned char *)str;
|
|
|
|
|
int clen, cnum = 0;
|
|
|
|
|
|
|
|
|
|
if (width > 0) {
|
|
|
|
|
while (*p) {
|
|
|
|
|
// -1 represents a decoding error, pretend it's untranslated ...
|
|
|
|
|
if (0 > (clen = UTF8_tab[*p])) return width;
|
2018-01-06 11:30:00 +05:30
|
|
|
|
if (width < (cnum += utf8_cols(p, clen))) break;
|
2017-10-06 10:30:00 +05:30
|
|
|
|
p += clen;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
return (int)((const char *)p - str);
|
top: refactored for correct multi-byte string handling
When this project first began implementing translation
support nearly 6 years ago, we overcame many 'gettext'
obstacles and limitations. And, of course, there were
not any actual translations at the time so our testing
was quite limited plus, in many cases, only simulated.
None of that, however, can justify or excuse the total
lack of attention to top's approach to NLS, especially
since some actual translations have existed for years.
When the issue referenced below was raised, I suffered
immediate feelings of anxiety, doubt and pending doom.
This was mostly because top strives to avoid line wrap
at all costs and that did not bode well for multi-byte
translated strings, using several bytes per character.
I was also concerned over possible performance impact,
assuming it was even possible to properly handle utf8.
But, after wrestling with the problem for several days
those initial feelings have now been replaced by guilt
over any trouble I initially caused those translators.
One can only imagine how frustrating it must have been
after the translation effort to then see top display a
misaligned column header and fields management page or
truncated screens like those of help or color mapping.
------------------------------------------------------
Ok, with that off my chest let's review these changes,
now that top properly handles UTF8 multi-byte strings.
. Performance - virtually all of this newly added cost
for multi-byte support is incurred during interactions
with the user. So, performance is not really an issue.
The one occasion when performance is impacted is found
during 'summary_show()' processing, due to an addition
of one new call to 'utf8_delta()' in 'show_special()'.
. Extra Wide Characters - I have not yet and may never
figure out a way to support languages like zh_CN where
the characters can be wider than most other languages.
. Translated User Name - at some future point we could
implement translation of user names. But as the author
of the issue acknowledged such names are non-standard.
Thus task display still incurs no new multi-byte costs
beyond those already incurred in that escape.c module.
For raising the issue I extend my sincerest thanks to:
Göran Uddeborg
Reference(s):
https://gitlab.com/procps-ng/procps/issues/68
Signed-off-by: Jim Warner <james.warner@comcast.net>
2017-09-27 10:32:22 +05:30
|
|
|
|
} // end: utf8_embody
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
/*
|
|
|
|
|
* Like the regular justify_pad routine but this guy
|
|
|
|
|
* can accommodate the multi-byte translated strings */
|
|
|
|
|
static const char *utf8_justify (const char *str, int width, int justr) {
|
|
|
|
|
static char l_fmt[] = "%-*.*s%s", r_fmt[] = "%*.*s%s";
|
|
|
|
|
static char buf[SCREENMAX];
|
2017-10-06 10:30:00 +05:30
|
|
|
|
char tmp[SCREENMAX];
|
top: refactored for correct multi-byte string handling
When this project first began implementing translation
support nearly 6 years ago, we overcame many 'gettext'
obstacles and limitations. And, of course, there were
not any actual translations at the time so our testing
was quite limited plus, in many cases, only simulated.
None of that, however, can justify or excuse the total
lack of attention to top's approach to NLS, especially
since some actual translations have existed for years.
When the issue referenced below was raised, I suffered
immediate feelings of anxiety, doubt and pending doom.
This was mostly because top strives to avoid line wrap
at all costs and that did not bode well for multi-byte
translated strings, using several bytes per character.
I was also concerned over possible performance impact,
assuming it was even possible to properly handle utf8.
But, after wrestling with the problem for several days
those initial feelings have now been replaced by guilt
over any trouble I initially caused those translators.
One can only imagine how frustrating it must have been
after the translation effort to then see top display a
misaligned column header and fields management page or
truncated screens like those of help or color mapping.
------------------------------------------------------
Ok, with that off my chest let's review these changes,
now that top properly handles UTF8 multi-byte strings.
. Performance - virtually all of this newly added cost
for multi-byte support is incurred during interactions
with the user. So, performance is not really an issue.
The one occasion when performance is impacted is found
during 'summary_show()' processing, due to an addition
of one new call to 'utf8_delta()' in 'show_special()'.
. Extra Wide Characters - I have not yet and may never
figure out a way to support languages like zh_CN where
the characters can be wider than most other languages.
. Translated User Name - at some future point we could
implement translation of user names. But as the author
of the issue acknowledged such names are non-standard.
Thus task display still incurs no new multi-byte costs
beyond those already incurred in that escape.c module.
For raising the issue I extend my sincerest thanks to:
Göran Uddeborg
Reference(s):
https://gitlab.com/procps-ng/procps/issues/68
Signed-off-by: Jim Warner <james.warner@comcast.net>
2017-09-27 10:32:22 +05:30
|
|
|
|
|
2017-10-06 10:30:00 +05:30
|
|
|
|
snprintf(tmp, sizeof(tmp), "%.*s", utf8_embody(str, width), str);
|
|
|
|
|
width += utf8_delta(tmp);
|
|
|
|
|
snprintf(buf, sizeof(buf), justr ? r_fmt : l_fmt, width, width, tmp, COLPADSTR);
|
top: refactored for correct multi-byte string handling
When this project first began implementing translation
support nearly 6 years ago, we overcame many 'gettext'
obstacles and limitations. And, of course, there were
not any actual translations at the time so our testing
was quite limited plus, in many cases, only simulated.
None of that, however, can justify or excuse the total
lack of attention to top's approach to NLS, especially
since some actual translations have existed for years.
When the issue referenced below was raised, I suffered
immediate feelings of anxiety, doubt and pending doom.
This was mostly because top strives to avoid line wrap
at all costs and that did not bode well for multi-byte
translated strings, using several bytes per character.
I was also concerned over possible performance impact,
assuming it was even possible to properly handle utf8.
But, after wrestling with the problem for several days
those initial feelings have now been replaced by guilt
over any trouble I initially caused those translators.
One can only imagine how frustrating it must have been
after the translation effort to then see top display a
misaligned column header and fields management page or
truncated screens like those of help or color mapping.
------------------------------------------------------
Ok, with that off my chest let's review these changes,
now that top properly handles UTF8 multi-byte strings.
. Performance - virtually all of this newly added cost
for multi-byte support is incurred during interactions
with the user. So, performance is not really an issue.
The one occasion when performance is impacted is found
during 'summary_show()' processing, due to an addition
of one new call to 'utf8_delta()' in 'show_special()'.
. Extra Wide Characters - I have not yet and may never
figure out a way to support languages like zh_CN where
the characters can be wider than most other languages.
. Translated User Name - at some future point we could
implement translation of user names. But as the author
of the issue acknowledged such names are non-standard.
Thus task display still incurs no new multi-byte costs
beyond those already incurred in that escape.c module.
For raising the issue I extend my sincerest thanks to:
Göran Uddeborg
Reference(s):
https://gitlab.com/procps-ng/procps/issues/68
Signed-off-by: Jim Warner <james.warner@comcast.net>
2017-09-27 10:32:22 +05:30
|
|
|
|
return buf;
|
|
|
|
|
} // end: utf8_justify
|
top: extend multi-byte support to 'Inspection' feature
The previous commit implemented multi-byte support for
the basic top user interaction and display provisions.
This commit completes multi-byte support by addressing
that 'Inspect Other Output' feature (the 'Y' command).
Few people probably exploit this very powerful feature
which allows the perusing of any file or piped output.
And even if nobody uses 'Y', someone will stumble over
it on the help screen and try it out. Assuming top was
not built with INSP_OFFDEMO defined, they'll end up on
the screen our translators have faithfully translated.
Without this patch, such a screen would display with a
bunch of 'unprintable' characters which will then show
in the standard (less-like) way as: '^A', '<C3>', etc.
In other words, those poor screens will be a big mess!
[ this program can even display an executable binary ]
[ while at that same time supporting Find/Find Next. ]
[ imagine, a file with no guarantee of real strings! ]
[ just try a Find using less with such binary files. ]
With this commit, the translated 'Y' demo screens will
now be properly shown, providing no invalid multi-byte
characters have been detected. Should that be the case
then they'll be displayed in that less-like way above.
And, if users go on to fully exploit this 'Y' command,
there is a good chance that a file or pipe might yield
output in a utf-8 multi-byte form. Should that be true
such output will thus be handled appropriately by top.
[ in many respects, this change was more challenging ]
[ than the basic support within the previous commit. ]
[ story of my life: least used = most effort needed. ]
Many thanks to our procps-ng translators which enabled
a proper test of these changed 'Y' command provisions:
. Vietnamese: Trần Ngọc Quân
. Polish: Jakub Bogusz
. German: Mario Blättermann
. French: Frédéric Marchal, Stéphane Aulery
[ and my sincerest apologies too, for my negligence! ]
Reference(s):
https://gitlab.com/procps-ng/procps/issues/68
Signed-off-by: Jim Warner <james.warner@comcast.net>
2017-09-27 10:33:33 +05:30
|
|
|
|
|
|
|
|
|
|
|
|
|
|
/*
|
|
|
|
|
* Returns a physical or logical column number given a
|
|
|
|
|
* multi-byte string and a target column value */
|
|
|
|
|
static int utf8_proper_col (const char *str, int col, int tophysical) {
|
2017-10-06 10:30:00 +05:30
|
|
|
|
const unsigned char *p = (const unsigned char *)str;
|
|
|
|
|
int clen, tlen = 0, cnum = 0;
|
|
|
|
|
|
|
|
|
|
while (*p) {
|
|
|
|
|
// -1 represents a decoding error, don't encourage repositioning ...
|
|
|
|
|
if (0 > (clen = UTF8_tab[*p])) return col;
|
|
|
|
|
if (cnum + 1 > col && tophysical) break;
|
|
|
|
|
p += clen;
|
|
|
|
|
tlen += clen;
|
|
|
|
|
if (tlen > col && !tophysical) break;
|
|
|
|
|
++cnum;
|
|
|
|
|
}
|
|
|
|
|
return tophysical ? tlen : cnum;
|
top: extend multi-byte support to 'Inspection' feature
The previous commit implemented multi-byte support for
the basic top user interaction and display provisions.
This commit completes multi-byte support by addressing
that 'Inspect Other Output' feature (the 'Y' command).
Few people probably exploit this very powerful feature
which allows the perusing of any file or piped output.
And even if nobody uses 'Y', someone will stumble over
it on the help screen and try it out. Assuming top was
not built with INSP_OFFDEMO defined, they'll end up on
the screen our translators have faithfully translated.
Without this patch, such a screen would display with a
bunch of 'unprintable' characters which will then show
in the standard (less-like) way as: '^A', '<C3>', etc.
In other words, those poor screens will be a big mess!
[ this program can even display an executable binary ]
[ while at that same time supporting Find/Find Next. ]
[ imagine, a file with no guarantee of real strings! ]
[ just try a Find using less with such binary files. ]
With this commit, the translated 'Y' demo screens will
now be properly shown, providing no invalid multi-byte
characters have been detected. Should that be the case
then they'll be displayed in that less-like way above.
And, if users go on to fully exploit this 'Y' command,
there is a good chance that a file or pipe might yield
output in a utf-8 multi-byte form. Should that be true
such output will thus be handled appropriately by top.
[ in many respects, this change was more challenging ]
[ than the basic support within the previous commit. ]
[ story of my life: least used = most effort needed. ]
Many thanks to our procps-ng translators which enabled
a proper test of these changed 'Y' command provisions:
. Vietnamese: Trần Ngọc Quân
. Polish: Jakub Bogusz
. German: Mario Blättermann
. French: Frédéric Marchal, Stéphane Aulery
[ and my sincerest apologies too, for my negligence! ]
Reference(s):
https://gitlab.com/procps-ng/procps/issues/68
Signed-off-by: Jim Warner <james.warner@comcast.net>
2017-09-27 10:33:33 +05:30
|
|
|
|
} // end: utf8_proper_col
|
top: refactored for correct multi-byte string handling
When this project first began implementing translation
support nearly 6 years ago, we overcame many 'gettext'
obstacles and limitations. And, of course, there were
not any actual translations at the time so our testing
was quite limited plus, in many cases, only simulated.
None of that, however, can justify or excuse the total
lack of attention to top's approach to NLS, especially
since some actual translations have existed for years.
When the issue referenced below was raised, I suffered
immediate feelings of anxiety, doubt and pending doom.
This was mostly because top strives to avoid line wrap
at all costs and that did not bode well for multi-byte
translated strings, using several bytes per character.
I was also concerned over possible performance impact,
assuming it was even possible to properly handle utf8.
But, after wrestling with the problem for several days
those initial feelings have now been replaced by guilt
over any trouble I initially caused those translators.
One can only imagine how frustrating it must have been
after the translation effort to then see top display a
misaligned column header and fields management page or
truncated screens like those of help or color mapping.
------------------------------------------------------
Ok, with that off my chest let's review these changes,
now that top properly handles UTF8 multi-byte strings.
. Performance - virtually all of this newly added cost
for multi-byte support is incurred during interactions
with the user. So, performance is not really an issue.
The one occasion when performance is impacted is found
during 'summary_show()' processing, due to an addition
of one new call to 'utf8_delta()' in 'show_special()'.
. Extra Wide Characters - I have not yet and may never
figure out a way to support languages like zh_CN where
the characters can be wider than most other languages.
. Translated User Name - at some future point we could
implement translation of user names. But as the author
of the issue acknowledged such names are non-standard.
Thus task display still incurs no new multi-byte costs
beyond those already incurred in that escape.c module.
For raising the issue I extend my sincerest thanks to:
Göran Uddeborg
Reference(s):
https://gitlab.com/procps-ng/procps/issues/68
Signed-off-by: Jim Warner <james.warner@comcast.net>
2017-09-27 10:32:22 +05:30
|
|
|
|
|
2011-03-31 16:45:12 +05:30
|
|
|
|
/*###### Misc Color/Display support ####################################*/
|
|
|
|
|
|
|
|
|
|
/*
|
|
|
|
|
* Make the appropriate caps/color strings for a window/field group.
|
2002-05-30 09:14:46 +05:30
|
|
|
|
* note: we avoid the use of background color so as to maximize
|
|
|
|
|
* compatibility with the user's xterm settings */
|
2011-03-31 16:45:12 +05:30
|
|
|
|
static void capsmk (WIN_t *q) {
|
|
|
|
|
/* macro to test if a basic (non-color) capability is valid
|
|
|
|
|
thanks: Floyd Davidson <floyd@ptialaska.net> */
|
|
|
|
|
#define tIF(s) s ? s : ""
|
2016-07-16 10:30:00 +05:30
|
|
|
|
/* macro to make compatible with netbsd-curses too
|
|
|
|
|
thanks: rofl0r <retnyg@gmx.net> */
|
|
|
|
|
#define tPM(a,b) tparm(a, b, 0, 0, 0, 0, 0, 0, 0, 0)
|
2002-05-30 09:14:46 +05:30
|
|
|
|
static int capsdone = 0;
|
|
|
|
|
|
2002-11-25 03:34:03 +05:30
|
|
|
|
// we must NOT disturb our 'empty' terminfo strings!
|
2002-05-30 09:14:46 +05:30
|
|
|
|
if (Batch) return;
|
|
|
|
|
|
2002-11-25 03:34:03 +05:30
|
|
|
|
// these are the unchangeable puppies, so we only do 'em once
|
2002-05-30 09:14:46 +05:30
|
|
|
|
if (!capsdone) {
|
2011-03-31 16:45:12 +05:30
|
|
|
|
STRLCPY(Cap_clr_eol, tIF(clr_eol))
|
2013-01-16 11:30:00 +05:30
|
|
|
|
STRLCPY(Cap_clr_eos, tIF(clr_eos))
|
2011-03-31 16:45:12 +05:30
|
|
|
|
STRLCPY(Cap_clr_scr, tIF(clear_screen))
|
top: add a flexible 'Inspect' capability
This commit introduces an extremely powerful, flexible
brand new capability. Now, users can pause the normal
iterative display and inspect the contents of any file
or output from any script, command, or even pipelines.
It's invoked via the 'Y' interactive command which, in
turn, is supported with simple user supplied additions
as new entries in the top personal configuration file.
A separate new 'Inspect' window supports scrolling and
searching, similar to the main top display. Except it
extends existing 'L'/'&' (locate/locate-next) commands
so that an out-of-view match automatically adjusts the
horizontal position bringing such data into view. And
it provides for multiple successive same line matches.
Also, the basic 'more/less' navigation keys are active
in this new 'Inspect' window, to ease user transition.
There are no program changes required when entries are
added to or deleted from the rcfile. And there are no
known limits to the complexity of a script, command or
pipeline, other than the unidirectional nature imposed
by the 'popen' function call which top cannot violate.
Since it's impossible to predict exactly what contents
will be generated, top treats all output as raw binary
data. Any control characters display in '^C' notation
while all other unprintable characters show as '<AB>'.
The biggest problem encountered was with the find/next
capability since that strstr guy was really diminished
given the possibility that numerous 'strings' could be
encountered *within* many of top's raw, binary 'rows'.
Oh, and another problem was in maintaining the perfect
left & right text justification of this commit message
along with all of the commit summaries. Some of those
summaries (like this very one) are of course, slightly
shorter, to make room for the 'man document' addition.
Enjoy!
Signed-off-by: Jim Warner <james.warner@comcast.net>
2012-11-25 10:30:05 +05:30
|
|
|
|
// due to the leading newline, the following must be used with care
|
2011-03-31 16:45:12 +05:30
|
|
|
|
snprintf(Cap_nl_clreos, sizeof(Cap_nl_clreos), "\n%s", tIF(clr_eos));
|
|
|
|
|
STRLCPY(Cap_curs_huge, tIF(cursor_visible))
|
|
|
|
|
STRLCPY(Cap_curs_norm, tIF(cursor_normal))
|
|
|
|
|
STRLCPY(Cap_curs_hide, tIF(cursor_invisible))
|
|
|
|
|
STRLCPY(Cap_home, tIF(cursor_home))
|
|
|
|
|
STRLCPY(Cap_norm, tIF(exit_attribute_mode))
|
|
|
|
|
STRLCPY(Cap_reverse, tIF(enter_reverse_mode))
|
|
|
|
|
#ifndef RMAN_IGNORED
|
|
|
|
|
if (!eat_newline_glitch) {
|
|
|
|
|
STRLCPY(Cap_rmam, tIF(exit_am_mode))
|
|
|
|
|
STRLCPY(Cap_smam, tIF(enter_am_mode))
|
|
|
|
|
if (!*Cap_rmam || !*Cap_smam) {
|
2004-07-06 09:54:39 +05:30
|
|
|
|
*Cap_rmam = '\0';
|
|
|
|
|
*Cap_smam = '\0';
|
2011-03-31 16:45:12 +05:30
|
|
|
|
if (auto_right_margin)
|
|
|
|
|
Cap_avoid_eol = 1;
|
2004-07-06 09:54:39 +05:30
|
|
|
|
}
|
2011-03-31 16:45:12 +05:30
|
|
|
|
putp(Cap_rmam);
|
2004-07-06 09:54:39 +05:30
|
|
|
|
}
|
2011-03-31 16:45:12 +05:30
|
|
|
|
#endif
|
2002-10-19 02:37:49 +05:30
|
|
|
|
snprintf(Caps_off, sizeof(Caps_off), "%s%s", Cap_norm, tIF(orig_pair));
|
2011-03-31 16:45:12 +05:30
|
|
|
|
snprintf(Caps_endline, sizeof(Caps_endline), "%s%s", Caps_off, Cap_clr_eol);
|
2002-05-30 09:14:46 +05:30
|
|
|
|
if (tgoto(cursor_address, 1, 1)) Cap_can_goto = 1;
|
|
|
|
|
capsdone = 1;
|
|
|
|
|
}
|
2011-03-31 16:45:12 +05:30
|
|
|
|
|
2002-11-25 03:34:03 +05:30
|
|
|
|
/* the key to NO run-time costs for configurable colors -- we spend a
|
|
|
|
|
little time with the user now setting up our terminfo strings, and
|
|
|
|
|
the job's done until he/she/it has a change-of-heart */
|
2011-03-31 16:45:12 +05:30
|
|
|
|
STRLCPY(q->cap_bold, CHKw(q, View_NOBOLD) ? Cap_norm : tIF(enter_bold_mode))
|
2002-06-19 05:15:30 +05:30
|
|
|
|
if (CHKw(q, Show_COLORS) && max_colors > 0) {
|
2016-07-16 10:30:00 +05:30
|
|
|
|
STRLCPY(q->capclr_sum, tPM(set_a_foreground, q->rc.summclr))
|
2002-10-19 02:37:49 +05:30
|
|
|
|
snprintf(q->capclr_msg, sizeof(q->capclr_msg), "%s%s"
|
2016-07-16 10:30:00 +05:30
|
|
|
|
, tPM(set_a_foreground, q->rc.msgsclr), Cap_reverse);
|
2002-10-19 02:37:49 +05:30
|
|
|
|
snprintf(q->capclr_pmt, sizeof(q->capclr_pmt), "%s%s"
|
2016-07-16 10:30:00 +05:30
|
|
|
|
, tPM(set_a_foreground, q->rc.msgsclr), q->cap_bold);
|
2002-10-19 02:37:49 +05:30
|
|
|
|
snprintf(q->capclr_hdr, sizeof(q->capclr_hdr), "%s%s"
|
2016-07-16 10:30:00 +05:30
|
|
|
|
, tPM(set_a_foreground, q->rc.headclr), Cap_reverse);
|
2002-10-19 02:37:49 +05:30
|
|
|
|
snprintf(q->capclr_rownorm, sizeof(q->capclr_rownorm), "%s%s"
|
2016-07-16 10:30:00 +05:30
|
|
|
|
, Caps_off, tPM(set_a_foreground, q->rc.taskclr));
|
2002-05-30 09:14:46 +05:30
|
|
|
|
} else {
|
2002-06-19 05:15:30 +05:30
|
|
|
|
q->capclr_sum[0] = '\0';
|
2012-01-20 02:03:34 +05:30
|
|
|
|
#ifdef USE_X_COLHDR
|
1970-01-01 05:30:00 +05:30
|
|
|
|
snprintf(q->capclr_msg, sizeof(q->capclr_msg), "%s%s"
|
2012-01-20 02:03:34 +05:30
|
|
|
|
, Cap_reverse, q->cap_bold);
|
|
|
|
|
#else
|
2011-03-31 16:45:12 +05:30
|
|
|
|
STRLCPY(q->capclr_msg, Cap_reverse)
|
2012-01-20 02:03:34 +05:30
|
|
|
|
#endif
|
2011-03-31 16:45:12 +05:30
|
|
|
|
STRLCPY(q->capclr_pmt, q->cap_bold)
|
|
|
|
|
STRLCPY(q->capclr_hdr, Cap_reverse)
|
|
|
|
|
STRLCPY(q->capclr_rownorm, Cap_norm)
|
2002-05-30 09:14:46 +05:30
|
|
|
|
}
|
2011-03-31 16:45:12 +05:30
|
|
|
|
|
2002-11-25 03:34:03 +05:30
|
|
|
|
// composite(s), so we do 'em outside and after the if
|
2002-10-19 02:37:49 +05:30
|
|
|
|
snprintf(q->capclr_rowhigh, sizeof(q->capclr_rowhigh), "%s%s"
|
2002-11-25 03:34:03 +05:30
|
|
|
|
, q->capclr_rownorm, CHKw(q, Show_HIBOLD) ? q->cap_bold : Cap_reverse);
|
2011-03-31 16:45:12 +05:30
|
|
|
|
#undef tIF
|
2016-07-16 10:30:00 +05:30
|
|
|
|
#undef tPM
|
2011-03-31 16:45:12 +05:30
|
|
|
|
} // end: capsmk
|
2002-02-02 04:17:29 +05:30
|
|
|
|
|
2002-05-30 09:14:46 +05:30
|
|
|
|
|
|
|
|
|
/*
|
2011-03-31 16:45:12 +05:30
|
|
|
|
* Show an error message (caller may include '\a' for sound) */
|
|
|
|
|
static void show_msg (const char *str) {
|
2013-01-29 11:30:00 +05:30
|
|
|
|
PUTT("%s%s %.*s %s%s%s"
|
2011-03-31 16:45:12 +05:30
|
|
|
|
, tg2(0, Msg_row)
|
|
|
|
|
, Curwin->capclr_msg
|
top: refactored for correct multi-byte string handling
When this project first began implementing translation
support nearly 6 years ago, we overcame many 'gettext'
obstacles and limitations. And, of course, there were
not any actual translations at the time so our testing
was quite limited plus, in many cases, only simulated.
None of that, however, can justify or excuse the total
lack of attention to top's approach to NLS, especially
since some actual translations have existed for years.
When the issue referenced below was raised, I suffered
immediate feelings of anxiety, doubt and pending doom.
This was mostly because top strives to avoid line wrap
at all costs and that did not bode well for multi-byte
translated strings, using several bytes per character.
I was also concerned over possible performance impact,
assuming it was even possible to properly handle utf8.
But, after wrestling with the problem for several days
those initial feelings have now been replaced by guilt
over any trouble I initially caused those translators.
One can only imagine how frustrating it must have been
after the translation effort to then see top display a
misaligned column header and fields management page or
truncated screens like those of help or color mapping.
------------------------------------------------------
Ok, with that off my chest let's review these changes,
now that top properly handles UTF8 multi-byte strings.
. Performance - virtually all of this newly added cost
for multi-byte support is incurred during interactions
with the user. So, performance is not really an issue.
The one occasion when performance is impacted is found
during 'summary_show()' processing, due to an addition
of one new call to 'utf8_delta()' in 'show_special()'.
. Extra Wide Characters - I have not yet and may never
figure out a way to support languages like zh_CN where
the characters can be wider than most other languages.
. Translated User Name - at some future point we could
implement translation of user names. But as the author
of the issue acknowledged such names are non-standard.
Thus task display still incurs no new multi-byte costs
beyond those already incurred in that escape.c module.
For raising the issue I extend my sincerest thanks to:
Göran Uddeborg
Reference(s):
https://gitlab.com/procps-ng/procps/issues/68
Signed-off-by: Jim Warner <james.warner@comcast.net>
2017-09-27 10:32:22 +05:30
|
|
|
|
, utf8_embody(str, Screen_cols - 2)
|
2011-03-31 16:45:12 +05:30
|
|
|
|
, str
|
2013-01-29 11:30:00 +05:30
|
|
|
|
, Cap_curs_hide
|
2011-03-31 16:45:12 +05:30
|
|
|
|
, Caps_off
|
|
|
|
|
, Cap_clr_eol);
|
2002-05-30 09:14:46 +05:30
|
|
|
|
fflush(stdout);
|
2011-03-31 16:45:12 +05:30
|
|
|
|
usleep(MSG_USLEEP);
|
|
|
|
|
} // end: show_msg
|
2002-05-30 09:14:46 +05:30
|
|
|
|
|
|
|
|
|
|
|
|
|
|
/*
|
2011-03-31 16:45:12 +05:30
|
|
|
|
* Show an input prompt + larger cursor (if possible) */
|
|
|
|
|
static int show_pmt (const char *str) {
|
top: refactored for correct multi-byte string handling
When this project first began implementing translation
support nearly 6 years ago, we overcame many 'gettext'
obstacles and limitations. And, of course, there were
not any actual translations at the time so our testing
was quite limited plus, in many cases, only simulated.
None of that, however, can justify or excuse the total
lack of attention to top's approach to NLS, especially
since some actual translations have existed for years.
When the issue referenced below was raised, I suffered
immediate feelings of anxiety, doubt and pending doom.
This was mostly because top strives to avoid line wrap
at all costs and that did not bode well for multi-byte
translated strings, using several bytes per character.
I was also concerned over possible performance impact,
assuming it was even possible to properly handle utf8.
But, after wrestling with the problem for several days
those initial feelings have now been replaced by guilt
over any trouble I initially caused those translators.
One can only imagine how frustrating it must have been
after the translation effort to then see top display a
misaligned column header and fields management page or
truncated screens like those of help or color mapping.
------------------------------------------------------
Ok, with that off my chest let's review these changes,
now that top properly handles UTF8 multi-byte strings.
. Performance - virtually all of this newly added cost
for multi-byte support is incurred during interactions
with the user. So, performance is not really an issue.
The one occasion when performance is impacted is found
during 'summary_show()' processing, due to an addition
of one new call to 'utf8_delta()' in 'show_special()'.
. Extra Wide Characters - I have not yet and may never
figure out a way to support languages like zh_CN where
the characters can be wider than most other languages.
. Translated User Name - at some future point we could
implement translation of user names. But as the author
of the issue acknowledged such names are non-standard.
Thus task display still incurs no new multi-byte costs
beyond those already incurred in that escape.c module.
For raising the issue I extend my sincerest thanks to:
Göran Uddeborg
Reference(s):
https://gitlab.com/procps-ng/procps/issues/68
Signed-off-by: Jim Warner <james.warner@comcast.net>
2017-09-27 10:32:22 +05:30
|
|
|
|
char buf[MEDBUFSIZ];
|
|
|
|
|
int len;
|
2011-05-26 15:03:32 +05:30
|
|
|
|
|
top: refactored for correct multi-byte string handling
When this project first began implementing translation
support nearly 6 years ago, we overcame many 'gettext'
obstacles and limitations. And, of course, there were
not any actual translations at the time so our testing
was quite limited plus, in many cases, only simulated.
None of that, however, can justify or excuse the total
lack of attention to top's approach to NLS, especially
since some actual translations have existed for years.
When the issue referenced below was raised, I suffered
immediate feelings of anxiety, doubt and pending doom.
This was mostly because top strives to avoid line wrap
at all costs and that did not bode well for multi-byte
translated strings, using several bytes per character.
I was also concerned over possible performance impact,
assuming it was even possible to properly handle utf8.
But, after wrestling with the problem for several days
those initial feelings have now been replaced by guilt
over any trouble I initially caused those translators.
One can only imagine how frustrating it must have been
after the translation effort to then see top display a
misaligned column header and fields management page or
truncated screens like those of help or color mapping.
------------------------------------------------------
Ok, with that off my chest let's review these changes,
now that top properly handles UTF8 multi-byte strings.
. Performance - virtually all of this newly added cost
for multi-byte support is incurred during interactions
with the user. So, performance is not really an issue.
The one occasion when performance is impacted is found
during 'summary_show()' processing, due to an addition
of one new call to 'utf8_delta()' in 'show_special()'.
. Extra Wide Characters - I have not yet and may never
figure out a way to support languages like zh_CN where
the characters can be wider than most other languages.
. Translated User Name - at some future point we could
implement translation of user names. But as the author
of the issue acknowledged such names are non-standard.
Thus task display still incurs no new multi-byte costs
beyond those already incurred in that escape.c module.
For raising the issue I extend my sincerest thanks to:
Göran Uddeborg
Reference(s):
https://gitlab.com/procps-ng/procps/issues/68
Signed-off-by: Jim Warner <james.warner@comcast.net>
2017-09-27 10:32:22 +05:30
|
|
|
|
snprintf(buf, sizeof(buf), "%.*s", utf8_embody(str, Screen_cols - 2), str);
|
|
|
|
|
len = utf8_delta(buf);
|
2016-07-03 10:30:00 +05:30
|
|
|
|
#ifdef PRETENDNOCAP
|
|
|
|
|
PUTT("\n%s%s%.*s %s%s%s"
|
|
|
|
|
#else
|
top: honor the restrictive, crufty old top rcfile
At one time, new top silently defaulted when an rcfile
was found to be incompatible. This is exactly what
the old top did. However, after some discussion it
was decided top should alert the user and thereby
save the system administrator some headaches.
Now, some are upset over the fatal error, proving you
can't please everybody. But in all fairness, given
the difficulty of customizing old top, any reluctance
to delete an old saved rcfile is understandable.
To ease transition to this new top, old style rcfiles
will now be honored and converted to the new format.
And if not disabled at ./configure time via CFLAGS,
a user will be warned when an old style rcfile is
about to be overwritten using the 'W' command.
Lastly, the config validation logic was enhanced to
help ensure both types of rcfile haven't been edited
manually and possibly made unuseable.
Reported-By: sergio <mailbox@sergio.spb.ru>
Bug-Debian: http://bugs.debian.org/651213
Reported-By: martin f krafft <madduck@debian.org>
Bug-Debian: http://bugs.debian.org/651863
Signed-off-by: Jim Warner <james.warner@comcast.net>
2012-03-01 11:29:59 +05:30
|
|
|
|
PUTT("%s%s%.*s %s%s%s"
|
2016-07-03 10:30:00 +05:30
|
|
|
|
#endif
|
2011-03-31 16:45:12 +05:30
|
|
|
|
, tg2(0, Msg_row)
|
|
|
|
|
, Curwin->capclr_pmt
|
top: refactored for correct multi-byte string handling
When this project first began implementing translation
support nearly 6 years ago, we overcame many 'gettext'
obstacles and limitations. And, of course, there were
not any actual translations at the time so our testing
was quite limited plus, in many cases, only simulated.
None of that, however, can justify or excuse the total
lack of attention to top's approach to NLS, especially
since some actual translations have existed for years.
When the issue referenced below was raised, I suffered
immediate feelings of anxiety, doubt and pending doom.
This was mostly because top strives to avoid line wrap
at all costs and that did not bode well for multi-byte
translated strings, using several bytes per character.
I was also concerned over possible performance impact,
assuming it was even possible to properly handle utf8.
But, after wrestling with the problem for several days
those initial feelings have now been replaced by guilt
over any trouble I initially caused those translators.
One can only imagine how frustrating it must have been
after the translation effort to then see top display a
misaligned column header and fields management page or
truncated screens like those of help or color mapping.
------------------------------------------------------
Ok, with that off my chest let's review these changes,
now that top properly handles UTF8 multi-byte strings.
. Performance - virtually all of this newly added cost
for multi-byte support is incurred during interactions
with the user. So, performance is not really an issue.
The one occasion when performance is impacted is found
during 'summary_show()' processing, due to an addition
of one new call to 'utf8_delta()' in 'show_special()'.
. Extra Wide Characters - I have not yet and may never
figure out a way to support languages like zh_CN where
the characters can be wider than most other languages.
. Translated User Name - at some future point we could
implement translation of user names. But as the author
of the issue acknowledged such names are non-standard.
Thus task display still incurs no new multi-byte costs
beyond those already incurred in that escape.c module.
For raising the issue I extend my sincerest thanks to:
Göran Uddeborg
Reference(s):
https://gitlab.com/procps-ng/procps/issues/68
Signed-off-by: Jim Warner <james.warner@comcast.net>
2017-09-27 10:32:22 +05:30
|
|
|
|
, (Screen_cols - 2) + len
|
|
|
|
|
, buf
|
2011-03-31 16:45:12 +05:30
|
|
|
|
, Cap_curs_huge
|
|
|
|
|
, Caps_off
|
|
|
|
|
, Cap_clr_eol);
|
2002-05-30 09:14:46 +05:30
|
|
|
|
fflush(stdout);
|
top: refactored for correct multi-byte string handling
When this project first began implementing translation
support nearly 6 years ago, we overcame many 'gettext'
obstacles and limitations. And, of course, there were
not any actual translations at the time so our testing
was quite limited plus, in many cases, only simulated.
None of that, however, can justify or excuse the total
lack of attention to top's approach to NLS, especially
since some actual translations have existed for years.
When the issue referenced below was raised, I suffered
immediate feelings of anxiety, doubt and pending doom.
This was mostly because top strives to avoid line wrap
at all costs and that did not bode well for multi-byte
translated strings, using several bytes per character.
I was also concerned over possible performance impact,
assuming it was even possible to properly handle utf8.
But, after wrestling with the problem for several days
those initial feelings have now been replaced by guilt
over any trouble I initially caused those translators.
One can only imagine how frustrating it must have been
after the translation effort to then see top display a
misaligned column header and fields management page or
truncated screens like those of help or color mapping.
------------------------------------------------------
Ok, with that off my chest let's review these changes,
now that top properly handles UTF8 multi-byte strings.
. Performance - virtually all of this newly added cost
for multi-byte support is incurred during interactions
with the user. So, performance is not really an issue.
The one occasion when performance is impacted is found
during 'summary_show()' processing, due to an addition
of one new call to 'utf8_delta()' in 'show_special()'.
. Extra Wide Characters - I have not yet and may never
figure out a way to support languages like zh_CN where
the characters can be wider than most other languages.
. Translated User Name - at some future point we could
implement translation of user names. But as the author
of the issue acknowledged such names are non-standard.
Thus task display still incurs no new multi-byte costs
beyond those already incurred in that escape.c module.
For raising the issue I extend my sincerest thanks to:
Göran Uddeborg
Reference(s):
https://gitlab.com/procps-ng/procps/issues/68
Signed-off-by: Jim Warner <james.warner@comcast.net>
2017-09-27 10:32:22 +05:30
|
|
|
|
len = strlen(buf) - len;
|
2013-02-15 11:30:00 +05:30
|
|
|
|
// +1 for the space we added or -1 for the cursor...
|
top: refactored for correct multi-byte string handling
When this project first began implementing translation
support nearly 6 years ago, we overcame many 'gettext'
obstacles and limitations. And, of course, there were
not any actual translations at the time so our testing
was quite limited plus, in many cases, only simulated.
None of that, however, can justify or excuse the total
lack of attention to top's approach to NLS, especially
since some actual translations have existed for years.
When the issue referenced below was raised, I suffered
immediate feelings of anxiety, doubt and pending doom.
This was mostly because top strives to avoid line wrap
at all costs and that did not bode well for multi-byte
translated strings, using several bytes per character.
I was also concerned over possible performance impact,
assuming it was even possible to properly handle utf8.
But, after wrestling with the problem for several days
those initial feelings have now been replaced by guilt
over any trouble I initially caused those translators.
One can only imagine how frustrating it must have been
after the translation effort to then see top display a
misaligned column header and fields management page or
truncated screens like those of help or color mapping.
------------------------------------------------------
Ok, with that off my chest let's review these changes,
now that top properly handles UTF8 multi-byte strings.
. Performance - virtually all of this newly added cost
for multi-byte support is incurred during interactions
with the user. So, performance is not really an issue.
The one occasion when performance is impacted is found
during 'summary_show()' processing, due to an addition
of one new call to 'utf8_delta()' in 'show_special()'.
. Extra Wide Characters - I have not yet and may never
figure out a way to support languages like zh_CN where
the characters can be wider than most other languages.
. Translated User Name - at some future point we could
implement translation of user names. But as the author
of the issue acknowledged such names are non-standard.
Thus task display still incurs no new multi-byte costs
beyond those already incurred in that escape.c module.
For raising the issue I extend my sincerest thanks to:
Göran Uddeborg
Reference(s):
https://gitlab.com/procps-ng/procps/issues/68
Signed-off-by: Jim Warner <james.warner@comcast.net>
2017-09-27 10:32:22 +05:30
|
|
|
|
return (len + 1 < Screen_cols) ? len + 1 : Screen_cols - 1;
|
2011-03-31 16:45:12 +05:30
|
|
|
|
} // end: show_pmt
|
|
|
|
|
|
|
|
|
|
|
2018-06-20 10:30:00 +05:30
|
|
|
|
/*
|
|
|
|
|
* Create and print the optional scroll coordinates message */
|
|
|
|
|
static void show_scroll (void) {
|
2018-08-14 10:30:00 +05:30
|
|
|
|
char tmp1[SMLBUFSIZ];
|
|
|
|
|
#ifndef SCROLLVAR_NO
|
|
|
|
|
char tmp2[SMLBUFSIZ];
|
|
|
|
|
#endif
|
2018-06-20 10:30:00 +05:30
|
|
|
|
int totpflgs = Curwin->totpflgs;
|
|
|
|
|
int begpflgs = Curwin->begpflg + 1;
|
|
|
|
|
|
|
|
|
|
#ifndef USE_X_COLHDR
|
|
|
|
|
if (CHKw(Curwin, Show_HICOLS)) {
|
|
|
|
|
totpflgs -= 2;
|
|
|
|
|
if (ENUpos(Curwin, Curwin->rc.sortindx) < Curwin->begpflg) begpflgs -= 2;
|
|
|
|
|
}
|
|
|
|
|
#endif
|
|
|
|
|
if (1 > totpflgs) totpflgs = 1;
|
|
|
|
|
if (1 > begpflgs) begpflgs = 1;
|
|
|
|
|
snprintf(tmp1, sizeof(tmp1), N_fmt(SCROLL_coord_fmt), Curwin->begtask + 1, Frame_maxtask, begpflgs, totpflgs);
|
|
|
|
|
#ifndef SCROLLVAR_NO
|
|
|
|
|
if (Curwin->varcolbeg) {
|
|
|
|
|
snprintf(tmp2, sizeof(tmp2), " + %d", Curwin->varcolbeg);
|
|
|
|
|
scat(tmp1, tmp2);
|
|
|
|
|
}
|
|
|
|
|
#endif
|
|
|
|
|
PUTT("%s%s %.*s%s", tg2(0, Msg_row), Caps_off, Screen_cols - 3, tmp1, Cap_clr_eol);
|
|
|
|
|
} // end: show_scroll
|
|
|
|
|
|
|
|
|
|
|
2002-05-30 09:14:46 +05:30
|
|
|
|
/*
|
|
|
|
|
* Show lines with specially formatted elements, but only output
|
|
|
|
|
* what will fit within the current screen width.
|
|
|
|
|
* Our special formatting consists of:
|
|
|
|
|
* "some text <_delimiter_> some more text <_delimiter_>...\n"
|
2011-10-25 03:50:45 +05:30
|
|
|
|
* Where <_delimiter_> is a two byte combination consisting of a
|
2014-03-03 16:28:56 +05:30
|
|
|
|
* tilde followed by an ascii digit in the range of 1 - 8.
|
2017-12-15 10:30:00 +05:30
|
|
|
|
* examples: ~1, ~5, ~8, etc.
|
top: redesign Uniq_nlstab/show_special (nls quirks)
Until this patch, top had used some strings with
special escape sequences to produce colors, normal
text, bold text, etc. They took the following form,
explained by an excerpt from program comments:
...
Our special formatting consists of:
"some text <_delimiter_> some more text <_delimiter_>...\n"
Where <_delimiter_> is a single byte in the range of:
\001 through \010 (in decimalizee, 1 - 8)
and is used to select an 'attribute' from a capabilities table
which is then applied to the *preceding* substring.
...
Unfortunately, these nonprinting values revealed
insurmountable inconsistencies in both the front-end
and back-end translation tools.
The xgettext (extraction) program would take those
special escapes, convert them and then output raw
binary values. Thus the .pot file would contain
lots of unprintable stuff making it unreadable.
If the following was added to po/Makevars, most of
those special escapes would be preserved in their
escape notation:
XGETTEXT_OPTIONS = ... --escape
But two escapes were converted from octal notation
and there was no way to prevent it:
\007 --> \a
\010 --> \b
After a pass through the msginit program, most of
the escapes were reconverted to raw binary values
making translation impossible. There was no
"--escape" option for the back-end programs like
there was for xgettext.
But the real killer was the escape \004, also used
in some of top's special strings. This value would
be silently accepted by xgettext, only to produce
the following fatal error in back-end programs like
msginit, msgfmt and msgen:
.pot:2647: context separator <EOT> within string
To quote from one of the references below:
"Would you create a suite of tools that silently
allow what is destined to become a fatal error
to pass unnoticed?"
So the bottom line was: top's special strings, in
use for the past nine years, had to be redesigned.
References:
http://www.freelists.org/post/procps/procpsng-nls-support,11
http://www.freelists.org/post/procps/procpsng-nls-support,14
2011-10-20 00:44:37 +05:30
|
|
|
|
* The tilde is effectively stripped and the next digit
|
|
|
|
|
* converted to an index which is then used to select an
|
|
|
|
|
* 'attribute' from a capabilities table. That attribute
|
|
|
|
|
* is then applied to the *preceding* substring.
|
2002-05-30 09:14:46 +05:30
|
|
|
|
* Once recognized, the delimiter is replaced with a null character
|
|
|
|
|
* and viola, we've got a substring ready to output! Strings or
|
|
|
|
|
* substrings without delimiters will receive the Cap_norm attribute.
|
|
|
|
|
*
|
|
|
|
|
* Caution:
|
|
|
|
|
* This routine treats all non-delimiter bytes as displayable
|
|
|
|
|
* data subject to our screen width marching orders. If callers
|
|
|
|
|
* embed non-display data like tabs or terminfo strings in our
|
|
|
|
|
* glob, a line will truncate incorrectly at best. Worse case
|
|
|
|
|
* would be truncation of an embedded tty escape sequence.
|
|
|
|
|
*
|
|
|
|
|
* Tabs must always be avoided or our efforts are wasted and
|
|
|
|
|
* lines will wrap. To lessen but not eliminate the risk of
|
|
|
|
|
* terminfo string truncation, such non-display stuff should
|
top: redesign Uniq_nlstab/show_special (nls quirks)
Until this patch, top had used some strings with
special escape sequences to produce colors, normal
text, bold text, etc. They took the following form,
explained by an excerpt from program comments:
...
Our special formatting consists of:
"some text <_delimiter_> some more text <_delimiter_>...\n"
Where <_delimiter_> is a single byte in the range of:
\001 through \010 (in decimalizee, 1 - 8)
and is used to select an 'attribute' from a capabilities table
which is then applied to the *preceding* substring.
...
Unfortunately, these nonprinting values revealed
insurmountable inconsistencies in both the front-end
and back-end translation tools.
The xgettext (extraction) program would take those
special escapes, convert them and then output raw
binary values. Thus the .pot file would contain
lots of unprintable stuff making it unreadable.
If the following was added to po/Makevars, most of
those special escapes would be preserved in their
escape notation:
XGETTEXT_OPTIONS = ... --escape
But two escapes were converted from octal notation
and there was no way to prevent it:
\007 --> \a
\010 --> \b
After a pass through the msginit program, most of
the escapes were reconverted to raw binary values
making translation impossible. There was no
"--escape" option for the back-end programs like
there was for xgettext.
But the real killer was the escape \004, also used
in some of top's special strings. This value would
be silently accepted by xgettext, only to produce
the following fatal error in back-end programs like
msginit, msgfmt and msgen:
.pot:2647: context separator <EOT> within string
To quote from one of the references below:
"Would you create a suite of tools that silently
allow what is destined to become a fatal error
to pass unnoticed?"
So the bottom line was: top's special strings, in
use for the past nine years, had to be redesigned.
References:
http://www.freelists.org/post/procps/procpsng-nls-support,11
http://www.freelists.org/post/procps/procpsng-nls-support,14
2011-10-20 00:44:37 +05:30
|
|
|
|
* be placed at the beginning of a "short" line. */
|
2011-03-31 16:45:12 +05:30
|
|
|
|
static void show_special (int interact, const char *glob) {
|
|
|
|
|
/* note: the following is for documentation only,
|
2002-06-19 05:15:30 +05:30
|
|
|
|
the real captab is now found in a group's WIN_t !
|
|
|
|
|
+------------------------------------------------------+
|
2018-05-18 10:30:00 +05:30
|
|
|
|
| char *captab[] = { : Cap's = Index |
|
2011-10-15 06:28:02 +05:30
|
|
|
|
| Cap_norm, Cap_norm, = \000, \001, |
|
|
|
|
|
| cap_bold, capclr_sum, = \002, \003, |
|
|
|
|
|
| capclr_msg, capclr_pmt, = \004, \005, |
|
|
|
|
|
| capclr_hdr, = \006, |
|
|
|
|
|
| capclr_rowhigh, = \007, |
|
|
|
|
|
| capclr_rownorm }; = \010 [octal!] |
|
2002-06-19 05:15:30 +05:30
|
|
|
|
+------------------------------------------------------+ */
|
top: add a flexible 'Inspect' capability
This commit introduces an extremely powerful, flexible
brand new capability. Now, users can pause the normal
iterative display and inspect the contents of any file
or output from any script, command, or even pipelines.
It's invoked via the 'Y' interactive command which, in
turn, is supported with simple user supplied additions
as new entries in the top personal configuration file.
A separate new 'Inspect' window supports scrolling and
searching, similar to the main top display. Except it
extends existing 'L'/'&' (locate/locate-next) commands
so that an out-of-view match automatically adjusts the
horizontal position bringing such data into view. And
it provides for multiple successive same line matches.
Also, the basic 'more/less' navigation keys are active
in this new 'Inspect' window, to ease user transition.
There are no program changes required when entries are
added to or deleted from the rcfile. And there are no
known limits to the complexity of a script, command or
pipeline, other than the unidirectional nature imposed
by the 'popen' function call which top cannot violate.
Since it's impossible to predict exactly what contents
will be generated, top treats all output as raw binary
data. Any control characters display in '^C' notation
while all other unprintable characters show as '<AB>'.
The biggest problem encountered was with the find/next
capability since that strstr guy was really diminished
given the possibility that numerous 'strings' could be
encountered *within* many of top's raw, binary 'rows'.
Oh, and another problem was in maintaining the perfect
left & right text justification of this commit message
along with all of the commit summaries. Some of those
summaries (like this very one) are of course, slightly
shorter, to make room for the 'man document' addition.
Enjoy!
Signed-off-by: Jim Warner <james.warner@comcast.net>
2012-11-25 10:30:05 +05:30
|
|
|
|
/* ( Pssst, after adding the termcap transitions, row may )
|
|
|
|
|
( exceed 300+ bytes, even in an 80x24 terminal window! )
|
2018-05-18 10:30:00 +05:30
|
|
|
|
( Shown here are the former buffer size specifications )
|
|
|
|
|
( char tmp[SMLBUFSIZ], lin[MEDBUFSIZ], row[LRGBUFSIZ]. )
|
|
|
|
|
( So now we use larger buffers and a little protection )
|
|
|
|
|
( against overrunning them with this 'lin_end - glob'. )
|
|
|
|
|
|
|
|
|
|
( That was uncovered during 'Inspect' development when )
|
|
|
|
|
( this guy was being considered for a supporting role. )
|
|
|
|
|
( However, such an approach was abandoned. As a result )
|
|
|
|
|
( this function is called only with a glob under top's )
|
|
|
|
|
( control and never containing any 'raw/binary' chars! ) */
|
top: add a flexible 'Inspect' capability
This commit introduces an extremely powerful, flexible
brand new capability. Now, users can pause the normal
iterative display and inspect the contents of any file
or output from any script, command, or even pipelines.
It's invoked via the 'Y' interactive command which, in
turn, is supported with simple user supplied additions
as new entries in the top personal configuration file.
A separate new 'Inspect' window supports scrolling and
searching, similar to the main top display. Except it
extends existing 'L'/'&' (locate/locate-next) commands
so that an out-of-view match automatically adjusts the
horizontal position bringing such data into view. And
it provides for multiple successive same line matches.
Also, the basic 'more/less' navigation keys are active
in this new 'Inspect' window, to ease user transition.
There are no program changes required when entries are
added to or deleted from the rcfile. And there are no
known limits to the complexity of a script, command or
pipeline, other than the unidirectional nature imposed
by the 'popen' function call which top cannot violate.
Since it's impossible to predict exactly what contents
will be generated, top treats all output as raw binary
data. Any control characters display in '^C' notation
while all other unprintable characters show as '<AB>'.
The biggest problem encountered was with the find/next
capability since that strstr guy was really diminished
given the possibility that numerous 'strings' could be
encountered *within* many of top's raw, binary 'rows'.
Oh, and another problem was in maintaining the perfect
left & right text justification of this commit message
along with all of the commit summaries. Some of those
summaries (like this very one) are of course, slightly
shorter, to make room for the 'man document' addition.
Enjoy!
Signed-off-by: Jim Warner <james.warner@comcast.net>
2012-11-25 10:30:05 +05:30
|
|
|
|
char tmp[LRGBUFSIZ], lin[LRGBUFSIZ], row[ROWMAXSIZ];
|
top: redesign Uniq_nlstab/show_special (nls quirks)
Until this patch, top had used some strings with
special escape sequences to produce colors, normal
text, bold text, etc. They took the following form,
explained by an excerpt from program comments:
...
Our special formatting consists of:
"some text <_delimiter_> some more text <_delimiter_>...\n"
Where <_delimiter_> is a single byte in the range of:
\001 through \010 (in decimalizee, 1 - 8)
and is used to select an 'attribute' from a capabilities table
which is then applied to the *preceding* substring.
...
Unfortunately, these nonprinting values revealed
insurmountable inconsistencies in both the front-end
and back-end translation tools.
The xgettext (extraction) program would take those
special escapes, convert them and then output raw
binary values. Thus the .pot file would contain
lots of unprintable stuff making it unreadable.
If the following was added to po/Makevars, most of
those special escapes would be preserved in their
escape notation:
XGETTEXT_OPTIONS = ... --escape
But two escapes were converted from octal notation
and there was no way to prevent it:
\007 --> \a
\010 --> \b
After a pass through the msginit program, most of
the escapes were reconverted to raw binary values
making translation impossible. There was no
"--escape" option for the back-end programs like
there was for xgettext.
But the real killer was the escape \004, also used
in some of top's special strings. This value would
be silently accepted by xgettext, only to produce
the following fatal error in back-end programs like
msginit, msgfmt and msgen:
.pot:2647: context separator <EOT> within string
To quote from one of the references below:
"Would you create a suite of tools that silently
allow what is destined to become a fatal error
to pass unnoticed?"
So the bottom line was: top's special strings, in
use for the past nine years, had to be redesigned.
References:
http://www.freelists.org/post/procps/procpsng-nls-support,11
http://www.freelists.org/post/procps/procpsng-nls-support,14
2011-10-20 00:44:37 +05:30
|
|
|
|
char *rp, *lin_end, *sub_beg, *sub_end;
|
2002-05-30 09:14:46 +05:30
|
|
|
|
int room;
|
|
|
|
|
|
2011-03-31 16:45:12 +05:30
|
|
|
|
// handle multiple lines passed in a bunch
|
2002-05-30 09:14:46 +05:30
|
|
|
|
while ((lin_end = strchr(glob, '\n'))) {
|
top: add a flexible 'Inspect' capability
This commit introduces an extremely powerful, flexible
brand new capability. Now, users can pause the normal
iterative display and inspect the contents of any file
or output from any script, command, or even pipelines.
It's invoked via the 'Y' interactive command which, in
turn, is supported with simple user supplied additions
as new entries in the top personal configuration file.
A separate new 'Inspect' window supports scrolling and
searching, similar to the main top display. Except it
extends existing 'L'/'&' (locate/locate-next) commands
so that an out-of-view match automatically adjusts the
horizontal position bringing such data into view. And
it provides for multiple successive same line matches.
Also, the basic 'more/less' navigation keys are active
in this new 'Inspect' window, to ease user transition.
There are no program changes required when entries are
added to or deleted from the rcfile. And there are no
known limits to the complexity of a script, command or
pipeline, other than the unidirectional nature imposed
by the 'popen' function call which top cannot violate.
Since it's impossible to predict exactly what contents
will be generated, top treats all output as raw binary
data. Any control characters display in '^C' notation
while all other unprintable characters show as '<AB>'.
The biggest problem encountered was with the find/next
capability since that strstr guy was really diminished
given the possibility that numerous 'strings' could be
encountered *within* many of top's raw, binary 'rows'.
Oh, and another problem was in maintaining the perfect
left & right text justification of this commit message
along with all of the commit summaries. Some of those
summaries (like this very one) are of course, slightly
shorter, to make room for the 'man document' addition.
Enjoy!
Signed-off-by: Jim Warner <james.warner@comcast.net>
2012-11-25 10:30:05 +05:30
|
|
|
|
#define myMIN(a,b) (((a) < (b)) ? (a) : (b))
|
2018-05-18 10:30:00 +05:30
|
|
|
|
size_t lessor = myMIN((size_t)(lin_end - glob), sizeof(lin) -3);
|
top: add a flexible 'Inspect' capability
This commit introduces an extremely powerful, flexible
brand new capability. Now, users can pause the normal
iterative display and inspect the contents of any file
or output from any script, command, or even pipelines.
It's invoked via the 'Y' interactive command which, in
turn, is supported with simple user supplied additions
as new entries in the top personal configuration file.
A separate new 'Inspect' window supports scrolling and
searching, similar to the main top display. Except it
extends existing 'L'/'&' (locate/locate-next) commands
so that an out-of-view match automatically adjusts the
horizontal position bringing such data into view. And
it provides for multiple successive same line matches.
Also, the basic 'more/less' navigation keys are active
in this new 'Inspect' window, to ease user transition.
There are no program changes required when entries are
added to or deleted from the rcfile. And there are no
known limits to the complexity of a script, command or
pipeline, other than the unidirectional nature imposed
by the 'popen' function call which top cannot violate.
Since it's impossible to predict exactly what contents
will be generated, top treats all output as raw binary
data. Any control characters display in '^C' notation
while all other unprintable characters show as '<AB>'.
The biggest problem encountered was with the find/next
capability since that strstr guy was really diminished
given the possibility that numerous 'strings' could be
encountered *within* many of top's raw, binary 'rows'.
Oh, and another problem was in maintaining the perfect
left & right text justification of this commit message
along with all of the commit summaries. Some of those
summaries (like this very one) are of course, slightly
shorter, to make room for the 'man document' addition.
Enjoy!
Signed-off-by: Jim Warner <james.warner@comcast.net>
2012-11-25 10:30:05 +05:30
|
|
|
|
|
2011-03-31 16:45:12 +05:30
|
|
|
|
// create a local copy we can extend and otherwise abuse
|
top: add a flexible 'Inspect' capability
This commit introduces an extremely powerful, flexible
brand new capability. Now, users can pause the normal
iterative display and inspect the contents of any file
or output from any script, command, or even pipelines.
It's invoked via the 'Y' interactive command which, in
turn, is supported with simple user supplied additions
as new entries in the top personal configuration file.
A separate new 'Inspect' window supports scrolling and
searching, similar to the main top display. Except it
extends existing 'L'/'&' (locate/locate-next) commands
so that an out-of-view match automatically adjusts the
horizontal position bringing such data into view. And
it provides for multiple successive same line matches.
Also, the basic 'more/less' navigation keys are active
in this new 'Inspect' window, to ease user transition.
There are no program changes required when entries are
added to or deleted from the rcfile. And there are no
known limits to the complexity of a script, command or
pipeline, other than the unidirectional nature imposed
by the 'popen' function call which top cannot violate.
Since it's impossible to predict exactly what contents
will be generated, top treats all output as raw binary
data. Any control characters display in '^C' notation
while all other unprintable characters show as '<AB>'.
The biggest problem encountered was with the find/next
capability since that strstr guy was really diminished
given the possibility that numerous 'strings' could be
encountered *within* many of top's raw, binary 'rows'.
Oh, and another problem was in maintaining the perfect
left & right text justification of this commit message
along with all of the commit summaries. Some of those
summaries (like this very one) are of course, slightly
shorter, to make room for the 'man document' addition.
Enjoy!
Signed-off-by: Jim Warner <james.warner@comcast.net>
2012-11-25 10:30:05 +05:30
|
|
|
|
memcpy(lin, glob, lessor);
|
2011-03-31 16:45:12 +05:30
|
|
|
|
// zero terminate this part and prepare to parse substrings
|
top: add a flexible 'Inspect' capability
This commit introduces an extremely powerful, flexible
brand new capability. Now, users can pause the normal
iterative display and inspect the contents of any file
or output from any script, command, or even pipelines.
It's invoked via the 'Y' interactive command which, in
turn, is supported with simple user supplied additions
as new entries in the top personal configuration file.
A separate new 'Inspect' window supports scrolling and
searching, similar to the main top display. Except it
extends existing 'L'/'&' (locate/locate-next) commands
so that an out-of-view match automatically adjusts the
horizontal position bringing such data into view. And
it provides for multiple successive same line matches.
Also, the basic 'more/less' navigation keys are active
in this new 'Inspect' window, to ease user transition.
There are no program changes required when entries are
added to or deleted from the rcfile. And there are no
known limits to the complexity of a script, command or
pipeline, other than the unidirectional nature imposed
by the 'popen' function call which top cannot violate.
Since it's impossible to predict exactly what contents
will be generated, top treats all output as raw binary
data. Any control characters display in '^C' notation
while all other unprintable characters show as '<AB>'.
The biggest problem encountered was with the find/next
capability since that strstr guy was really diminished
given the possibility that numerous 'strings' could be
encountered *within* many of top's raw, binary 'rows'.
Oh, and another problem was in maintaining the perfect
left & right text justification of this commit message
along with all of the commit summaries. Some of those
summaries (like this very one) are of course, slightly
shorter, to make room for the 'man document' addition.
Enjoy!
Signed-off-by: Jim Warner <james.warner@comcast.net>
2012-11-25 10:30:05 +05:30
|
|
|
|
lin[lessor] = '\0';
|
2002-05-30 09:14:46 +05:30
|
|
|
|
room = Screen_cols;
|
2002-11-25 03:34:03 +05:30
|
|
|
|
sub_beg = sub_end = lin;
|
|
|
|
|
*(rp = row) = '\0';
|
2002-05-30 09:14:46 +05:30
|
|
|
|
|
|
|
|
|
while (*sub_beg) {
|
top: redesign Uniq_nlstab/show_special (nls quirks)
Until this patch, top had used some strings with
special escape sequences to produce colors, normal
text, bold text, etc. They took the following form,
explained by an excerpt from program comments:
...
Our special formatting consists of:
"some text <_delimiter_> some more text <_delimiter_>...\n"
Where <_delimiter_> is a single byte in the range of:
\001 through \010 (in decimalizee, 1 - 8)
and is used to select an 'attribute' from a capabilities table
which is then applied to the *preceding* substring.
...
Unfortunately, these nonprinting values revealed
insurmountable inconsistencies in both the front-end
and back-end translation tools.
The xgettext (extraction) program would take those
special escapes, convert them and then output raw
binary values. Thus the .pot file would contain
lots of unprintable stuff making it unreadable.
If the following was added to po/Makevars, most of
those special escapes would be preserved in their
escape notation:
XGETTEXT_OPTIONS = ... --escape
But two escapes were converted from octal notation
and there was no way to prevent it:
\007 --> \a
\010 --> \b
After a pass through the msginit program, most of
the escapes were reconverted to raw binary values
making translation impossible. There was no
"--escape" option for the back-end programs like
there was for xgettext.
But the real killer was the escape \004, also used
in some of top's special strings. This value would
be silently accepted by xgettext, only to produce
the following fatal error in back-end programs like
msginit, msgfmt and msgen:
.pot:2647: context separator <EOT> within string
To quote from one of the references below:
"Would you create a suite of tools that silently
allow what is destined to become a fatal error
to pass unnoticed?"
So the bottom line was: top's special strings, in
use for the past nine years, had to be redesigned.
References:
http://www.freelists.org/post/procps/procpsng-nls-support,11
http://www.freelists.org/post/procps/procpsng-nls-support,14
2011-10-20 00:44:37 +05:30
|
|
|
|
int ch = *sub_end;
|
|
|
|
|
if ('~' == ch) ch = *(sub_end + 1) - '0';
|
|
|
|
|
switch (ch) {
|
2011-03-31 16:45:12 +05:30
|
|
|
|
case 0: // no end delim, captab makes normal
|
2019-02-01 11:30:00 +05:30
|
|
|
|
// only possible when '\n' was NOT preceded with a '~#' sequence
|
2018-05-18 10:30:00 +05:30
|
|
|
|
// ( '~1' thru '~8' is valid range, '~0' is never actually used )
|
2018-05-18 10:30:00 +05:30
|
|
|
|
*(sub_end + 1) = '\0'; // extend str end, then fall through
|
|
|
|
|
*(sub_end + 2) = '\0'; // ( +1 optimization for usual path )
|
2012-03-05 22:52:33 +05:30
|
|
|
|
case 1: case 2: case 3: case 4:
|
|
|
|
|
case 5: case 6: case 7: case 8:
|
2002-05-30 09:14:46 +05:30
|
|
|
|
*sub_end = '\0';
|
top: add a flexible 'Inspect' capability
This commit introduces an extremely powerful, flexible
brand new capability. Now, users can pause the normal
iterative display and inspect the contents of any file
or output from any script, command, or even pipelines.
It's invoked via the 'Y' interactive command which, in
turn, is supported with simple user supplied additions
as new entries in the top personal configuration file.
A separate new 'Inspect' window supports scrolling and
searching, similar to the main top display. Except it
extends existing 'L'/'&' (locate/locate-next) commands
so that an out-of-view match automatically adjusts the
horizontal position bringing such data into view. And
it provides for multiple successive same line matches.
Also, the basic 'more/less' navigation keys are active
in this new 'Inspect' window, to ease user transition.
There are no program changes required when entries are
added to or deleted from the rcfile. And there are no
known limits to the complexity of a script, command or
pipeline, other than the unidirectional nature imposed
by the 'popen' function call which top cannot violate.
Since it's impossible to predict exactly what contents
will be generated, top treats all output as raw binary
data. Any control characters display in '^C' notation
while all other unprintable characters show as '<AB>'.
The biggest problem encountered was with the find/next
capability since that strstr guy was really diminished
given the possibility that numerous 'strings' could be
encountered *within* many of top's raw, binary 'rows'.
Oh, and another problem was in maintaining the perfect
left & right text justification of this commit message
along with all of the commit summaries. Some of those
summaries (like this very one) are of course, slightly
shorter, to make room for the 'man document' addition.
Enjoy!
Signed-off-by: Jim Warner <james.warner@comcast.net>
2012-11-25 10:30:05 +05:30
|
|
|
|
snprintf(tmp, sizeof(tmp), "%s%.*s%s"
|
2017-10-02 10:29:59 +05:30
|
|
|
|
, Curwin->captab[ch], utf8_embody(sub_beg, room), sub_beg, Caps_off);
|
2018-05-18 10:30:00 +05:30
|
|
|
|
rp = scat(rp, tmp);
|
2002-05-30 09:14:46 +05:30
|
|
|
|
room -= (sub_end - sub_beg);
|
top: refactored for correct multi-byte string handling
When this project first began implementing translation
support nearly 6 years ago, we overcame many 'gettext'
obstacles and limitations. And, of course, there were
not any actual translations at the time so our testing
was quite limited plus, in many cases, only simulated.
None of that, however, can justify or excuse the total
lack of attention to top's approach to NLS, especially
since some actual translations have existed for years.
When the issue referenced below was raised, I suffered
immediate feelings of anxiety, doubt and pending doom.
This was mostly because top strives to avoid line wrap
at all costs and that did not bode well for multi-byte
translated strings, using several bytes per character.
I was also concerned over possible performance impact,
assuming it was even possible to properly handle utf8.
But, after wrestling with the problem for several days
those initial feelings have now been replaced by guilt
over any trouble I initially caused those translators.
One can only imagine how frustrating it must have been
after the translation effort to then see top display a
misaligned column header and fields management page or
truncated screens like those of help or color mapping.
------------------------------------------------------
Ok, with that off my chest let's review these changes,
now that top properly handles UTF8 multi-byte strings.
. Performance - virtually all of this newly added cost
for multi-byte support is incurred during interactions
with the user. So, performance is not really an issue.
The one occasion when performance is impacted is found
during 'summary_show()' processing, due to an addition
of one new call to 'utf8_delta()' in 'show_special()'.
. Extra Wide Characters - I have not yet and may never
figure out a way to support languages like zh_CN where
the characters can be wider than most other languages.
. Translated User Name - at some future point we could
implement translation of user names. But as the author
of the issue acknowledged such names are non-standard.
Thus task display still incurs no new multi-byte costs
beyond those already incurred in that escape.c module.
For raising the issue I extend my sincerest thanks to:
Göran Uddeborg
Reference(s):
https://gitlab.com/procps-ng/procps/issues/68
Signed-off-by: Jim Warner <james.warner@comcast.net>
2017-09-27 10:32:22 +05:30
|
|
|
|
room += utf8_delta(sub_beg);
|
2011-10-25 03:50:45 +05:30
|
|
|
|
sub_beg = (sub_end += 2);
|
2002-05-30 09:14:46 +05:30
|
|
|
|
break;
|
2011-03-31 16:45:12 +05:30
|
|
|
|
default: // nothin' special, just text
|
2002-05-30 09:14:46 +05:30
|
|
|
|
++sub_end;
|
|
|
|
|
}
|
2011-03-31 16:45:12 +05:30
|
|
|
|
if (0 >= room) break; // skip substrings that won't fit
|
2002-11-25 03:34:03 +05:30
|
|
|
|
}
|
2011-03-31 16:45:12 +05:30
|
|
|
|
|
2002-11-25 03:34:03 +05:30
|
|
|
|
if (interact) PUTT("%s%s\n", row, Cap_clr_eol);
|
2011-03-31 16:45:12 +05:30
|
|
|
|
else PUFF("%s%s\n", row, Caps_endline);
|
|
|
|
|
glob = ++lin_end; // point to next line (maybe)
|
|
|
|
|
|
top: add a flexible 'Inspect' capability
This commit introduces an extremely powerful, flexible
brand new capability. Now, users can pause the normal
iterative display and inspect the contents of any file
or output from any script, command, or even pipelines.
It's invoked via the 'Y' interactive command which, in
turn, is supported with simple user supplied additions
as new entries in the top personal configuration file.
A separate new 'Inspect' window supports scrolling and
searching, similar to the main top display. Except it
extends existing 'L'/'&' (locate/locate-next) commands
so that an out-of-view match automatically adjusts the
horizontal position bringing such data into view. And
it provides for multiple successive same line matches.
Also, the basic 'more/less' navigation keys are active
in this new 'Inspect' window, to ease user transition.
There are no program changes required when entries are
added to or deleted from the rcfile. And there are no
known limits to the complexity of a script, command or
pipeline, other than the unidirectional nature imposed
by the 'popen' function call which top cannot violate.
Since it's impossible to predict exactly what contents
will be generated, top treats all output as raw binary
data. Any control characters display in '^C' notation
while all other unprintable characters show as '<AB>'.
The biggest problem encountered was with the find/next
capability since that strstr guy was really diminished
given the possibility that numerous 'strings' could be
encountered *within* many of top's raw, binary 'rows'.
Oh, and another problem was in maintaining the perfect
left & right text justification of this commit message
along with all of the commit summaries. Some of those
summaries (like this very one) are of course, slightly
shorter, to make room for the 'man document' addition.
Enjoy!
Signed-off-by: Jim Warner <james.warner@comcast.net>
2012-11-25 10:30:05 +05:30
|
|
|
|
#undef myMIN
|
2011-03-31 16:45:12 +05:30
|
|
|
|
} // end: while 'lines'
|
2002-05-30 09:14:46 +05:30
|
|
|
|
|
2002-11-25 03:34:03 +05:30
|
|
|
|
/* If there's anything left in the glob (by virtue of no trailing '\n'),
|
2002-05-30 09:14:46 +05:30
|
|
|
|
it probably means caller wants to retain cursor position on this final
|
2002-11-25 03:34:03 +05:30
|
|
|
|
line. That, in turn, means we're interactive and so we'll just do our
|
2011-05-26 15:03:32 +05:30
|
|
|
|
'fit-to-screen' thingy while also leaving room for the cursor... */
|
2017-10-02 10:29:59 +05:30
|
|
|
|
if (*glob) PUTT("%.*s", utf8_embody(glob, Screen_cols - 1), glob);
|
2011-03-31 16:45:12 +05:30
|
|
|
|
} // end: show_special
|
|
|
|
|
|
top: add a flexible 'Inspect' capability
This commit introduces an extremely powerful, flexible
brand new capability. Now, users can pause the normal
iterative display and inspect the contents of any file
or output from any script, command, or even pipelines.
It's invoked via the 'Y' interactive command which, in
turn, is supported with simple user supplied additions
as new entries in the top personal configuration file.
A separate new 'Inspect' window supports scrolling and
searching, similar to the main top display. Except it
extends existing 'L'/'&' (locate/locate-next) commands
so that an out-of-view match automatically adjusts the
horizontal position bringing such data into view. And
it provides for multiple successive same line matches.
Also, the basic 'more/less' navigation keys are active
in this new 'Inspect' window, to ease user transition.
There are no program changes required when entries are
added to or deleted from the rcfile. And there are no
known limits to the complexity of a script, command or
pipeline, other than the unidirectional nature imposed
by the 'popen' function call which top cannot violate.
Since it's impossible to predict exactly what contents
will be generated, top treats all output as raw binary
data. Any control characters display in '^C' notation
while all other unprintable characters show as '<AB>'.
The biggest problem encountered was with the find/next
capability since that strstr guy was really diminished
given the possibility that numerous 'strings' could be
encountered *within* many of top's raw, binary 'rows'.
Oh, and another problem was in maintaining the perfect
left & right text justification of this commit message
along with all of the commit summaries. Some of those
summaries (like this very one) are of course, slightly
shorter, to make room for the 'man document' addition.
Enjoy!
Signed-off-by: Jim Warner <james.warner@comcast.net>
2012-11-25 10:30:05 +05:30
|
|
|
|
/*###### Low Level Memory/Keyboard/File I/O support ####################*/
|
2011-12-20 19:53:37 +05:30
|
|
|
|
|
|
|
|
|
/*
|
|
|
|
|
* Handle our own memory stuff without the risk of leaving the
|
|
|
|
|
* user's terminal in an ugly state should things go sour. */
|
|
|
|
|
|
|
|
|
|
static void *alloc_c (size_t num) MALLOC;
|
|
|
|
|
static void *alloc_c (size_t num) {
|
|
|
|
|
void *pv;
|
|
|
|
|
|
|
|
|
|
if (!num) ++num;
|
|
|
|
|
if (!(pv = calloc(1, num)))
|
2011-10-12 00:32:59 +05:30
|
|
|
|
error_exit(N_txt(FAIL_alloc_c_txt));
|
2011-12-20 19:53:37 +05:30
|
|
|
|
return pv;
|
|
|
|
|
} // end: alloc_c
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
static void *alloc_r (void *ptr, size_t num) MALLOC;
|
|
|
|
|
static void *alloc_r (void *ptr, size_t num) {
|
|
|
|
|
void *pv;
|
|
|
|
|
|
|
|
|
|
if (!num) ++num;
|
|
|
|
|
if (!(pv = realloc(ptr, num)))
|
2011-10-12 00:32:59 +05:30
|
|
|
|
error_exit(N_txt(FAIL_alloc_r_txt));
|
2011-12-20 19:53:37 +05:30
|
|
|
|
return pv;
|
|
|
|
|
} // end: alloc_r
|
|
|
|
|
|
2011-03-31 16:45:12 +05:30
|
|
|
|
|
2013-02-11 11:30:00 +05:30
|
|
|
|
static char *alloc_s (const char *str) MALLOC;
|
|
|
|
|
static char *alloc_s (const char *str) {
|
|
|
|
|
return strcpy(alloc_c(strlen(str) +1), str);
|
|
|
|
|
} // end: alloc_s
|
|
|
|
|
|
|
|
|
|
|
2013-01-16 11:30:00 +05:30
|
|
|
|
/*
|
2018-08-08 10:30:00 +05:30
|
|
|
|
* An 'I/O available' routine which will detect raw single byte |
|
|
|
|
|
* unsolicited keyboard input which was susceptible to SIGWINCH |
|
|
|
|
|
* interrupts (or any other signal). He'll also support timout |
|
|
|
|
|
* in the absence of any user keystrokes or a signal interrupt. | */
|
2013-01-16 11:30:00 +05:30
|
|
|
|
static inline int ioa (struct timespec *ts) {
|
2013-01-16 11:30:00 +05:30
|
|
|
|
fd_set fs;
|
|
|
|
|
int rc;
|
|
|
|
|
|
|
|
|
|
FD_ZERO(&fs);
|
|
|
|
|
FD_SET(STDIN_FILENO, &fs);
|
|
|
|
|
|
2013-06-30 10:30:00 +05:30
|
|
|
|
#ifdef SIGNALS_LESS // conditional comments are silly, but help in documenting
|
2013-01-16 11:30:00 +05:30
|
|
|
|
// hold here until we've got keyboard input, any signal except SIGWINCH
|
|
|
|
|
// or (optionally) we timeout with nanosecond granularity
|
2013-06-30 10:30:00 +05:30
|
|
|
|
#else
|
|
|
|
|
// hold here until we've got keyboard input, any signal (including SIGWINCH)
|
|
|
|
|
// or (optionally) we timeout with nanosecond granularity
|
|
|
|
|
#endif
|
2013-01-16 11:30:00 +05:30
|
|
|
|
rc = pselect(STDIN_FILENO + 1, &fs, NULL, NULL, ts, &Sigwinch_set);
|
2013-01-16 11:30:00 +05:30
|
|
|
|
|
|
|
|
|
if (rc < 0) rc = 0;
|
|
|
|
|
return rc;
|
|
|
|
|
} // end: ioa
|
|
|
|
|
|
|
|
|
|
|
2011-03-31 16:45:12 +05:30
|
|
|
|
/*
|
|
|
|
|
* This routine isolates ALL user INPUT and ensures that we
|
|
|
|
|
* wont be mixing I/O from stdio and low-level read() requests */
|
2013-01-16 11:30:00 +05:30
|
|
|
|
static int ioch (int ech, char *buf, unsigned cnt) {
|
2011-03-31 16:45:12 +05:30
|
|
|
|
int rc = -1;
|
|
|
|
|
|
2013-02-15 11:30:00 +05:30
|
|
|
|
#ifdef TERMIOS_ONLY
|
2011-03-31 16:45:12 +05:30
|
|
|
|
if (ech) {
|
|
|
|
|
tcsetattr(STDIN_FILENO, TCSAFLUSH, &Tty_tweaked);
|
|
|
|
|
rc = read(STDIN_FILENO, buf, cnt);
|
|
|
|
|
tcsetattr(STDIN_FILENO, TCSAFLUSH, &Tty_raw);
|
|
|
|
|
} else {
|
2013-01-16 11:30:00 +05:30
|
|
|
|
if (ioa(NULL))
|
2011-03-31 16:45:12 +05:30
|
|
|
|
rc = read(STDIN_FILENO, buf, cnt);
|
|
|
|
|
}
|
|
|
|
|
#else
|
|
|
|
|
(void)ech;
|
2013-01-16 11:30:00 +05:30
|
|
|
|
if (ioa(NULL))
|
2011-03-31 16:45:12 +05:30
|
|
|
|
rc = read(STDIN_FILENO, buf, cnt);
|
|
|
|
|
#endif
|
|
|
|
|
|
|
|
|
|
// zero means EOF, might happen if we erroneously get detached from terminal
|
|
|
|
|
if (0 == rc) bye_bye(NULL);
|
|
|
|
|
|
|
|
|
|
// it may have been the beginning of a lengthy escape sequence
|
|
|
|
|
tcflush(STDIN_FILENO, TCIFLUSH);
|
|
|
|
|
|
2016-04-26 10:30:00 +05:30
|
|
|
|
// note: we do NOT produce a valid 'string'
|
2011-03-31 16:45:12 +05:30
|
|
|
|
return rc;
|
2013-01-16 11:30:00 +05:30
|
|
|
|
} // end: ioch
|
2011-03-31 16:45:12 +05:30
|
|
|
|
|
|
|
|
|
|
|
|
|
|
/*
|
2013-02-15 11:30:00 +05:30
|
|
|
|
* Support for single or multiple keystroke input AND
|
|
|
|
|
* escaped cursor motion keys.
|
2011-03-31 16:45:12 +05:30
|
|
|
|
* note: we support more keys than we currently need, in case
|
|
|
|
|
* we attract new consumers in the future */
|
2013-02-15 11:30:00 +05:30
|
|
|
|
static int iokey (int action) {
|
2011-03-31 16:45:12 +05:30
|
|
|
|
static struct {
|
|
|
|
|
const char *str;
|
|
|
|
|
int key;
|
|
|
|
|
} tinfo_tab[] = {
|
2019-08-03 10:30:00 +05:30
|
|
|
|
{ NULL, kbd_BKSP }, { NULL, kbd_INS }, { NULL, kbd_DEL },
|
|
|
|
|
{ NULL, kbd_LEFT }, { NULL, kbd_DOWN }, { NULL, kbd_UP }, { NULL, kbd_RIGHT },
|
|
|
|
|
{ NULL, kbd_HOME }, { NULL, kbd_PGDN }, { NULL, kbd_PGUP }, { NULL, kbd_END },
|
2012-10-01 21:41:01 +05:30
|
|
|
|
// remainder are alternatives for above, just in case...
|
2019-08-03 10:30:00 +05:30
|
|
|
|
// ( the h,j,k,l entries are the vim cursor motion keys )
|
|
|
|
|
{ "\033h", kbd_LEFT }, { "\033j", kbd_DOWN }, /* meta+ h,j */
|
|
|
|
|
{ "\033k", kbd_UP }, { "\033l", kbd_RIGHT }, /* meta+ k,l */
|
|
|
|
|
{ "\033\010", kbd_HOME }, { "\033\012", kbd_PGDN }, /* ctrl+meta+ h,j */
|
|
|
|
|
{ "\033\013", kbd_PGUP }, { "\033\014", kbd_END }, /* ctrl+meta+ k,l */
|
|
|
|
|
{ "\xC3\xA8", kbd_LEFT }, { "\xC3\xAA", kbd_DOWN }, /* meta+ h,j (some xterms) */
|
|
|
|
|
{ "\xC3\xAB", kbd_UP }, { "\xC3\xAC", kbd_RIGHT }, /* meta+ k,l (some xterms) */
|
|
|
|
|
{ "\xC2\x88", kbd_HOME }, { "\xC2\x8A", kbd_PGDN }, /* ctrl+meta+ h,j (some xterms) */
|
|
|
|
|
{ "\xC2\x8B", kbd_PGUP }, { "\xC2\x8C", kbd_END } /* ctrl+meta+ k,l (some xterms) */
|
2012-10-01 21:41:01 +05:30
|
|
|
|
};
|
2013-02-15 11:30:00 +05:30
|
|
|
|
#ifdef TERMIOS_ONLY
|
2011-04-14 02:38:14 +05:30
|
|
|
|
char buf[SMLBUFSIZ], *pb;
|
2013-02-15 11:30:00 +05:30
|
|
|
|
#else
|
|
|
|
|
static char buf[SMLBUFSIZ];
|
|
|
|
|
static int pos, len;
|
|
|
|
|
char *pb;
|
|
|
|
|
#endif
|
2011-03-31 16:45:12 +05:30
|
|
|
|
int i;
|
|
|
|
|
|
2013-02-15 11:30:00 +05:30
|
|
|
|
if (action == 0) {
|
2011-03-31 16:45:12 +05:30
|
|
|
|
#define tOk(s) s ? s : ""
|
2019-08-03 10:30:00 +05:30
|
|
|
|
tinfo_tab[0].str = tOk(key_backspace);
|
|
|
|
|
tinfo_tab[1].str = tOk(key_ic);
|
|
|
|
|
tinfo_tab[2].str = tOk(key_dc);
|
2012-10-01 21:41:01 +05:30
|
|
|
|
tinfo_tab[3].str = tOk(key_left);
|
2019-08-03 10:30:00 +05:30
|
|
|
|
tinfo_tab[4].str = tOk(key_down);
|
|
|
|
|
tinfo_tab[5].str = tOk(key_up);
|
|
|
|
|
tinfo_tab[6].str = tOk(key_right);
|
2012-10-01 21:41:01 +05:30
|
|
|
|
tinfo_tab[7].str = tOk(key_home);
|
2019-08-03 10:30:00 +05:30
|
|
|
|
tinfo_tab[8].str = tOk(key_npage);
|
|
|
|
|
tinfo_tab[9].str = tOk(key_ppage);
|
|
|
|
|
tinfo_tab[10].str = tOk(key_end);
|
2011-03-31 16:45:12 +05:30
|
|
|
|
// next is critical so returned results match bound terminfo keys
|
|
|
|
|
putp(tOk(keypad_xmit));
|
2013-01-16 11:30:00 +05:30
|
|
|
|
// ( converse keypad_local issued at pause/pgm end, just in case )
|
2011-03-31 16:45:12 +05:30
|
|
|
|
return 0;
|
|
|
|
|
#undef tOk
|
|
|
|
|
}
|
2011-04-14 02:38:14 +05:30
|
|
|
|
|
2013-02-15 11:30:00 +05:30
|
|
|
|
if (action == 1) {
|
|
|
|
|
memset(buf, '\0', sizeof(buf));
|
|
|
|
|
if (1 > ioch(0, buf, sizeof(buf)-1)) return 0;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
#ifndef TERMIOS_ONLY
|
|
|
|
|
if (action == 2) {
|
|
|
|
|
if (pos < len)
|
|
|
|
|
return buf[pos++]; // exhaust prior keystrokes
|
|
|
|
|
pos = len = 0;
|
|
|
|
|
memset(buf, '\0', sizeof(buf));
|
|
|
|
|
if (1 > ioch(0, buf, sizeof(buf)-1)) return 0;
|
|
|
|
|
if (isprint(buf[0])) { // no need for translation
|
|
|
|
|
len = strlen(buf);
|
|
|
|
|
pos = 1;
|
|
|
|
|
return buf[0];
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
#endif
|
2011-03-31 16:45:12 +05:30
|
|
|
|
|
|
|
|
|
/* some emulators implement 'key repeat' too well and we get duplicate
|
|
|
|
|
key sequences -- so we'll focus on the last escaped sequence, while
|
|
|
|
|
also allowing use of the meta key... */
|
|
|
|
|
if (!(pb = strrchr(buf, '\033'))) pb = buf;
|
|
|
|
|
else if (pb > buf && '\033' == *(pb - 1)) --pb;
|
|
|
|
|
|
|
|
|
|
for (i = 0; i < MAXTBL(tinfo_tab); i++)
|
|
|
|
|
if (!strcmp(tinfo_tab[i].str, pb))
|
|
|
|
|
return tinfo_tab[i].key;
|
2002-05-30 09:14:46 +05:30
|
|
|
|
|
2012-12-01 11:30:00 +05:30
|
|
|
|
// no match, so we'll return single non-escaped keystrokes only
|
top: attempt to provide missing xterm vim keys support
A recent issue (and merge request) reminded me of gaps
in top's alternate 'vim' navigation keys support. Some
xterm emulators do not pass the customary strings when
keys were used with the <Ctrl> and/or <Alt> modifiers.
While it was a known problem, this issue/merge request
prompted research into the root cause. As it turns out
the problem is traceable to an X resource known by the
name 'eightBitInput'. When 'true' (the default), a key
pressed in combination with <Alt> will not be preceded
by the <Esc> character. Rather, a single character was
presented (modified via an 'eightBitMeta' X resource).
The following approaches would eliminate this problem:
. start xterm thus: xterm -xrm '*eightBitInput: false'
. use: ~/.Xresources with 'Xterm*eightBitInput: false'
. build xterm with 'configure --enable-meta-sends-esc'
( apparently used for CentOS, Fedora, openSUSE, etc. )
. enable xterm's menu via 'configure --enable-toolbar'
( so the user can set the 'Meta Sends Escape' option )
Of course, none of the above steps is desirable from a
user's perspective. So, this patch will add additional
entries to the iokey function's tinfo_tab to represent
strings passed when the <Alt> key does not send <Esc>.
[ hopefully they'll be the same across all platforms ]
Lastly, this patch will also eliminate those redundant
<Atl> + '\', '/', '<' & '>' provisions, which now seem
like overkill and suffer from that same 'eightBitMeta'
xterm problem. And we might as well say goodbye to the
4 '<Alt> + arrow key' table entries (which do not seem
to currently work with any emulator which I can find).
[ what in the world was I thinking way back in 2011? ]
Reference(s):
. issue
https://gitlab.com/procps-ng/procps/issues/135
. merge request
https://gitlab.com/procps-ng/procps/merge_requests/84
Signed-off-by: Jim Warner <james.warner@comcast.net>
2019-06-24 10:30:00 +05:30
|
|
|
|
if (buf[0] == '\033' && buf[1]) return -1;
|
2011-03-31 16:45:12 +05:30
|
|
|
|
return buf[0];
|
2013-01-16 11:30:00 +05:30
|
|
|
|
} // end: iokey
|
2011-03-31 16:45:12 +05:30
|
|
|
|
|
|
|
|
|
|
2013-02-15 11:30:00 +05:30
|
|
|
|
#ifdef TERMIOS_ONLY
|
2011-03-31 16:45:12 +05:30
|
|
|
|
/*
|
|
|
|
|
* Get line oriented interactive input from the user,
|
|
|
|
|
* using native tty support */
|
2013-01-16 11:30:00 +05:30
|
|
|
|
static char *ioline (const char *prompt) {
|
top: correct loss of keystrokes paste capability
When top introduced true line input editing, the
ability to paste keystrokes was lost. This remains
a necessary evil so that top has an opportunity to
translate cursor motion keystrokes into terminfo
escapes during line input. Motion keys themselves,
of course, can never be pasted.
If pasting ever became more important than input
editing, then native termios support should have been
available via a define called TERMIOS_ONLY. But a
recent commit, eliminating what was thought to be
obsolete logic, rendered the alternate linein()
function virtually useless.
Similar to top-3.2.8, when native termios input is
functional, these abberations can be experienced:
. cursor motion keys will appear as escapes
. excessive input can cause line wraps
. ^Z during i/p is not be honored until <Enter>
. SIGWINCH during i/p corrupts screen temporarily
In hindsight, it now seems that the ability to paste
keystrokes may indeed outweigh any shortcomings of
native termios support. This is especially true if
one is preparing to search ('L') for some lengthy
process command line contined in the clipboard.
Thus, this patch fixes the alternate linein() function
and changes TERMIOS_ONLY to TERMIO_PROXY so that top
now defaults to using native termios input. In turn,
that will restore the paste keystrokes capability.
Reference(s):
commit: 045538e01b4588e33bacc1ac57abc799b6d24d7b
Reported by: sergio <mailbox@sergio.spb.ru>
Bug-Debian: http://bugs.debian.org/663334
Signed-off-by: Jim Warner <james.warner@comcast.net>
2012-03-12 22:42:12 +05:30
|
|
|
|
static const char ws[] = "\b\f\n\r\t\v\x1b\x9b"; // 0x1b + 0x9b are escape
|
2011-03-31 16:45:12 +05:30
|
|
|
|
static char buf[MEDBUFSIZ];
|
top: correct loss of keystrokes paste capability
When top introduced true line input editing, the
ability to paste keystrokes was lost. This remains
a necessary evil so that top has an opportunity to
translate cursor motion keystrokes into terminfo
escapes during line input. Motion keys themselves,
of course, can never be pasted.
If pasting ever became more important than input
editing, then native termios support should have been
available via a define called TERMIOS_ONLY. But a
recent commit, eliminating what was thought to be
obsolete logic, rendered the alternate linein()
function virtually useless.
Similar to top-3.2.8, when native termios input is
functional, these abberations can be experienced:
. cursor motion keys will appear as escapes
. excessive input can cause line wraps
. ^Z during i/p is not be honored until <Enter>
. SIGWINCH during i/p corrupts screen temporarily
In hindsight, it now seems that the ability to paste
keystrokes may indeed outweigh any shortcomings of
native termios support. This is especially true if
one is preparing to search ('L') for some lengthy
process command line contined in the clipboard.
Thus, this patch fixes the alternate linein() function
and changes TERMIOS_ONLY to TERMIO_PROXY so that top
now defaults to using native termios input. In turn,
that will restore the paste keystrokes capability.
Reference(s):
commit: 045538e01b4588e33bacc1ac57abc799b6d24d7b
Reported by: sergio <mailbox@sergio.spb.ru>
Bug-Debian: http://bugs.debian.org/663334
Signed-off-by: Jim Warner <james.warner@comcast.net>
2012-03-12 22:42:12 +05:30
|
|
|
|
char *p;
|
2002-05-30 09:14:46 +05:30
|
|
|
|
|
|
|
|
|
show_pmt(prompt);
|
|
|
|
|
memset(buf, '\0', sizeof(buf));
|
2013-01-16 11:30:00 +05:30
|
|
|
|
ioch(1, buf, sizeof(buf)-1);
|
2002-02-02 04:17:29 +05:30
|
|
|
|
|
top: correct loss of keystrokes paste capability
When top introduced true line input editing, the
ability to paste keystrokes was lost. This remains
a necessary evil so that top has an opportunity to
translate cursor motion keystrokes into terminfo
escapes during line input. Motion keys themselves,
of course, can never be pasted.
If pasting ever became more important than input
editing, then native termios support should have been
available via a define called TERMIOS_ONLY. But a
recent commit, eliminating what was thought to be
obsolete logic, rendered the alternate linein()
function virtually useless.
Similar to top-3.2.8, when native termios input is
functional, these abberations can be experienced:
. cursor motion keys will appear as escapes
. excessive input can cause line wraps
. ^Z during i/p is not be honored until <Enter>
. SIGWINCH during i/p corrupts screen temporarily
In hindsight, it now seems that the ability to paste
keystrokes may indeed outweigh any shortcomings of
native termios support. This is especially true if
one is preparing to search ('L') for some lengthy
process command line contined in the clipboard.
Thus, this patch fixes the alternate linein() function
and changes TERMIOS_ONLY to TERMIO_PROXY so that top
now defaults to using native termios input. In turn,
that will restore the paste keystrokes capability.
Reference(s):
commit: 045538e01b4588e33bacc1ac57abc799b6d24d7b
Reported by: sergio <mailbox@sergio.spb.ru>
Bug-Debian: http://bugs.debian.org/663334
Signed-off-by: Jim Warner <james.warner@comcast.net>
2012-03-12 22:42:12 +05:30
|
|
|
|
if ((p = strpbrk(buf, ws))) *p = '\0';
|
2011-03-31 16:45:12 +05:30
|
|
|
|
// note: we DO produce a vaid 'string'
|
2012-02-11 05:48:18 +05:30
|
|
|
|
return buf;
|
2013-01-16 11:30:00 +05:30
|
|
|
|
} // end: ioline
|
2011-03-31 16:45:12 +05:30
|
|
|
|
|
|
|
|
|
#else
|
|
|
|
|
/*
|
|
|
|
|
* Get line oriented interactive input from the user,
|
2013-02-15 11:30:00 +05:30
|
|
|
|
* going way beyond native tty support by providing:
|
2011-03-31 16:45:12 +05:30
|
|
|
|
* . true line editing, not just destructive backspace
|
2013-02-15 11:30:00 +05:30
|
|
|
|
* . an input limit sensitive to current screen dimensions
|
|
|
|
|
* . ability to recall prior strings for re-input/re-editing */
|
2013-01-16 11:30:00 +05:30
|
|
|
|
static char *ioline (const char *prompt) {
|
2013-02-15 11:30:00 +05:30
|
|
|
|
#define savMAX 50
|
2011-03-31 16:45:12 +05:30
|
|
|
|
// thank goodness memmove allows the two strings to overlap
|
|
|
|
|
#define sqzSTR { memmove(&buf[pos], &buf[pos+1], bufMAX-pos); \
|
|
|
|
|
buf[sizeof(buf)-1] = '\0'; }
|
2011-05-26 15:03:32 +05:30
|
|
|
|
#define expSTR if (len+1 < bufMAX && len+beg+1 < Screen_cols) { \
|
2011-03-31 16:45:12 +05:30
|
|
|
|
memmove(&buf[pos+1], &buf[pos], bufMAX-pos); buf[pos] = ' '; }
|
|
|
|
|
#define logCOL (pos+1)
|
|
|
|
|
#define phyCOL (beg+pos+1)
|
|
|
|
|
#define bufMAX ((int)sizeof(buf)-2) // -1 for '\0' string delimeter
|
|
|
|
|
static char buf[MEDBUFSIZ+1]; // +1 for '\0' string delimeter
|
2013-02-27 11:30:00 +05:30
|
|
|
|
static int ovt;
|
|
|
|
|
int beg, pos, len, key, i;
|
2013-02-15 11:30:00 +05:30
|
|
|
|
struct lin_s {
|
|
|
|
|
struct lin_s *bkw; // ptr to older saved strs
|
|
|
|
|
struct lin_s *fwd; // ptr to newer saved strs
|
|
|
|
|
char *str; // the saved string
|
|
|
|
|
};
|
|
|
|
|
static struct lin_s *anchor, *plin;
|
2011-03-31 16:45:12 +05:30
|
|
|
|
|
2013-02-15 11:30:00 +05:30
|
|
|
|
if (!anchor) {
|
|
|
|
|
anchor = alloc_c(sizeof(struct lin_s));
|
|
|
|
|
anchor->str = alloc_s(""); // top-of-stack == empty str
|
|
|
|
|
}
|
|
|
|
|
plin = anchor;
|
2013-02-27 11:30:00 +05:30
|
|
|
|
pos = 0;
|
2011-03-31 16:45:12 +05:30
|
|
|
|
beg = show_pmt(prompt);
|
|
|
|
|
memset(buf, '\0', sizeof(buf));
|
2013-02-27 11:30:00 +05:30
|
|
|
|
putp(ovt ? Cap_curs_huge : Cap_curs_norm);
|
2013-02-15 11:30:00 +05:30
|
|
|
|
|
2011-03-31 16:45:12 +05:30
|
|
|
|
do {
|
2013-02-15 11:30:00 +05:30
|
|
|
|
fflush(stdout);
|
2011-03-31 16:45:12 +05:30
|
|
|
|
len = strlen(buf);
|
2013-02-15 11:30:00 +05:30
|
|
|
|
key = iokey(2);
|
2013-01-16 11:30:00 +05:30
|
|
|
|
switch (key) {
|
2013-02-22 11:30:00 +05:30
|
|
|
|
case 0:
|
2014-04-27 10:30:00 +05:30
|
|
|
|
buf[0] = '\0';
|
|
|
|
|
return buf;
|
2011-03-31 16:45:12 +05:30
|
|
|
|
case kbd_ESC:
|
2014-04-27 10:30:00 +05:30
|
|
|
|
buf[0] = kbd_ESC;
|
|
|
|
|
return buf;
|
2011-03-31 16:45:12 +05:30
|
|
|
|
case kbd_ENTER:
|
2013-03-01 11:30:00 +05:30
|
|
|
|
continue;
|
2013-02-15 11:30:00 +05:30
|
|
|
|
case kbd_INS:
|
|
|
|
|
ovt = !ovt;
|
|
|
|
|
putp(ovt ? Cap_curs_huge : Cap_curs_norm);
|
|
|
|
|
break;
|
2011-03-31 16:45:12 +05:30
|
|
|
|
case kbd_DEL:
|
|
|
|
|
sqzSTR
|
|
|
|
|
break;
|
|
|
|
|
case kbd_BKSP :
|
|
|
|
|
if (0 < pos) { --pos; sqzSTR }
|
|
|
|
|
break;
|
|
|
|
|
case kbd_LEFT:
|
|
|
|
|
if (0 < pos) --pos;
|
|
|
|
|
break;
|
|
|
|
|
case kbd_RIGHT:
|
|
|
|
|
if (pos < len) ++pos;
|
|
|
|
|
break;
|
|
|
|
|
case kbd_HOME:
|
|
|
|
|
pos = 0;
|
|
|
|
|
break;
|
|
|
|
|
case kbd_END:
|
|
|
|
|
pos = len;
|
|
|
|
|
break;
|
2013-02-15 11:30:00 +05:30
|
|
|
|
case kbd_UP:
|
|
|
|
|
if (plin->bkw) {
|
|
|
|
|
plin = plin->bkw;
|
|
|
|
|
memset(buf, '\0', sizeof(buf));
|
2014-05-07 10:30:00 +05:30
|
|
|
|
pos = snprintf(buf, sizeof(buf), "%.*s", Screen_cols - beg - 1, plin->str);
|
2013-02-15 11:30:00 +05:30
|
|
|
|
}
|
|
|
|
|
break;
|
|
|
|
|
case kbd_DOWN:
|
|
|
|
|
memset(buf, '\0', sizeof(buf));
|
|
|
|
|
if (plin->fwd) plin = plin->fwd;
|
2014-05-07 10:30:00 +05:30
|
|
|
|
pos = snprintf(buf, sizeof(buf), "%.*s", Screen_cols - beg - 1, plin->str);
|
2013-02-15 11:30:00 +05:30
|
|
|
|
break;
|
2011-03-31 16:45:12 +05:30
|
|
|
|
default: // what we REALLY wanted (maybe)
|
2013-02-15 11:30:00 +05:30
|
|
|
|
if (isprint(key) && logCOL < bufMAX && phyCOL < Screen_cols) {
|
|
|
|
|
if (!ovt) expSTR
|
2011-03-31 16:45:12 +05:30
|
|
|
|
buf[pos++] = key;
|
2013-02-15 11:30:00 +05:30
|
|
|
|
}
|
2011-03-31 16:45:12 +05:30
|
|
|
|
break;
|
|
|
|
|
}
|
|
|
|
|
putp(fmtmk("%s%s%s", tg2(beg, Msg_row), Cap_clr_eol, buf));
|
|
|
|
|
putp(tg2(beg+pos, Msg_row));
|
2014-04-27 10:30:00 +05:30
|
|
|
|
} while (key != kbd_ENTER);
|
2011-03-31 16:45:12 +05:30
|
|
|
|
|
2013-02-15 11:30:00 +05:30
|
|
|
|
// weed out duplicates, including empty strings (top-of-stack)...
|
|
|
|
|
for (i = 0, plin = anchor; ; i++) {
|
2013-02-22 11:30:00 +05:30
|
|
|
|
#ifdef RECALL_FIXED
|
|
|
|
|
if (!STRCMP(plin->str, buf)) // if matched, retain original order
|
|
|
|
|
return buf;
|
|
|
|
|
#else
|
|
|
|
|
if (!STRCMP(plin->str, buf)) { // if matched, rearrange stack order
|
|
|
|
|
if (i > 1) { // but not null str or if already #2
|
|
|
|
|
if (plin->bkw) // splice around this matched string
|
|
|
|
|
plin->bkw->fwd = plin->fwd; // if older exists link to newer
|
|
|
|
|
plin->fwd->bkw = plin->bkw; // newer linked to older or NULL
|
|
|
|
|
anchor->bkw->fwd = plin; // stick matched on top of former #2
|
|
|
|
|
plin->bkw = anchor->bkw; // keep empty string at top-of-stack
|
|
|
|
|
plin->fwd = anchor; // then prepare to be the 2nd banana
|
|
|
|
|
anchor->bkw = plin; // by sliding us in below the anchor
|
|
|
|
|
}
|
|
|
|
|
return buf;
|
|
|
|
|
}
|
|
|
|
|
#endif
|
2013-02-15 11:30:00 +05:30
|
|
|
|
if (!plin->bkw) break; // let i equal total stacked strings
|
|
|
|
|
plin = plin->bkw; // ( with plin representing bottom )
|
|
|
|
|
}
|
|
|
|
|
if (i < savMAX)
|
|
|
|
|
plin = alloc_c(sizeof(struct lin_s));
|
|
|
|
|
else { // when a new string causes overflow
|
|
|
|
|
plin->fwd->bkw = NULL; // make next-to-last string new last
|
|
|
|
|
free(plin->str); // and toss copy but keep the struct
|
|
|
|
|
}
|
|
|
|
|
plin->str = alloc_s(buf); // copy user's new unique input line
|
|
|
|
|
plin->bkw = anchor->bkw; // keep empty string as top-of-stack
|
|
|
|
|
if (plin->bkw) // did we have some already stacked?
|
|
|
|
|
plin->bkw->fwd = plin; // yep, so point prior to new string
|
|
|
|
|
plin->fwd = anchor; // and prepare to be a second banana
|
|
|
|
|
anchor->bkw = plin; // by sliding it in as new number 2!
|
|
|
|
|
|
|
|
|
|
return buf; // protect our copy, return original
|
|
|
|
|
#undef savMAX
|
2011-03-31 16:45:12 +05:30
|
|
|
|
#undef sqzSTR
|
|
|
|
|
#undef expSTR
|
|
|
|
|
#undef logCOL
|
|
|
|
|
#undef phyCOL
|
|
|
|
|
#undef bufMAX
|
2013-01-16 11:30:00 +05:30
|
|
|
|
} // end: ioline
|
2011-03-31 16:45:12 +05:30
|
|
|
|
#endif
|
top: add a flexible 'Inspect' capability
This commit introduces an extremely powerful, flexible
brand new capability. Now, users can pause the normal
iterative display and inspect the contents of any file
or output from any script, command, or even pipelines.
It's invoked via the 'Y' interactive command which, in
turn, is supported with simple user supplied additions
as new entries in the top personal configuration file.
A separate new 'Inspect' window supports scrolling and
searching, similar to the main top display. Except it
extends existing 'L'/'&' (locate/locate-next) commands
so that an out-of-view match automatically adjusts the
horizontal position bringing such data into view. And
it provides for multiple successive same line matches.
Also, the basic 'more/less' navigation keys are active
in this new 'Inspect' window, to ease user transition.
There are no program changes required when entries are
added to or deleted from the rcfile. And there are no
known limits to the complexity of a script, command or
pipeline, other than the unidirectional nature imposed
by the 'popen' function call which top cannot violate.
Since it's impossible to predict exactly what contents
will be generated, top treats all output as raw binary
data. Any control characters display in '^C' notation
while all other unprintable characters show as '<AB>'.
The biggest problem encountered was with the find/next
capability since that strstr guy was really diminished
given the possibility that numerous 'strings' could be
encountered *within* many of top's raw, binary 'rows'.
Oh, and another problem was in maintaining the perfect
left & right text justification of this commit message
along with all of the commit summaries. Some of those
summaries (like this very one) are of course, slightly
shorter, to make room for the 'man document' addition.
Enjoy!
Signed-off-by: Jim Warner <james.warner@comcast.net>
2012-11-25 10:30:05 +05:30
|
|
|
|
|
|
|
|
|
|
2014-06-28 10:30:00 +05:30
|
|
|
|
/*
|
2017-08-06 03:30:00 +05:30
|
|
|
|
* Make locale unaware float (but maybe restrict to whole numbers). */
|
2014-06-28 10:30:00 +05:30
|
|
|
|
static int mkfloat (const char *str, float *num, int whole) {
|
2017-08-06 03:30:00 +05:30
|
|
|
|
char tmp[SMLBUFSIZ], *ep;
|
2014-06-28 10:30:00 +05:30
|
|
|
|
|
2017-08-06 03:30:00 +05:30
|
|
|
|
if (whole) {
|
2014-06-28 10:30:00 +05:30
|
|
|
|
*num = (float)strtol(str, &ep, 0);
|
2017-08-06 03:30:00 +05:30
|
|
|
|
if (ep != str && *ep == '\0' && *num < INT_MAX)
|
|
|
|
|
return 1;
|
|
|
|
|
return 0;
|
|
|
|
|
}
|
|
|
|
|
snprintf(tmp, sizeof(tmp), "%s", str);
|
|
|
|
|
*num = strtof(tmp, &ep);
|
|
|
|
|
if (*ep != '\0') {
|
|
|
|
|
// fallback - try to swap the floating point separator
|
|
|
|
|
if (*ep == '.') *ep = ',';
|
|
|
|
|
else if (*ep == ',') *ep = '.';
|
|
|
|
|
*num = strtof(tmp, &ep);
|
|
|
|
|
}
|
|
|
|
|
if (ep != tmp && *ep == '\0' && *num < INT_MAX)
|
2014-06-28 10:30:00 +05:30
|
|
|
|
return 1;
|
|
|
|
|
return 0;
|
|
|
|
|
} // end: mkfloat
|
|
|
|
|
|
|
|
|
|
|
top: add a flexible 'Inspect' capability
This commit introduces an extremely powerful, flexible
brand new capability. Now, users can pause the normal
iterative display and inspect the contents of any file
or output from any script, command, or even pipelines.
It's invoked via the 'Y' interactive command which, in
turn, is supported with simple user supplied additions
as new entries in the top personal configuration file.
A separate new 'Inspect' window supports scrolling and
searching, similar to the main top display. Except it
extends existing 'L'/'&' (locate/locate-next) commands
so that an out-of-view match automatically adjusts the
horizontal position bringing such data into view. And
it provides for multiple successive same line matches.
Also, the basic 'more/less' navigation keys are active
in this new 'Inspect' window, to ease user transition.
There are no program changes required when entries are
added to or deleted from the rcfile. And there are no
known limits to the complexity of a script, command or
pipeline, other than the unidirectional nature imposed
by the 'popen' function call which top cannot violate.
Since it's impossible to predict exactly what contents
will be generated, top treats all output as raw binary
data. Any control characters display in '^C' notation
while all other unprintable characters show as '<AB>'.
The biggest problem encountered was with the find/next
capability since that strstr guy was really diminished
given the possibility that numerous 'strings' could be
encountered *within* many of top's raw, binary 'rows'.
Oh, and another problem was in maintaining the perfect
left & right text justification of this commit message
along with all of the commit summaries. Some of those
summaries (like this very one) are of course, slightly
shorter, to make room for the 'man document' addition.
Enjoy!
Signed-off-by: Jim Warner <james.warner@comcast.net>
2012-11-25 10:30:05 +05:30
|
|
|
|
/*
|
|
|
|
|
* This routine provides the i/o in support of files whose size
|
|
|
|
|
* cannot be determined in advance. Given a stream pointer, he'll
|
|
|
|
|
* try to slurp in the whole thing and return a dynamically acquired
|
|
|
|
|
* buffer supporting that single string glob.
|
|
|
|
|
*
|
|
|
|
|
* He always creates a buffer at least READMINSZ big, possibly
|
|
|
|
|
* all zeros (an empty string), even if the file wasn't read. */
|
2012-11-28 11:30:00 +05:30
|
|
|
|
static int readfile (FILE *fp, char **baddr, size_t *bsize, size_t *bread) {
|
top: add a flexible 'Inspect' capability
This commit introduces an extremely powerful, flexible
brand new capability. Now, users can pause the normal
iterative display and inspect the contents of any file
or output from any script, command, or even pipelines.
It's invoked via the 'Y' interactive command which, in
turn, is supported with simple user supplied additions
as new entries in the top personal configuration file.
A separate new 'Inspect' window supports scrolling and
searching, similar to the main top display. Except it
extends existing 'L'/'&' (locate/locate-next) commands
so that an out-of-view match automatically adjusts the
horizontal position bringing such data into view. And
it provides for multiple successive same line matches.
Also, the basic 'more/less' navigation keys are active
in this new 'Inspect' window, to ease user transition.
There are no program changes required when entries are
added to or deleted from the rcfile. And there are no
known limits to the complexity of a script, command or
pipeline, other than the unidirectional nature imposed
by the 'popen' function call which top cannot violate.
Since it's impossible to predict exactly what contents
will be generated, top treats all output as raw binary
data. Any control characters display in '^C' notation
while all other unprintable characters show as '<AB>'.
The biggest problem encountered was with the find/next
capability since that strstr guy was really diminished
given the possibility that numerous 'strings' could be
encountered *within* many of top's raw, binary 'rows'.
Oh, and another problem was in maintaining the perfect
left & right text justification of this commit message
along with all of the commit summaries. Some of those
summaries (like this very one) are of course, slightly
shorter, to make room for the 'man document' addition.
Enjoy!
Signed-off-by: Jim Warner <james.warner@comcast.net>
2012-11-25 10:30:05 +05:30
|
|
|
|
char chunk[4096*16];
|
|
|
|
|
size_t num;
|
|
|
|
|
|
|
|
|
|
*bread = 0;
|
|
|
|
|
*bsize = READMINSZ;
|
|
|
|
|
*baddr = alloc_c(READMINSZ);
|
|
|
|
|
if (fp) {
|
2013-03-22 10:30:00 +05:30
|
|
|
|
while (0 < (num = fread(chunk, 1, sizeof(chunk), fp))) {
|
top: add a flexible 'Inspect' capability
This commit introduces an extremely powerful, flexible
brand new capability. Now, users can pause the normal
iterative display and inspect the contents of any file
or output from any script, command, or even pipelines.
It's invoked via the 'Y' interactive command which, in
turn, is supported with simple user supplied additions
as new entries in the top personal configuration file.
A separate new 'Inspect' window supports scrolling and
searching, similar to the main top display. Except it
extends existing 'L'/'&' (locate/locate-next) commands
so that an out-of-view match automatically adjusts the
horizontal position bringing such data into view. And
it provides for multiple successive same line matches.
Also, the basic 'more/less' navigation keys are active
in this new 'Inspect' window, to ease user transition.
There are no program changes required when entries are
added to or deleted from the rcfile. And there are no
known limits to the complexity of a script, command or
pipeline, other than the unidirectional nature imposed
by the 'popen' function call which top cannot violate.
Since it's impossible to predict exactly what contents
will be generated, top treats all output as raw binary
data. Any control characters display in '^C' notation
while all other unprintable characters show as '<AB>'.
The biggest problem encountered was with the find/next
capability since that strstr guy was really diminished
given the possibility that numerous 'strings' could be
encountered *within* many of top's raw, binary 'rows'.
Oh, and another problem was in maintaining the perfect
left & right text justification of this commit message
along with all of the commit summaries. Some of those
summaries (like this very one) are of course, slightly
shorter, to make room for the 'man document' addition.
Enjoy!
Signed-off-by: Jim Warner <james.warner@comcast.net>
2012-11-25 10:30:05 +05:30
|
|
|
|
*baddr = alloc_r(*baddr, num + *bsize);
|
|
|
|
|
memcpy(*baddr + *bread, chunk, num);
|
|
|
|
|
*bread += num;
|
|
|
|
|
*bsize += num;
|
|
|
|
|
};
|
2013-03-22 10:30:00 +05:30
|
|
|
|
*(*baddr + *bread) = '\0';
|
top: add a flexible 'Inspect' capability
This commit introduces an extremely powerful, flexible
brand new capability. Now, users can pause the normal
iterative display and inspect the contents of any file
or output from any script, command, or even pipelines.
It's invoked via the 'Y' interactive command which, in
turn, is supported with simple user supplied additions
as new entries in the top personal configuration file.
A separate new 'Inspect' window supports scrolling and
searching, similar to the main top display. Except it
extends existing 'L'/'&' (locate/locate-next) commands
so that an out-of-view match automatically adjusts the
horizontal position bringing such data into view. And
it provides for multiple successive same line matches.
Also, the basic 'more/less' navigation keys are active
in this new 'Inspect' window, to ease user transition.
There are no program changes required when entries are
added to or deleted from the rcfile. And there are no
known limits to the complexity of a script, command or
pipeline, other than the unidirectional nature imposed
by the 'popen' function call which top cannot violate.
Since it's impossible to predict exactly what contents
will be generated, top treats all output as raw binary
data. Any control characters display in '^C' notation
while all other unprintable characters show as '<AB>'.
The biggest problem encountered was with the find/next
capability since that strstr guy was really diminished
given the possibility that numerous 'strings' could be
encountered *within* many of top's raw, binary 'rows'.
Oh, and another problem was in maintaining the perfect
left & right text justification of this commit message
along with all of the commit summaries. Some of those
summaries (like this very one) are of course, slightly
shorter, to make room for the 'man document' addition.
Enjoy!
Signed-off-by: Jim Warner <james.warner@comcast.net>
2012-11-25 10:30:05 +05:30
|
|
|
|
return ferror(fp);
|
|
|
|
|
}
|
|
|
|
|
return ENOENT;
|
|
|
|
|
} // end: readfile
|
2011-03-31 16:45:12 +05:30
|
|
|
|
|
|
|
|
|
/*###### Small Utility routines ########################################*/
|
2002-02-02 04:17:29 +05:30
|
|
|
|
|
2014-04-27 10:30:00 +05:30
|
|
|
|
#define GET_NUM_BAD INT_MIN
|
|
|
|
|
#define GET_NUM_ESC (INT_MIN + 1)
|
|
|
|
|
#define GET_NUM_NOT (INT_MIN + 2)
|
|
|
|
|
|
2011-03-31 16:45:12 +05:30
|
|
|
|
/*
|
|
|
|
|
* Get a float from the user */
|
|
|
|
|
static float get_float (const char *prompt) {
|
2002-05-30 09:14:46 +05:30
|
|
|
|
char *line;
|
|
|
|
|
float f;
|
|
|
|
|
|
2013-03-01 11:30:00 +05:30
|
|
|
|
line = ioline(prompt);
|
2014-04-27 10:30:00 +05:30
|
|
|
|
if (line[0] == kbd_ESC || Frames_signal) return GET_NUM_ESC;
|
|
|
|
|
if (!line[0]) return GET_NUM_NOT;
|
2002-11-08 06:01:28 +05:30
|
|
|
|
// note: we're not allowing negative floats
|
2014-06-28 10:30:00 +05:30
|
|
|
|
if (!mkfloat(line, &f, 0) || f < 0) {
|
2011-10-12 00:32:59 +05:30
|
|
|
|
show_msg(N_txt(BAD_numfloat_txt));
|
2014-04-27 10:30:00 +05:30
|
|
|
|
return GET_NUM_BAD;
|
2002-05-30 09:14:46 +05:30
|
|
|
|
}
|
|
|
|
|
return f;
|
2011-03-31 16:45:12 +05:30
|
|
|
|
} // end: get_float
|
2002-02-02 04:17:29 +05:30
|
|
|
|
|
|
|
|
|
|
2011-03-31 16:45:12 +05:30
|
|
|
|
/*
|
|
|
|
|
* Get an integer from the user, returning INT_MIN for error */
|
|
|
|
|
static int get_int (const char *prompt) {
|
2002-05-30 09:14:46 +05:30
|
|
|
|
char *line;
|
2014-06-28 10:30:00 +05:30
|
|
|
|
float f;
|
2002-05-30 09:14:46 +05:30
|
|
|
|
|
2013-03-01 11:30:00 +05:30
|
|
|
|
line = ioline(prompt);
|
2014-04-27 10:30:00 +05:30
|
|
|
|
if (line[0] == kbd_ESC || Frames_signal) return GET_NUM_ESC;
|
|
|
|
|
if (!line[0]) return GET_NUM_NOT;
|
2002-11-08 06:01:28 +05:30
|
|
|
|
// note: we've got to allow negative ints (renice)
|
2014-06-28 10:30:00 +05:30
|
|
|
|
if (!mkfloat(line, &f, 1)) {
|
2011-10-12 00:32:59 +05:30
|
|
|
|
show_msg(N_txt(BAD_integers_txt));
|
2014-04-27 10:30:00 +05:30
|
|
|
|
return GET_NUM_BAD;
|
2002-05-30 09:14:46 +05:30
|
|
|
|
}
|
2014-06-28 10:30:00 +05:30
|
|
|
|
return (int)f;
|
2011-03-31 16:45:12 +05:30
|
|
|
|
} // end: get_int
|
2002-02-02 04:17:29 +05:30
|
|
|
|
|
|
|
|
|
|
2002-05-30 09:14:46 +05:30
|
|
|
|
/*
|
2012-09-19 11:31:01 +05:30
|
|
|
|
* Make a hex value, and maybe suppress zeroes. */
|
|
|
|
|
static inline const char *hex_make (KLONG num, int noz) {
|
2011-03-31 16:45:12 +05:30
|
|
|
|
static char buf[SMLBUFSIZ];
|
2012-09-19 11:31:01 +05:30
|
|
|
|
int i;
|
2002-02-02 04:17:29 +05:30
|
|
|
|
|
2012-09-19 11:31:01 +05:30
|
|
|
|
#ifdef CASEUP_HEXES
|
|
|
|
|
snprintf(buf, sizeof(buf), "%08" KLF "X", num);
|
2002-05-30 09:14:46 +05:30
|
|
|
|
#else
|
2012-09-19 11:31:01 +05:30
|
|
|
|
snprintf(buf, sizeof(buf), "%08" KLF "x", num);
|
2002-05-30 09:14:46 +05:30
|
|
|
|
#endif
|
2012-09-19 11:31:01 +05:30
|
|
|
|
if (noz)
|
|
|
|
|
for (i = 0; buf[i]; i++)
|
|
|
|
|
if ('0' == buf[i])
|
|
|
|
|
buf[i] = '.';
|
|
|
|
|
return buf;
|
|
|
|
|
} // end: hex_make
|
2002-10-07 01:42:08 +05:30
|
|
|
|
|
2002-12-10 08:31:17 +05:30
|
|
|
|
|
2011-03-31 16:45:12 +05:30
|
|
|
|
/*
|
|
|
|
|
* Validate the passed string as a user name or number,
|
|
|
|
|
* and/or update the window's 'u/U' selection stuff. */
|
|
|
|
|
static const char *user_certify (WIN_t *q, const char *str, char typ) {
|
|
|
|
|
struct passwd *pwd;
|
2002-12-10 08:31:17 +05:30
|
|
|
|
char *endp;
|
2011-03-31 16:45:12 +05:30
|
|
|
|
uid_t num;
|
|
|
|
|
|
|
|
|
|
q->usrseltyp = 0;
|
2013-02-13 11:30:00 +05:30
|
|
|
|
q->usrselflg = 1;
|
2011-03-31 16:45:12 +05:30
|
|
|
|
Monpidsidx = 0;
|
|
|
|
|
if (*str) {
|
2013-02-13 11:30:00 +05:30
|
|
|
|
if ('!' == *str) { ++str; q->usrselflg = 0; }
|
2011-03-31 16:45:12 +05:30
|
|
|
|
num = (uid_t)strtoul(str, &endp, 0);
|
2012-12-18 11:30:00 +05:30
|
|
|
|
if ('\0' == *endp) {
|
2011-03-31 16:45:12 +05:30
|
|
|
|
pwd = getpwuid(num);
|
2012-12-18 11:30:00 +05:30
|
|
|
|
if (!pwd) {
|
|
|
|
|
/* allow foreign users, from e.g within chroot
|
|
|
|
|
( thanks Dr. Werner Fink <werner@suse.de> ) */
|
|
|
|
|
q->usrseluid = num;
|
|
|
|
|
q->usrseltyp = typ;
|
|
|
|
|
return NULL;
|
|
|
|
|
}
|
|
|
|
|
} else
|
2011-03-31 16:45:12 +05:30
|
|
|
|
pwd = getpwnam(str);
|
2011-10-12 00:32:59 +05:30
|
|
|
|
if (!pwd) return N_txt(BAD_username_txt);
|
2011-03-31 16:45:12 +05:30
|
|
|
|
q->usrseluid = pwd->pw_uid;
|
|
|
|
|
q->usrseltyp = typ;
|
2002-12-10 08:31:17 +05:30
|
|
|
|
}
|
2011-03-31 16:45:12 +05:30
|
|
|
|
return NULL;
|
|
|
|
|
} // end: user_certify
|
|
|
|
|
|
2012-09-19 11:31:01 +05:30
|
|
|
|
/*###### Basic Formatting support ######################################*/
|
|
|
|
|
|
|
|
|
|
/*
|
|
|
|
|
* Just do some justify stuff, then add post column padding. */
|
|
|
|
|
static inline const char *justify_pad (const char *str, int width, int justr) {
|
|
|
|
|
static char l_fmt[] = "%-*.*s%s", r_fmt[] = "%*.*s%s";
|
|
|
|
|
static char buf[SCREENMAX];
|
|
|
|
|
|
|
|
|
|
snprintf(buf, sizeof(buf), justr ? r_fmt : l_fmt, width, width, str, COLPADSTR);
|
|
|
|
|
return buf;
|
|
|
|
|
} // end: justify_pad
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
/*
|
|
|
|
|
* Make and then justify a single character. */
|
2012-10-06 01:45:15 +05:30
|
|
|
|
static inline const char *make_chr (const char ch, int width, int justr) {
|
2012-09-19 11:31:01 +05:30
|
|
|
|
static char buf[SMLBUFSIZ];
|
|
|
|
|
|
|
|
|
|
snprintf(buf, sizeof(buf), "%c", ch);
|
|
|
|
|
return justify_pad(buf, width, justr);
|
|
|
|
|
} // end: make_chr
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
/*
|
|
|
|
|
* Make and then justify an integer NOT subject to scaling,
|
|
|
|
|
* and include a visual clue should tuncation be necessary. */
|
2016-04-15 10:30:00 +05:30
|
|
|
|
static inline const char *make_num (long num, int width, int justr, int col, int noz) {
|
2012-09-19 11:31:01 +05:30
|
|
|
|
static char buf[SMLBUFSIZ];
|
|
|
|
|
|
2016-04-15 10:30:00 +05:30
|
|
|
|
buf[0] = '\0';
|
|
|
|
|
if (noz && Rc.zero_suppress && 0 == num)
|
|
|
|
|
goto end_justifies;
|
|
|
|
|
|
2012-10-03 23:43:13 +05:30
|
|
|
|
if (width < snprintf(buf, sizeof(buf), "%ld", num)) {
|
1970-01-01 05:30:00 +05:30
|
|
|
|
if (width <= 0 || (size_t)width >= sizeof(buf))
|
|
|
|
|
width = sizeof(buf)-1;
|
2012-09-19 11:31:01 +05:30
|
|
|
|
buf[width-1] = COLPLUSCH;
|
1970-01-01 05:30:00 +05:30
|
|
|
|
buf[width] = '\0';
|
2012-10-03 23:43:13 +05:30
|
|
|
|
AUTOX_COL(col);
|
|
|
|
|
}
|
2016-04-15 10:30:00 +05:30
|
|
|
|
end_justifies:
|
2012-09-19 11:31:01 +05:30
|
|
|
|
return justify_pad(buf, width, justr);
|
|
|
|
|
} // end: make_num
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
/*
|
|
|
|
|
* Make and then justify a character string,
|
|
|
|
|
* and include a visual clue should tuncation be necessary. */
|
2012-10-06 01:45:15 +05:30
|
|
|
|
static inline const char *make_str (const char *str, int width, int justr, int col) {
|
2012-09-19 11:31:01 +05:30
|
|
|
|
static char buf[SCREENMAX];
|
|
|
|
|
|
2012-10-03 23:43:13 +05:30
|
|
|
|
if (width < snprintf(buf, sizeof(buf), "%s", str)) {
|
1970-01-01 05:30:00 +05:30
|
|
|
|
if (width <= 0 || (size_t)width >= sizeof(buf))
|
|
|
|
|
width = sizeof(buf)-1;
|
2012-09-19 11:31:01 +05:30
|
|
|
|
buf[width-1] = COLPLUSCH;
|
1970-01-01 05:30:00 +05:30
|
|
|
|
buf[width] = '\0';
|
2012-10-03 23:43:13 +05:30
|
|
|
|
AUTOX_COL(col);
|
|
|
|
|
}
|
2012-09-19 11:31:01 +05:30
|
|
|
|
return justify_pad(buf, width, justr);
|
|
|
|
|
} // end: make_str
|
|
|
|
|
|
|
|
|
|
|
2017-09-30 12:52:22 +05:30
|
|
|
|
/*
|
|
|
|
|
* Make and then justify a potentially multi-byte character string,
|
|
|
|
|
* and include a visual clue should tuncation be necessary. */
|
|
|
|
|
static inline const char *make_str_utf8 (const char *str, int width, int justr, int col) {
|
|
|
|
|
static char buf[SCREENMAX];
|
|
|
|
|
int delta = utf8_delta(str);
|
|
|
|
|
|
2018-01-27 11:30:00 +05:30
|
|
|
|
if (width + delta < snprintf(buf, sizeof(buf), "%s", str)) {
|
2018-02-28 11:30:00 +05:30
|
|
|
|
snprintf(buf, sizeof(buf), "%.*s%c", utf8_embody(str, width-1), str, COLPLUSCH);
|
2017-09-30 12:52:22 +05:30
|
|
|
|
delta = utf8_delta(buf);
|
|
|
|
|
AUTOX_COL(col);
|
|
|
|
|
}
|
|
|
|
|
return justify_pad(buf, width + delta, justr);
|
|
|
|
|
} // end: make_str_utf8
|
|
|
|
|
|
|
|
|
|
|
top: provide the means to adjust scaled process memory
This commit is an unrequested outgrowth of the earlier
change dealing with summary area memory field scaling.
That user selectable scaling provision is now extended
to include 6 (at present) task oriented memory fields.
The new companion 'e' (lower case) interactive command
has been added and, like the 'E' command, it can cycle
each of the currently displayed memory columns between
KiB through TiB. There are, however, some differences.
Where '+' indicates summary area truncation at a given
radix, task memory fields are automatically scaled for
their column. Thus, not all rows use the same scaling.
And, while summary area field widths were not changed,
the task memory columns were widened in order to offer
more meaningful data when the radix was increased. The
precision is automatically increased in step with each
radix: MiB displays 2 decimal places, GiB 3 and TiB 4.
To compliment that additional precision, both the %CPU
and %MEM fields were widened by 1 column and now offer
precision up to 3 decimal places. But, unique to %CPU,
widening could already have occurred due to the number
of processors in some massively parallel boxes. At any
rate, total extra width for both memory and percentage
fields could amount to twenty (precious) columns more.
So for both the memory and % fields the original width
(along with loss of precision) can be restored via new
compiler conditionals which this commit also provides.
p.s. and it will be rcfile preserved for any restarts!
(now that we know a '.' + 2 spaces is squeezed to one)
(everything's perfectly justified, but it's just luck)
Reference(s):
http://www.freelists.org/post/procps/top-regression-reports
Signed-off-by: Jim Warner <james.warner@comcast.net>
2012-12-14 11:30:00 +05:30
|
|
|
|
/*
|
|
|
|
|
* Do some scaling then justify stuff.
|
|
|
|
|
* We'll interpret 'num' as a kibibytes quantity and try to
|
|
|
|
|
* format it to reach 'target' while also fitting 'width'. */
|
|
|
|
|
static const char *scale_mem (int target, unsigned long num, int width, int justr) {
|
2012-12-18 11:30:00 +05:30
|
|
|
|
// SK_Kb SK_Mb SK_Gb SK_Tb SK_Pb SK_Eb
|
2017-03-08 11:30:00 +05:30
|
|
|
|
#ifdef BOOST_MEMORY
|
2012-12-18 11:30:00 +05:30
|
|
|
|
static const char *fmttab[] = { "%.0f", "%#.1f%c", "%#.3f%c", "%#.3f%c", "%#.3f%c", NULL };
|
top: provide the means to adjust scaled process memory
This commit is an unrequested outgrowth of the earlier
change dealing with summary area memory field scaling.
That user selectable scaling provision is now extended
to include 6 (at present) task oriented memory fields.
The new companion 'e' (lower case) interactive command
has been added and, like the 'E' command, it can cycle
each of the currently displayed memory columns between
KiB through TiB. There are, however, some differences.
Where '+' indicates summary area truncation at a given
radix, task memory fields are automatically scaled for
their column. Thus, not all rows use the same scaling.
And, while summary area field widths were not changed,
the task memory columns were widened in order to offer
more meaningful data when the radix was increased. The
precision is automatically increased in step with each
radix: MiB displays 2 decimal places, GiB 3 and TiB 4.
To compliment that additional precision, both the %CPU
and %MEM fields were widened by 1 column and now offer
precision up to 3 decimal places. But, unique to %CPU,
widening could already have occurred due to the number
of processors in some massively parallel boxes. At any
rate, total extra width for both memory and percentage
fields could amount to twenty (precious) columns more.
So for both the memory and % fields the original width
(along with loss of precision) can be restored via new
compiler conditionals which this commit also provides.
p.s. and it will be rcfile preserved for any restarts!
(now that we know a '.' + 2 spaces is squeezed to one)
(everything's perfectly justified, but it's just luck)
Reference(s):
http://www.freelists.org/post/procps/top-regression-reports
Signed-off-by: Jim Warner <james.warner@comcast.net>
2012-12-14 11:30:00 +05:30
|
|
|
|
#else
|
2017-03-08 11:30:00 +05:30
|
|
|
|
static const char *fmttab[] = { "%.0f", "%.1f%c", "%.1f%c", "%.1f%c", "%.1f%c", NULL };
|
top: provide the means to adjust scaled process memory
This commit is an unrequested outgrowth of the earlier
change dealing with summary area memory field scaling.
That user selectable scaling provision is now extended
to include 6 (at present) task oriented memory fields.
The new companion 'e' (lower case) interactive command
has been added and, like the 'E' command, it can cycle
each of the currently displayed memory columns between
KiB through TiB. There are, however, some differences.
Where '+' indicates summary area truncation at a given
radix, task memory fields are automatically scaled for
their column. Thus, not all rows use the same scaling.
And, while summary area field widths were not changed,
the task memory columns were widened in order to offer
more meaningful data when the radix was increased. The
precision is automatically increased in step with each
radix: MiB displays 2 decimal places, GiB 3 and TiB 4.
To compliment that additional precision, both the %CPU
and %MEM fields were widened by 1 column and now offer
precision up to 3 decimal places. But, unique to %CPU,
widening could already have occurred due to the number
of processors in some massively parallel boxes. At any
rate, total extra width for both memory and percentage
fields could amount to twenty (precious) columns more.
So for both the memory and % fields the original width
(along with loss of precision) can be restored via new
compiler conditionals which this commit also provides.
p.s. and it will be rcfile preserved for any restarts!
(now that we know a '.' + 2 spaces is squeezed to one)
(everything's perfectly justified, but it's just luck)
Reference(s):
http://www.freelists.org/post/procps/top-regression-reports
Signed-off-by: Jim Warner <james.warner@comcast.net>
2012-12-14 11:30:00 +05:30
|
|
|
|
#endif
|
|
|
|
|
static char buf[SMLBUFSIZ];
|
|
|
|
|
float scaled_num;
|
|
|
|
|
char *psfx;
|
|
|
|
|
int i;
|
|
|
|
|
|
|
|
|
|
buf[0] = '\0';
|
|
|
|
|
if (Rc.zero_suppress && 0 >= num)
|
|
|
|
|
goto end_justifies;
|
|
|
|
|
|
|
|
|
|
scaled_num = num;
|
2012-12-18 11:30:00 +05:30
|
|
|
|
for (i = SK_Kb, psfx = Scaled_sfxtab; i < SK_Eb; psfx++, i++) {
|
top: provide the means to adjust scaled process memory
This commit is an unrequested outgrowth of the earlier
change dealing with summary area memory field scaling.
That user selectable scaling provision is now extended
to include 6 (at present) task oriented memory fields.
The new companion 'e' (lower case) interactive command
has been added and, like the 'E' command, it can cycle
each of the currently displayed memory columns between
KiB through TiB. There are, however, some differences.
Where '+' indicates summary area truncation at a given
radix, task memory fields are automatically scaled for
their column. Thus, not all rows use the same scaling.
And, while summary area field widths were not changed,
the task memory columns were widened in order to offer
more meaningful data when the radix was increased. The
precision is automatically increased in step with each
radix: MiB displays 2 decimal places, GiB 3 and TiB 4.
To compliment that additional precision, both the %CPU
and %MEM fields were widened by 1 column and now offer
precision up to 3 decimal places. But, unique to %CPU,
widening could already have occurred due to the number
of processors in some massively parallel boxes. At any
rate, total extra width for both memory and percentage
fields could amount to twenty (precious) columns more.
So for both the memory and % fields the original width
(along with loss of precision) can be restored via new
compiler conditionals which this commit also provides.
p.s. and it will be rcfile preserved for any restarts!
(now that we know a '.' + 2 spaces is squeezed to one)
(everything's perfectly justified, but it's just luck)
Reference(s):
http://www.freelists.org/post/procps/top-regression-reports
Signed-off-by: Jim Warner <james.warner@comcast.net>
2012-12-14 11:30:00 +05:30
|
|
|
|
if (i >= target
|
|
|
|
|
&& (width >= snprintf(buf, sizeof(buf), fmttab[i], scaled_num, *psfx)))
|
|
|
|
|
goto end_justifies;
|
|
|
|
|
scaled_num /= 1024.0;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
// well shoot, this outta' fit...
|
|
|
|
|
snprintf(buf, sizeof(buf), "?");
|
|
|
|
|
end_justifies:
|
|
|
|
|
return justify_pad(buf, width, justr);
|
|
|
|
|
} // end: scale_mem
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
/*
|
|
|
|
|
* Do some scaling then justify stuff. */
|
|
|
|
|
static const char *scale_num (unsigned long num, int width, int justr) {
|
|
|
|
|
static char buf[SMLBUFSIZ];
|
|
|
|
|
float scaled_num;
|
|
|
|
|
char *psfx;
|
|
|
|
|
|
|
|
|
|
buf[0] = '\0';
|
|
|
|
|
if (Rc.zero_suppress && 0 >= num)
|
|
|
|
|
goto end_justifies;
|
|
|
|
|
if (width >= snprintf(buf, sizeof(buf), "%lu", num))
|
|
|
|
|
goto end_justifies;
|
|
|
|
|
|
|
|
|
|
scaled_num = num;
|
|
|
|
|
for (psfx = Scaled_sfxtab; 0 < *psfx; psfx++) {
|
|
|
|
|
scaled_num /= 1024.0;
|
|
|
|
|
if (width >= snprintf(buf, sizeof(buf), "%.1f%c", scaled_num, *psfx))
|
|
|
|
|
goto end_justifies;
|
|
|
|
|
if (width >= snprintf(buf, sizeof(buf), "%.0f%c", scaled_num, *psfx))
|
|
|
|
|
goto end_justifies;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
// well shoot, this outta' fit...
|
|
|
|
|
snprintf(buf, sizeof(buf), "?");
|
|
|
|
|
end_justifies:
|
|
|
|
|
return justify_pad(buf, width, justr);
|
|
|
|
|
} // end: scale_num
|
|
|
|
|
|
|
|
|
|
|
2012-09-19 11:31:01 +05:30
|
|
|
|
/*
|
|
|
|
|
* Make and then justify a percentage, with decreasing precision. */
|
top: provide the means to adjust scaled process memory
This commit is an unrequested outgrowth of the earlier
change dealing with summary area memory field scaling.
That user selectable scaling provision is now extended
to include 6 (at present) task oriented memory fields.
The new companion 'e' (lower case) interactive command
has been added and, like the 'E' command, it can cycle
each of the currently displayed memory columns between
KiB through TiB. There are, however, some differences.
Where '+' indicates summary area truncation at a given
radix, task memory fields are automatically scaled for
their column. Thus, not all rows use the same scaling.
And, while summary area field widths were not changed,
the task memory columns were widened in order to offer
more meaningful data when the radix was increased. The
precision is automatically increased in step with each
radix: MiB displays 2 decimal places, GiB 3 and TiB 4.
To compliment that additional precision, both the %CPU
and %MEM fields were widened by 1 column and now offer
precision up to 3 decimal places. But, unique to %CPU,
widening could already have occurred due to the number
of processors in some massively parallel boxes. At any
rate, total extra width for both memory and percentage
fields could amount to twenty (precious) columns more.
So for both the memory and % fields the original width
(along with loss of precision) can be restored via new
compiler conditionals which this commit also provides.
p.s. and it will be rcfile preserved for any restarts!
(now that we know a '.' + 2 spaces is squeezed to one)
(everything's perfectly justified, but it's just luck)
Reference(s):
http://www.freelists.org/post/procps/top-regression-reports
Signed-off-by: Jim Warner <james.warner@comcast.net>
2012-12-14 11:30:00 +05:30
|
|
|
|
static const char *scale_pcnt (float num, int width, int justr) {
|
2012-09-19 11:31:01 +05:30
|
|
|
|
static char buf[SMLBUFSIZ];
|
|
|
|
|
|
top: provide the means to adjust scaled process memory
This commit is an unrequested outgrowth of the earlier
change dealing with summary area memory field scaling.
That user selectable scaling provision is now extended
to include 6 (at present) task oriented memory fields.
The new companion 'e' (lower case) interactive command
has been added and, like the 'E' command, it can cycle
each of the currently displayed memory columns between
KiB through TiB. There are, however, some differences.
Where '+' indicates summary area truncation at a given
radix, task memory fields are automatically scaled for
their column. Thus, not all rows use the same scaling.
And, while summary area field widths were not changed,
the task memory columns were widened in order to offer
more meaningful data when the radix was increased. The
precision is automatically increased in step with each
radix: MiB displays 2 decimal places, GiB 3 and TiB 4.
To compliment that additional precision, both the %CPU
and %MEM fields were widened by 1 column and now offer
precision up to 3 decimal places. But, unique to %CPU,
widening could already have occurred due to the number
of processors in some massively parallel boxes. At any
rate, total extra width for both memory and percentage
fields could amount to twenty (precious) columns more.
So for both the memory and % fields the original width
(along with loss of precision) can be restored via new
compiler conditionals which this commit also provides.
p.s. and it will be rcfile preserved for any restarts!
(now that we know a '.' + 2 spaces is squeezed to one)
(everything's perfectly justified, but it's just luck)
Reference(s):
http://www.freelists.org/post/procps/top-regression-reports
Signed-off-by: Jim Warner <james.warner@comcast.net>
2012-12-14 11:30:00 +05:30
|
|
|
|
buf[0] = '\0';
|
|
|
|
|
if (Rc.zero_suppress && 0 >= num)
|
|
|
|
|
goto end_justifies;
|
2013-05-14 10:30:00 +05:30
|
|
|
|
#ifdef BOOST_PERCNT
|
2012-09-19 11:31:01 +05:30
|
|
|
|
if (width >= snprintf(buf, sizeof(buf), "%#.3f", num))
|
|
|
|
|
goto end_justifies;
|
|
|
|
|
if (width >= snprintf(buf, sizeof(buf), "%#.2f", num))
|
|
|
|
|
goto end_justifies;
|
|
|
|
|
#endif
|
|
|
|
|
if (width >= snprintf(buf, sizeof(buf), "%#.1f", num))
|
|
|
|
|
goto end_justifies;
|
|
|
|
|
if (width >= snprintf(buf, sizeof(buf), "%*.0f", width, num))
|
|
|
|
|
goto end_justifies;
|
|
|
|
|
|
|
|
|
|
// well shoot, this outta' fit...
|
|
|
|
|
snprintf(buf, sizeof(buf), "?");
|
|
|
|
|
end_justifies:
|
|
|
|
|
return justify_pad(buf, width, justr);
|
|
|
|
|
} // end: scale_pcnt
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
/*
|
|
|
|
|
* Do some scaling stuff.
|
|
|
|
|
* Format 'tics' to fit 'width', then justify it. */
|
|
|
|
|
static const char *scale_tics (TIC_t tics, int width, int justr) {
|
|
|
|
|
#ifdef CASEUP_SUFIX
|
|
|
|
|
#define HH "%uH" // nls_maybe
|
|
|
|
|
#define DD "%uD"
|
|
|
|
|
#define WW "%uW"
|
|
|
|
|
#else
|
|
|
|
|
#define HH "%uh" // nls_maybe
|
|
|
|
|
#define DD "%ud"
|
|
|
|
|
#define WW "%uw"
|
|
|
|
|
#endif
|
|
|
|
|
static char buf[SMLBUFSIZ];
|
|
|
|
|
unsigned long nt; // narrow time, for speed on 32-bit
|
|
|
|
|
unsigned cc; // centiseconds
|
|
|
|
|
unsigned nn; // multi-purpose whatever
|
|
|
|
|
|
top: provide the means to adjust scaled process memory
This commit is an unrequested outgrowth of the earlier
change dealing with summary area memory field scaling.
That user selectable scaling provision is now extended
to include 6 (at present) task oriented memory fields.
The new companion 'e' (lower case) interactive command
has been added and, like the 'E' command, it can cycle
each of the currently displayed memory columns between
KiB through TiB. There are, however, some differences.
Where '+' indicates summary area truncation at a given
radix, task memory fields are automatically scaled for
their column. Thus, not all rows use the same scaling.
And, while summary area field widths were not changed,
the task memory columns were widened in order to offer
more meaningful data when the radix was increased. The
precision is automatically increased in step with each
radix: MiB displays 2 decimal places, GiB 3 and TiB 4.
To compliment that additional precision, both the %CPU
and %MEM fields were widened by 1 column and now offer
precision up to 3 decimal places. But, unique to %CPU,
widening could already have occurred due to the number
of processors in some massively parallel boxes. At any
rate, total extra width for both memory and percentage
fields could amount to twenty (precious) columns more.
So for both the memory and % fields the original width
(along with loss of precision) can be restored via new
compiler conditionals which this commit also provides.
p.s. and it will be rcfile preserved for any restarts!
(now that we know a '.' + 2 spaces is squeezed to one)
(everything's perfectly justified, but it's just luck)
Reference(s):
http://www.freelists.org/post/procps/top-regression-reports
Signed-off-by: Jim Warner <james.warner@comcast.net>
2012-12-14 11:30:00 +05:30
|
|
|
|
buf[0] = '\0';
|
2012-09-19 11:31:01 +05:30
|
|
|
|
nt = (tics * 100ull) / Hertz; // up to 68 weeks of cpu time
|
top: provide the means to adjust scaled process memory
This commit is an unrequested outgrowth of the earlier
change dealing with summary area memory field scaling.
That user selectable scaling provision is now extended
to include 6 (at present) task oriented memory fields.
The new companion 'e' (lower case) interactive command
has been added and, like the 'E' command, it can cycle
each of the currently displayed memory columns between
KiB through TiB. There are, however, some differences.
Where '+' indicates summary area truncation at a given
radix, task memory fields are automatically scaled for
their column. Thus, not all rows use the same scaling.
And, while summary area field widths were not changed,
the task memory columns were widened in order to offer
more meaningful data when the radix was increased. The
precision is automatically increased in step with each
radix: MiB displays 2 decimal places, GiB 3 and TiB 4.
To compliment that additional precision, both the %CPU
and %MEM fields were widened by 1 column and now offer
precision up to 3 decimal places. But, unique to %CPU,
widening could already have occurred due to the number
of processors in some massively parallel boxes. At any
rate, total extra width for both memory and percentage
fields could amount to twenty (precious) columns more.
So for both the memory and % fields the original width
(along with loss of precision) can be restored via new
compiler conditionals which this commit also provides.
p.s. and it will be rcfile preserved for any restarts!
(now that we know a '.' + 2 spaces is squeezed to one)
(everything's perfectly justified, but it's just luck)
Reference(s):
http://www.freelists.org/post/procps/top-regression-reports
Signed-off-by: Jim Warner <james.warner@comcast.net>
2012-12-14 11:30:00 +05:30
|
|
|
|
if (Rc.zero_suppress && 0 >= nt)
|
|
|
|
|
goto end_justifies;
|
2012-09-19 11:31:01 +05:30
|
|
|
|
cc = nt % 100; // centiseconds past second
|
|
|
|
|
nt /= 100; // total seconds
|
|
|
|
|
nn = nt % 60; // seconds past the minute
|
|
|
|
|
nt /= 60; // total minutes
|
|
|
|
|
if (width >= snprintf(buf, sizeof(buf), "%lu:%02u.%02u", nt, nn, cc))
|
|
|
|
|
goto end_justifies;
|
|
|
|
|
if (width >= snprintf(buf, sizeof(buf), "%lu:%02u", nt, nn))
|
|
|
|
|
goto end_justifies;
|
|
|
|
|
nn = nt % 60; // minutes past the hour
|
|
|
|
|
nt /= 60; // total hours
|
|
|
|
|
if (width >= snprintf(buf, sizeof(buf), "%lu,%02u", nt, nn))
|
|
|
|
|
goto end_justifies;
|
|
|
|
|
nn = nt; // now also hours
|
|
|
|
|
if (width >= snprintf(buf, sizeof(buf), HH, nn))
|
|
|
|
|
goto end_justifies;
|
|
|
|
|
nn /= 24; // now days
|
|
|
|
|
if (width >= snprintf(buf, sizeof(buf), DD, nn))
|
|
|
|
|
goto end_justifies;
|
|
|
|
|
nn /= 7; // now weeks
|
|
|
|
|
if (width >= snprintf(buf, sizeof(buf), WW, nn))
|
|
|
|
|
goto end_justifies;
|
|
|
|
|
|
|
|
|
|
// well shoot, this outta' fit...
|
|
|
|
|
snprintf(buf, sizeof(buf), "?");
|
|
|
|
|
end_justifies:
|
|
|
|
|
return justify_pad(buf, width, justr);
|
|
|
|
|
#undef HH
|
|
|
|
|
#undef DD
|
|
|
|
|
#undef WW
|
|
|
|
|
} // end: scale_tics
|
|
|
|
|
|
2011-03-31 16:45:12 +05:30
|
|
|
|
/*###### Fields Management support #####################################*/
|
2002-05-30 09:14:46 +05:30
|
|
|
|
|
2011-03-31 16:45:12 +05:30
|
|
|
|
/* These are the Fieldstab.lflg values used here and in calibrate_fields.
|
|
|
|
|
(own identifiers as documentation and protection against changes) */
|
|
|
|
|
#define L_stat PROC_FILLSTAT
|
|
|
|
|
#define L_statm PROC_FILLMEM
|
|
|
|
|
#define L_status PROC_FILLSTATUS
|
2011-05-05 15:37:25 +05:30
|
|
|
|
#define L_CGROUP PROC_EDITCGRPCVT | PROC_FILLCGROUP
|
2011-05-18 14:03:44 +05:30
|
|
|
|
#define L_CMDLINE PROC_EDITCMDLCVT | PROC_FILLARG
|
2012-07-01 10:30:22 +05:30
|
|
|
|
#define L_ENVIRON PROC_EDITENVRCVT | PROC_FILLENV
|
2011-03-31 16:45:12 +05:30
|
|
|
|
#define L_EUSER PROC_FILLUSR
|
|
|
|
|
#define L_OUSER PROC_FILLSTATUS | PROC_FILLUSR
|
|
|
|
|
#define L_EGROUP PROC_FILLSTATUS | PROC_FILLGRP
|
2011-08-01 16:58:46 +05:30
|
|
|
|
#define L_SUPGRP PROC_FILLSTATUS | PROC_FILLSUPGRP
|
2013-11-11 11:30:00 +05:30
|
|
|
|
#define L_NS PROC_FILLNS
|
2015-06-13 10:30:00 +05:30
|
|
|
|
#define L_LXC PROC_FILL_LXC
|
2016-06-02 10:30:00 +05:30
|
|
|
|
#define L_OOM PROC_FILLOOM
|
2011-03-31 16:45:12 +05:30
|
|
|
|
// make 'none' non-zero (used to be important to Frames_libflags)
|
|
|
|
|
#define L_NONE PROC_SPARE_1
|
2016-11-23 21:41:11 +05:30
|
|
|
|
// from 'status' or 'stat' (favor stat), via bits not otherwise used
|
2011-03-31 16:45:12 +05:30
|
|
|
|
#define L_EITHER PROC_SPARE_2
|
|
|
|
|
// for calibrate_fields and summary_show 1st pass
|
|
|
|
|
#define L_DEFAULT PROC_FILLSTAT
|
2002-05-30 09:14:46 +05:30
|
|
|
|
|
2011-03-31 16:45:12 +05:30
|
|
|
|
/* These are our gosh darn 'Fields' !
|
2012-09-19 11:31:01 +05:30
|
|
|
|
They MUST be kept in sync with pflags !! */
|
2011-03-31 16:45:12 +05:30
|
|
|
|
static FLD_t Fieldstab[] = {
|
|
|
|
|
// a temporary macro, soon to be undef'd...
|
|
|
|
|
#define SF(f) (QFP_t)SCB_NAME(f)
|
2012-09-20 11:31:01 +05:30
|
|
|
|
// these identifiers reflect the default column alignment but they really
|
|
|
|
|
// contain the WIN_t flag used to check/change justification at run-time!
|
|
|
|
|
#define A_left Show_JRSTRS /* toggled with lower case 'j' */
|
2018-07-04 10:30:00 +05:30
|
|
|
|
#define A_right Show_JRNUMS /* toggled with upper case 'J' */
|
2011-03-31 16:45:12 +05:30
|
|
|
|
|
2012-09-19 11:31:01 +05:30
|
|
|
|
/* .width anomalies:
|
2012-10-03 23:43:13 +05:30
|
|
|
|
a -1 width represents variable width columns
|
|
|
|
|
a 0 width represents columns set once at startup (see zap_fieldstab)
|
2012-06-30 10:30:55 +05:30
|
|
|
|
.lflg anomalies:
|
2014-02-25 11:30:00 +05:30
|
|
|
|
EU_UED, L_NONE - natural outgrowth of 'stat()' in readproc (euid)
|
|
|
|
|
EU_CPU, L_stat - never filled by libproc, but requires times (pcpu)
|
|
|
|
|
EU_CMD, L_stat - may yet require L_CMDLINE in calibrate_fields (cmd/cmdline)
|
2016-09-13 02:46:16 +05:30
|
|
|
|
L_EITHER - favor L_stat (L_status == ++cost of gpref & hash scheme)
|
2012-09-19 12:32:02 +05:30
|
|
|
|
|
|
|
|
|
.width .scale .align .sort .lflg
|
|
|
|
|
------ ------ -------- -------- -------- */
|
|
|
|
|
{ 0, -1, A_right, SF(PID), L_NONE },
|
|
|
|
|
{ 0, -1, A_right, SF(PPD), L_EITHER },
|
|
|
|
|
{ 5, -1, A_right, SF(UED), L_NONE },
|
|
|
|
|
{ 8, -1, A_left, SF(UEN), L_EUSER },
|
|
|
|
|
{ 5, -1, A_right, SF(URD), L_status },
|
|
|
|
|
{ 8, -1, A_left, SF(URN), L_OUSER },
|
|
|
|
|
{ 5, -1, A_right, SF(USD), L_status },
|
|
|
|
|
{ 8, -1, A_left, SF(USN), L_OUSER },
|
|
|
|
|
{ 5, -1, A_right, SF(GID), L_NONE },
|
|
|
|
|
{ 8, -1, A_left, SF(GRP), L_EGROUP },
|
|
|
|
|
{ 0, -1, A_right, SF(PGD), L_stat },
|
|
|
|
|
{ 8, -1, A_left, SF(TTY), L_stat },
|
|
|
|
|
{ 0, -1, A_right, SF(TPG), L_stat },
|
|
|
|
|
{ 0, -1, A_right, SF(SID), L_stat },
|
|
|
|
|
{ 3, -1, A_right, SF(PRI), L_stat },
|
|
|
|
|
{ 3, -1, A_right, SF(NCE), L_stat },
|
|
|
|
|
{ 3, -1, A_right, SF(THD), L_EITHER },
|
|
|
|
|
{ 0, -1, A_right, SF(CPN), L_stat },
|
2018-01-22 11:30:00 +05:30
|
|
|
|
{ 5, -1, A_right, SF(CPU), L_stat },
|
2012-09-19 12:32:02 +05:30
|
|
|
|
{ 6, -1, A_right, SF(TME), L_stat },
|
2014-02-25 11:30:00 +05:30
|
|
|
|
{ 9, -1, A_right, SF(TME), L_stat }, // EU_TM2 slot
|
2016-08-20 10:30:00 +05:30
|
|
|
|
{ 5, -1, A_right, SF(RES), L_statm }, // EU_MEM slot
|
2012-12-18 11:30:00 +05:30
|
|
|
|
{ 7, SK_Kb, A_right, SF(VRT), L_statm },
|
|
|
|
|
{ 6, SK_Kb, A_right, SF(SWP), L_status },
|
2016-08-20 10:30:00 +05:30
|
|
|
|
{ 6, SK_Kb, A_right, SF(RES), L_statm },
|
2012-12-18 11:30:00 +05:30
|
|
|
|
{ 6, SK_Kb, A_right, SF(COD), L_statm },
|
top: provide the means to adjust scaled process memory
This commit is an unrequested outgrowth of the earlier
change dealing with summary area memory field scaling.
That user selectable scaling provision is now extended
to include 6 (at present) task oriented memory fields.
The new companion 'e' (lower case) interactive command
has been added and, like the 'E' command, it can cycle
each of the currently displayed memory columns between
KiB through TiB. There are, however, some differences.
Where '+' indicates summary area truncation at a given
radix, task memory fields are automatically scaled for
their column. Thus, not all rows use the same scaling.
And, while summary area field widths were not changed,
the task memory columns were widened in order to offer
more meaningful data when the radix was increased. The
precision is automatically increased in step with each
radix: MiB displays 2 decimal places, GiB 3 and TiB 4.
To compliment that additional precision, both the %CPU
and %MEM fields were widened by 1 column and now offer
precision up to 3 decimal places. But, unique to %CPU,
widening could already have occurred due to the number
of processors in some massively parallel boxes. At any
rate, total extra width for both memory and percentage
fields could amount to twenty (precious) columns more.
So for both the memory and % fields the original width
(along with loss of precision) can be restored via new
compiler conditionals which this commit also provides.
p.s. and it will be rcfile preserved for any restarts!
(now that we know a '.' + 2 spaces is squeezed to one)
(everything's perfectly justified, but it's just luck)
Reference(s):
http://www.freelists.org/post/procps/top-regression-reports
Signed-off-by: Jim Warner <james.warner@comcast.net>
2012-12-14 11:30:00 +05:30
|
|
|
|
{ 7, SK_Kb, A_right, SF(DAT), L_statm },
|
2012-12-18 11:30:00 +05:30
|
|
|
|
{ 6, SK_Kb, A_right, SF(SHR), L_statm },
|
top: provide the means to adjust scaled process memory
This commit is an unrequested outgrowth of the earlier
change dealing with summary area memory field scaling.
That user selectable scaling provision is now extended
to include 6 (at present) task oriented memory fields.
The new companion 'e' (lower case) interactive command
has been added and, like the 'E' command, it can cycle
each of the currently displayed memory columns between
KiB through TiB. There are, however, some differences.
Where '+' indicates summary area truncation at a given
radix, task memory fields are automatically scaled for
their column. Thus, not all rows use the same scaling.
And, while summary area field widths were not changed,
the task memory columns were widened in order to offer
more meaningful data when the radix was increased. The
precision is automatically increased in step with each
radix: MiB displays 2 decimal places, GiB 3 and TiB 4.
To compliment that additional precision, both the %CPU
and %MEM fields were widened by 1 column and now offer
precision up to 3 decimal places. But, unique to %CPU,
widening could already have occurred due to the number
of processors in some massively parallel boxes. At any
rate, total extra width for both memory and percentage
fields could amount to twenty (precious) columns more.
So for both the memory and % fields the original width
(along with loss of precision) can be restored via new
compiler conditionals which this commit also provides.
p.s. and it will be rcfile preserved for any restarts!
(now that we know a '.' + 2 spaces is squeezed to one)
(everything's perfectly justified, but it's just luck)
Reference(s):
http://www.freelists.org/post/procps/top-regression-reports
Signed-off-by: Jim Warner <james.warner@comcast.net>
2012-12-14 11:30:00 +05:30
|
|
|
|
{ 4, -1, A_right, SF(FL1), L_stat },
|
|
|
|
|
{ 4, -1, A_right, SF(FL2), L_stat },
|
|
|
|
|
{ 4, -1, A_right, SF(DRT), L_statm },
|
2012-09-19 12:32:02 +05:30
|
|
|
|
{ 1, -1, A_right, SF(STA), L_EITHER },
|
|
|
|
|
{ -1, -1, A_left, SF(CMD), L_EITHER },
|
2012-09-25 12:32:02 +05:30
|
|
|
|
{ 10, -1, A_left, SF(WCH), L_stat },
|
2012-09-19 12:32:02 +05:30
|
|
|
|
{ 8, -1, A_left, SF(FLG), L_stat },
|
|
|
|
|
{ -1, -1, A_left, SF(CGR), L_CGROUP },
|
|
|
|
|
{ -1, -1, A_left, SF(SGD), L_status },
|
|
|
|
|
{ -1, -1, A_left, SF(SGN), L_SUPGRP },
|
2016-08-20 10:30:00 +05:30
|
|
|
|
{ 0, -1, A_right, SF(TGD), L_NONE },
|
2016-06-02 10:30:00 +05:30
|
|
|
|
{ 5, -1, A_right, SF(OOA), L_OOM },
|
|
|
|
|
{ 4, -1, A_right, SF(OOM), L_OOM },
|
2012-09-19 12:32:02 +05:30
|
|
|
|
{ -1, -1, A_left, SF(ENV), L_ENVIRON },
|
top: provide the means to adjust scaled process memory
This commit is an unrequested outgrowth of the earlier
change dealing with summary area memory field scaling.
That user selectable scaling provision is now extended
to include 6 (at present) task oriented memory fields.
The new companion 'e' (lower case) interactive command
has been added and, like the 'E' command, it can cycle
each of the currently displayed memory columns between
KiB through TiB. There are, however, some differences.
Where '+' indicates summary area truncation at a given
radix, task memory fields are automatically scaled for
their column. Thus, not all rows use the same scaling.
And, while summary area field widths were not changed,
the task memory columns were widened in order to offer
more meaningful data when the radix was increased. The
precision is automatically increased in step with each
radix: MiB displays 2 decimal places, GiB 3 and TiB 4.
To compliment that additional precision, both the %CPU
and %MEM fields were widened by 1 column and now offer
precision up to 3 decimal places. But, unique to %CPU,
widening could already have occurred due to the number
of processors in some massively parallel boxes. At any
rate, total extra width for both memory and percentage
fields could amount to twenty (precious) columns more.
So for both the memory and % fields the original width
(along with loss of precision) can be restored via new
compiler conditionals which this commit also provides.
p.s. and it will be rcfile preserved for any restarts!
(now that we know a '.' + 2 spaces is squeezed to one)
(everything's perfectly justified, but it's just luck)
Reference(s):
http://www.freelists.org/post/procps/top-regression-reports
Signed-off-by: Jim Warner <james.warner@comcast.net>
2012-12-14 11:30:00 +05:30
|
|
|
|
{ 3, -1, A_right, SF(FV1), L_stat },
|
2013-02-28 11:30:00 +05:30
|
|
|
|
{ 3, -1, A_right, SF(FV2), L_stat },
|
2015-07-31 10:30:00 +05:30
|
|
|
|
{ 6, SK_Kb, A_right, SF(USE), L_status },
|
2013-11-11 11:30:00 +05:30
|
|
|
|
{ 10, -1, A_right, SF(NS1), L_NS }, // IPCNS
|
|
|
|
|
{ 10, -1, A_right, SF(NS2), L_NS }, // MNTNS
|
|
|
|
|
{ 10, -1, A_right, SF(NS3), L_NS }, // NETNS
|
|
|
|
|
{ 10, -1, A_right, SF(NS4), L_NS }, // PIDNS
|
|
|
|
|
{ 10, -1, A_right, SF(NS5), L_NS }, // USERNS
|
2015-06-13 10:30:00 +05:30
|
|
|
|
{ 10, -1, A_right, SF(NS6), L_NS }, // UTSNS
|
2016-04-13 10:30:00 +05:30
|
|
|
|
{ 8, -1, A_left, SF(LXC), L_LXC },
|
|
|
|
|
{ 6, SK_Kb, A_right, SF(RZA), L_status },
|
|
|
|
|
{ 6, SK_Kb, A_right, SF(RZF), L_status },
|
|
|
|
|
{ 6, SK_Kb, A_right, SF(RZL), L_status },
|
2016-07-03 10:30:00 +05:30
|
|
|
|
{ 6, SK_Kb, A_right, SF(RZS), L_status },
|
2017-05-13 10:33:00 +05:30
|
|
|
|
{ -1, -1, A_left, SF(CGN), L_CGROUP },
|
|
|
|
|
{ 0, -1, A_right, SF(NMA), L_stat },
|
2011-03-31 16:45:12 +05:30
|
|
|
|
#undef SF
|
2012-09-19 11:31:01 +05:30
|
|
|
|
#undef A_left
|
|
|
|
|
#undef A_right
|
2011-03-31 16:45:12 +05:30
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
/*
|
|
|
|
|
* A calibrate_fields() *Helper* function to refresh the
|
|
|
|
|
* cached screen geometry and related variables */
|
|
|
|
|
static void adj_geometry (void) {
|
|
|
|
|
static size_t pseudo_max = 0;
|
2011-05-26 15:03:32 +05:30
|
|
|
|
static int w_set = 0, w_cols = 0, w_rows = 0;
|
2011-03-31 16:45:12 +05:30
|
|
|
|
struct winsize wz;
|
2002-02-02 04:17:29 +05:30
|
|
|
|
|
2011-03-31 16:45:12 +05:30
|
|
|
|
Screen_cols = columns; // <term.h>
|
|
|
|
|
Screen_rows = lines; // <term.h>
|
2002-05-30 09:14:46 +05:30
|
|
|
|
|
2011-03-31 16:45:12 +05:30
|
|
|
|
if (-1 != ioctl(STDOUT_FILENO, TIOCGWINSZ, &wz)
|
|
|
|
|
&& 0 < wz.ws_col && 0 < wz.ws_row) {
|
|
|
|
|
Screen_cols = wz.ws_col;
|
|
|
|
|
Screen_rows = wz.ws_row;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
#ifndef RMAN_IGNORED
|
|
|
|
|
// be crudely tolerant of crude tty emulators
|
|
|
|
|
if (Cap_avoid_eol) Screen_cols--;
|
|
|
|
|
#endif
|
|
|
|
|
|
|
|
|
|
// we might disappoint some folks (but they'll deserve it)
|
1970-01-01 05:30:00 +05:30
|
|
|
|
if (Screen_cols > SCREENMAX) Screen_cols = SCREENMAX;
|
|
|
|
|
if (Screen_cols < W_MIN_COL) Screen_cols = W_MIN_COL;
|
2011-05-26 15:03:32 +05:30
|
|
|
|
|
|
|
|
|
if (!w_set) {
|
|
|
|
|
if (Width_mode > 0) // -w with arg, we'll try to honor
|
|
|
|
|
w_cols = Width_mode;
|
|
|
|
|
else
|
|
|
|
|
if (Width_mode < 0) { // -w without arg, try environment
|
|
|
|
|
char *env_columns = getenv("COLUMNS"),
|
|
|
|
|
*env_lines = getenv("LINES"),
|
|
|
|
|
*ep;
|
|
|
|
|
if (env_columns && *env_columns) {
|
|
|
|
|
long t, tc = 0;
|
|
|
|
|
t = strtol(env_columns, &ep, 0);
|
|
|
|
|
if (!*ep && (t > 0) && (t <= 0x7fffffffL)) tc = t;
|
|
|
|
|
if (0 < tc) w_cols = (int)tc;
|
|
|
|
|
}
|
|
|
|
|
if (env_lines && *env_lines) {
|
|
|
|
|
long t, tr = 0;
|
|
|
|
|
t = strtol(env_lines, &ep, 0);
|
|
|
|
|
if (!*ep && (t > 0) && (t <= 0x7fffffffL)) tr = t;
|
|
|
|
|
if (0 < tr) w_rows = (int)tr;
|
|
|
|
|
}
|
|
|
|
|
if (!w_cols) w_cols = SCREENMAX;
|
|
|
|
|
if (w_cols && w_cols < W_MIN_COL) w_cols = W_MIN_COL;
|
|
|
|
|
if (w_rows && w_rows < W_MIN_ROW) w_rows = W_MIN_ROW;
|
|
|
|
|
}
|
2013-08-29 10:30:00 +05:30
|
|
|
|
if (w_cols > SCREENMAX) w_cols = SCREENMAX;
|
2011-05-26 15:03:32 +05:30
|
|
|
|
w_set = 1;
|
|
|
|
|
}
|
2011-03-31 16:45:12 +05:30
|
|
|
|
|
|
|
|
|
/* keep our support for output optimization in sync with current reality
|
|
|
|
|
note: when we're in Batch mode, we don't really need a Pseudo_screen
|
|
|
|
|
and when not Batch, our buffer will contain 1 extra 'line' since
|
|
|
|
|
Msg_row is never represented -- but it's nice to have some space
|
|
|
|
|
between us and the great-beyond... */
|
|
|
|
|
if (Batch) {
|
2011-05-26 15:03:32 +05:30
|
|
|
|
if (w_cols) Screen_cols = w_cols;
|
2014-08-01 10:30:00 +05:30
|
|
|
|
Screen_rows = w_rows ? w_rows : INT_MAX;
|
2011-04-14 02:38:14 +05:30
|
|
|
|
Pseudo_size = (sizeof(*Pseudo_screen) * ROWMAXSIZ);
|
2011-05-26 15:03:32 +05:30
|
|
|
|
} else {
|
1970-01-01 05:30:00 +05:30
|
|
|
|
const int max_rows = INT_MAX / (sizeof(*Pseudo_screen) * ROWMAXSIZ);
|
2011-05-26 15:03:32 +05:30
|
|
|
|
if (w_cols && w_cols < Screen_cols) Screen_cols = w_cols;
|
|
|
|
|
if (w_rows && w_rows < Screen_rows) Screen_rows = w_rows;
|
1970-01-01 05:30:00 +05:30
|
|
|
|
if (Screen_rows < 0 || Screen_rows > max_rows) Screen_rows = max_rows;
|
2011-04-14 02:38:14 +05:30
|
|
|
|
Pseudo_size = (sizeof(*Pseudo_screen) * ROWMAXSIZ) * Screen_rows;
|
2011-05-26 15:03:32 +05:30
|
|
|
|
}
|
2011-03-31 16:45:12 +05:30
|
|
|
|
// we'll only grow our Pseudo_screen, never shrink it
|
|
|
|
|
if (pseudo_max < Pseudo_size) {
|
|
|
|
|
pseudo_max = Pseudo_size;
|
2011-12-20 19:53:37 +05:30
|
|
|
|
Pseudo_screen = alloc_r(Pseudo_screen, pseudo_max);
|
2011-03-31 16:45:12 +05:30
|
|
|
|
}
|
2013-01-16 11:30:00 +05:30
|
|
|
|
// ensure each row is repainted (just in case)
|
2011-03-31 16:45:12 +05:30
|
|
|
|
PSU_CLREOS(0);
|
2013-01-16 11:30:00 +05:30
|
|
|
|
|
2014-06-23 10:30:00 +05:30
|
|
|
|
// prepare to customize potential cpu/memory graphs
|
|
|
|
|
Graph_len = Screen_cols - GRAPH_prefix - GRAPH_actual - GRAPH_suffix;
|
|
|
|
|
if (Graph_len >= 0) Graph_len = GRAPH_actual;
|
|
|
|
|
else if (Screen_cols > 80) Graph_len = Screen_cols - GRAPH_prefix - GRAPH_suffix;
|
|
|
|
|
else Graph_len = 80 - GRAPH_prefix - GRAPH_suffix;
|
2020-05-29 10:30:00 +05:30
|
|
|
|
if (Screen_cols < DOUBLE_limit) Curwin->rc.double_up = 0;
|
|
|
|
|
if (Curwin->rc.double_up) {
|
2020-05-13 10:30:00 +05:30
|
|
|
|
Graph_len = (Screen_cols - DOUBLE_space - (2 * (GRAPH_prefix + + GRAPH_suffix))) / 2;
|
|
|
|
|
if (Graph_len > GRAPH_actual) Graph_len = GRAPH_actual;
|
|
|
|
|
}
|
2014-08-07 10:30:00 +05:30
|
|
|
|
Graph_adj = (float)Graph_len / 100.0;
|
2014-06-23 10:30:00 +05:30
|
|
|
|
|
2013-01-16 11:30:00 +05:30
|
|
|
|
fflush(stdout);
|
2013-06-30 10:30:00 +05:30
|
|
|
|
Frames_signal = BREAK_off;
|
2011-03-31 16:45:12 +05:30
|
|
|
|
} // end: adj_geometry
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
/*
|
2012-02-09 09:52:22 +05:30
|
|
|
|
* A calibrate_fields() *Helper* function to build the
|
|
|
|
|
* actual column headers and required library flags */
|
|
|
|
|
static void build_headers (void) {
|
2011-03-31 16:45:12 +05:30
|
|
|
|
FLG_t f;
|
|
|
|
|
char *s;
|
|
|
|
|
WIN_t *w = Curwin;
|
|
|
|
|
#ifdef EQUCOLHDRYES
|
|
|
|
|
int x, hdrmax = 0;
|
|
|
|
|
#endif
|
2015-06-18 10:30:00 +05:30
|
|
|
|
int i;
|
2011-03-31 16:45:12 +05:30
|
|
|
|
|
|
|
|
|
Frames_libflags = 0;
|
|
|
|
|
|
|
|
|
|
do {
|
|
|
|
|
if (VIZISw(w)) {
|
|
|
|
|
memset((s = w->columnhdr), 0, sizeof(w->columnhdr));
|
2018-05-18 10:30:00 +05:30
|
|
|
|
if (Rc.mode_altscr) s = scat(s, fmtmk("%d", w->winnum));
|
2011-03-31 16:45:12 +05:30
|
|
|
|
for (i = 0; i < w->maxpflgs; i++) {
|
|
|
|
|
f = w->procflgs[i];
|
2011-04-14 02:38:14 +05:30
|
|
|
|
#ifdef USE_X_COLHDR
|
|
|
|
|
if (CHKw(w, Show_HICOLS) && f == w->rc.sortindx) {
|
2018-05-18 10:30:00 +05:30
|
|
|
|
s = scat(s, fmtmk("%s%s", Caps_off, w->capclr_msg));
|
2011-04-14 02:38:14 +05:30
|
|
|
|
w->hdrcaplen += strlen(Caps_off) + strlen(w->capclr_msg);
|
|
|
|
|
}
|
2011-04-15 04:54:29 +05:30
|
|
|
|
#else
|
2014-02-25 11:30:00 +05:30
|
|
|
|
if (EU_MAXPFLGS <= f) continue;
|
2011-04-14 02:38:14 +05:30
|
|
|
|
#endif
|
2014-02-25 11:30:00 +05:30
|
|
|
|
if (EU_CMD == f && CHKw(w, Show_CMDLIN)) Frames_libflags |= L_CMDLINE;
|
2015-07-27 10:30:00 +05:30
|
|
|
|
Frames_libflags |= Fieldstab[f].lflg;
|
top: refactored for correct multi-byte string handling
When this project first began implementing translation
support nearly 6 years ago, we overcame many 'gettext'
obstacles and limitations. And, of course, there were
not any actual translations at the time so our testing
was quite limited plus, in many cases, only simulated.
None of that, however, can justify or excuse the total
lack of attention to top's approach to NLS, especially
since some actual translations have existed for years.
When the issue referenced below was raised, I suffered
immediate feelings of anxiety, doubt and pending doom.
This was mostly because top strives to avoid line wrap
at all costs and that did not bode well for multi-byte
translated strings, using several bytes per character.
I was also concerned over possible performance impact,
assuming it was even possible to properly handle utf8.
But, after wrestling with the problem for several days
those initial feelings have now been replaced by guilt
over any trouble I initially caused those translators.
One can only imagine how frustrating it must have been
after the translation effort to then see top display a
misaligned column header and fields management page or
truncated screens like those of help or color mapping.
------------------------------------------------------
Ok, with that off my chest let's review these changes,
now that top properly handles UTF8 multi-byte strings.
. Performance - virtually all of this newly added cost
for multi-byte support is incurred during interactions
with the user. So, performance is not really an issue.
The one occasion when performance is impacted is found
during 'summary_show()' processing, due to an addition
of one new call to 'utf8_delta()' in 'show_special()'.
. Extra Wide Characters - I have not yet and may never
figure out a way to support languages like zh_CN where
the characters can be wider than most other languages.
. Translated User Name - at some future point we could
implement translation of user names. But as the author
of the issue acknowledged such names are non-standard.
Thus task display still incurs no new multi-byte costs
beyond those already incurred in that escape.c module.
For raising the issue I extend my sincerest thanks to:
Göran Uddeborg
Reference(s):
https://gitlab.com/procps-ng/procps/issues/68
Signed-off-by: Jim Warner <james.warner@comcast.net>
2017-09-27 10:32:22 +05:30
|
|
|
|
s = scat(s, utf8_justify(N_col(f)
|
2012-09-19 11:31:01 +05:30
|
|
|
|
, VARcol(f) ? w->varcolsz : Fieldstab[f].width
|
2018-05-18 10:30:00 +05:30
|
|
|
|
, CHKw(w, Fieldstab[f].align)));
|
2011-04-14 02:38:14 +05:30
|
|
|
|
#ifdef USE_X_COLHDR
|
|
|
|
|
if (CHKw(w, Show_HICOLS) && f == w->rc.sortindx) {
|
2018-05-18 10:30:00 +05:30
|
|
|
|
s = scat(s, fmtmk("%s%s", Caps_off, w->capclr_hdr));
|
2011-04-14 02:38:14 +05:30
|
|
|
|
w->hdrcaplen += strlen(Caps_off) + strlen(w->capclr_hdr);
|
|
|
|
|
}
|
|
|
|
|
#endif
|
2011-03-31 16:45:12 +05:30
|
|
|
|
}
|
|
|
|
|
#ifdef EQUCOLHDRYES
|
|
|
|
|
// prepare to even out column header lengths...
|
2011-04-14 02:38:14 +05:30
|
|
|
|
if (hdrmax + w->hdrcaplen < (x = strlen(w->columnhdr))) hdrmax = x - w->hdrcaplen;
|
2011-03-31 16:45:12 +05:30
|
|
|
|
#endif
|
2012-08-26 10:29:59 +05:30
|
|
|
|
// with forest view mode, we'll need tgid, ppid & start_time...
|
2016-08-20 10:30:00 +05:30
|
|
|
|
if (CHKw(w, Show_FOREST)) Frames_libflags |= L_stat;
|
2011-09-12 17:48:23 +05:30
|
|
|
|
// for 'busy' only processes, we'll need pcpu (utime & stime)...
|
2011-08-30 17:35:45 +05:30
|
|
|
|
if (!CHKw(w, Show_IDLEPS)) Frames_libflags |= L_stat;
|
2011-05-18 14:03:44 +05:30
|
|
|
|
// we must also accommodate an out of view sort field...
|
|
|
|
|
f = w->rc.sortindx;
|
|
|
|
|
Frames_libflags |= Fieldstab[f].lflg;
|
2014-02-25 11:30:00 +05:30
|
|
|
|
if (EU_CMD == f && CHKw(w, Show_CMDLIN)) Frames_libflags |= L_CMDLINE;
|
2017-06-15 22:30:00 +05:30
|
|
|
|
// for 'U' filtering we need the other user ids too
|
|
|
|
|
if (w->usrseltyp == 'U') Frames_libflags |= L_status;
|
2011-03-31 16:45:12 +05:30
|
|
|
|
} // end: VIZISw(w)
|
2011-09-12 17:48:23 +05:30
|
|
|
|
|
2011-03-31 16:45:12 +05:30
|
|
|
|
if (Rc.mode_altscr) w = w->next;
|
|
|
|
|
} while (w != Curwin);
|
|
|
|
|
|
|
|
|
|
#ifdef EQUCOLHDRYES
|
|
|
|
|
/* now we can finally even out column header lengths
|
|
|
|
|
(we're assuming entire columnhdr was memset to '\0') */
|
|
|
|
|
if (Rc.mode_altscr && SCREENMAX > Screen_cols)
|
2011-04-14 02:38:14 +05:30
|
|
|
|
for (i = 0; i < GROUPSMAX; i++) {
|
|
|
|
|
w = &Winstk[i];
|
|
|
|
|
if (CHKw(w, Show_TASKON))
|
|
|
|
|
if (hdrmax + w->hdrcaplen > (x = strlen(w->columnhdr)))
|
|
|
|
|
memset(&w->columnhdr[x], ' ', hdrmax + w->hdrcaplen - x);
|
|
|
|
|
}
|
2011-03-31 16:45:12 +05:30
|
|
|
|
#endif
|
|
|
|
|
|
|
|
|
|
// finalize/touchup the libproc PROC_FILLxxx flags for current config...
|
2016-08-20 10:30:00 +05:30
|
|
|
|
if (Frames_libflags & L_EITHER) {
|
|
|
|
|
if (!(Frames_libflags & (L_stat | L_status)))
|
|
|
|
|
Frames_libflags |= L_stat;
|
|
|
|
|
}
|
2011-03-31 16:45:12 +05:30
|
|
|
|
if (!Frames_libflags) Frames_libflags = L_DEFAULT;
|
|
|
|
|
if (Monpidsidx) Frames_libflags |= PROC_PID;
|
2012-02-09 09:52:22 +05:30
|
|
|
|
} // end: build_headers
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
/*
|
2012-06-30 10:30:55 +05:30
|
|
|
|
* This guy coordinates the activities surrounding the maintenance
|
2012-02-09 09:52:22 +05:30
|
|
|
|
* of each visible window's columns headers and the library flags
|
|
|
|
|
* required for the openproc interface. */
|
|
|
|
|
static void calibrate_fields (void) {
|
|
|
|
|
FLG_t f;
|
|
|
|
|
char *s;
|
|
|
|
|
const char *h;
|
|
|
|
|
WIN_t *w = Curwin;
|
2012-09-19 11:31:01 +05:30
|
|
|
|
int i, varcolcnt, len;
|
2012-02-09 09:52:22 +05:30
|
|
|
|
|
|
|
|
|
adj_geometry();
|
|
|
|
|
|
|
|
|
|
do {
|
|
|
|
|
if (VIZISw(w)) {
|
|
|
|
|
w->hdrcaplen = 0; // really only used with USE_X_COLHDR
|
|
|
|
|
// build window's pflgsall array, establish upper bounds for maxpflgs
|
2014-02-25 11:30:00 +05:30
|
|
|
|
for (i = 0, w->totpflgs = 0; i < EU_MAXPFLGS; i++) {
|
2018-05-18 10:30:00 +05:30
|
|
|
|
if (FLDviz(w, i)) {
|
2012-02-09 09:52:22 +05:30
|
|
|
|
f = FLDget(w, i);
|
|
|
|
|
#ifdef USE_X_COLHDR
|
|
|
|
|
w->pflgsall[w->totpflgs++] = f;
|
|
|
|
|
#else
|
2018-05-18 10:30:00 +05:30
|
|
|
|
if (CHKw(w, Show_HICOLS) && f == w->rc.sortindx) {
|
2014-02-25 11:30:00 +05:30
|
|
|
|
w->pflgsall[w->totpflgs++] = EU_XON;
|
2012-02-09 09:52:22 +05:30
|
|
|
|
w->pflgsall[w->totpflgs++] = f;
|
2014-02-25 11:30:00 +05:30
|
|
|
|
w->pflgsall[w->totpflgs++] = EU_XOF;
|
2012-02-09 09:52:22 +05:30
|
|
|
|
} else
|
|
|
|
|
w->pflgsall[w->totpflgs++] = f;
|
|
|
|
|
#endif
|
|
|
|
|
}
|
|
|
|
|
}
|
2015-08-03 10:30:00 +05:30
|
|
|
|
if (!w->totpflgs) w->pflgsall[w->totpflgs++] = EU_PID;
|
2012-02-09 09:52:22 +05:30
|
|
|
|
|
|
|
|
|
/* build a preliminary columns header not to exceed screen width
|
|
|
|
|
while accounting for a possible leading window number */
|
|
|
|
|
w->varcolsz = varcolcnt = 0;
|
|
|
|
|
*(s = w->columnhdr) = '\0';
|
2018-05-18 10:30:00 +05:30
|
|
|
|
if (Rc.mode_altscr) s = scat(s, " ");
|
2012-02-09 09:52:22 +05:30
|
|
|
|
for (i = 0; i + w->begpflg < w->totpflgs; i++) {
|
|
|
|
|
f = w->pflgsall[i + w->begpflg];
|
|
|
|
|
w->procflgs[i] = f;
|
|
|
|
|
#ifndef USE_X_COLHDR
|
2014-02-25 11:30:00 +05:30
|
|
|
|
if (EU_MAXPFLGS <= f) continue;
|
2012-02-09 09:52:22 +05:30
|
|
|
|
#endif
|
2012-09-19 11:31:01 +05:30
|
|
|
|
h = N_col(f);
|
|
|
|
|
len = (VARcol(f) ? (int)strlen(h) : Fieldstab[f].width) + COLPADSIZ;
|
2012-02-09 09:52:22 +05:30
|
|
|
|
// oops, won't fit -- we're outta here...
|
2012-09-19 11:31:01 +05:30
|
|
|
|
if (Screen_cols < ((int)(s - w->columnhdr) + len)) break;
|
|
|
|
|
if (VARcol(f)) { ++varcolcnt; w->varcolsz += strlen(h); }
|
2018-05-18 10:30:00 +05:30
|
|
|
|
s = scat(s, fmtmk("%*.*s", len, len, h));
|
2012-02-09 09:52:22 +05:30
|
|
|
|
}
|
|
|
|
|
#ifndef USE_X_COLHDR
|
1970-01-01 05:30:00 +05:30
|
|
|
|
if (i >= 1 && EU_XON == w->procflgs[i - 1]) --i;
|
2012-02-09 09:52:22 +05:30
|
|
|
|
#endif
|
|
|
|
|
|
|
|
|
|
/* establish the final maxpflgs and prepare to grow the variable column
|
|
|
|
|
heading(s) via varcolsz - it may be a fib if their pflags weren't
|
|
|
|
|
encountered, but that's ok because they won't be displayed anyway */
|
|
|
|
|
w->maxpflgs = i;
|
|
|
|
|
w->varcolsz += Screen_cols - strlen(w->columnhdr);
|
2012-09-19 11:31:01 +05:30
|
|
|
|
if (varcolcnt) w->varcolsz /= varcolcnt;
|
2012-02-09 09:52:22 +05:30
|
|
|
|
|
|
|
|
|
/* establish the field where all remaining fields would still
|
|
|
|
|
fit within screen width, including a leading window number */
|
|
|
|
|
*(s = w->columnhdr) = '\0';
|
2018-05-18 10:30:00 +05:30
|
|
|
|
if (Rc.mode_altscr) s = scat(s, " ");
|
1970-01-01 05:30:00 +05:30
|
|
|
|
w->endpflg = 0;
|
2012-02-09 09:52:22 +05:30
|
|
|
|
for (i = w->totpflgs - 1; -1 < i; i--) {
|
|
|
|
|
f = w->pflgsall[i];
|
|
|
|
|
#ifndef USE_X_COLHDR
|
2014-02-25 11:30:00 +05:30
|
|
|
|
if (EU_MAXPFLGS <= f) { w->endpflg = i; continue; }
|
2012-02-09 09:52:22 +05:30
|
|
|
|
#endif
|
2012-09-19 11:31:01 +05:30
|
|
|
|
h = N_col(f);
|
|
|
|
|
len = (VARcol(f) ? (int)strlen(h) : Fieldstab[f].width) + COLPADSIZ;
|
|
|
|
|
if (Screen_cols < ((int)(s - w->columnhdr) + len)) break;
|
2018-05-18 10:30:00 +05:30
|
|
|
|
s = scat(s, fmtmk("%*.*s", len, len, h));
|
2012-02-09 09:52:22 +05:30
|
|
|
|
w->endpflg = i;
|
|
|
|
|
}
|
2012-02-10 21:40:10 +05:30
|
|
|
|
#ifndef USE_X_COLHDR
|
2014-02-25 11:30:00 +05:30
|
|
|
|
if (EU_XOF == w->pflgsall[w->endpflg]) ++w->endpflg;
|
2012-02-10 21:40:10 +05:30
|
|
|
|
#endif
|
2012-02-09 09:52:22 +05:30
|
|
|
|
} // end: if (VIZISw(w))
|
|
|
|
|
|
|
|
|
|
if (Rc.mode_altscr) w = w->next;
|
|
|
|
|
} while (w != Curwin);
|
|
|
|
|
|
|
|
|
|
build_headers();
|
2011-03-31 16:45:12 +05:30
|
|
|
|
} // end: calibrate_fields
|
2002-02-02 04:17:29 +05:30
|
|
|
|
|
2002-05-30 09:14:46 +05:30
|
|
|
|
|
2011-03-31 16:45:12 +05:30
|
|
|
|
/*
|
|
|
|
|
* Display each field represented in the current window's fieldscur
|
|
|
|
|
* array along with its description. Mark with bold and a leading
|
|
|
|
|
* asterisk those fields associated with the "on" or "active" state.
|
2011-05-05 15:37:25 +05:30
|
|
|
|
*
|
2011-03-31 16:45:12 +05:30
|
|
|
|
* Special highlighting will be accorded the "focus" field with such
|
|
|
|
|
* highlighting potentially extended to include the description.
|
|
|
|
|
*
|
2011-05-26 15:03:32 +05:30
|
|
|
|
* Below is the current Fieldstab space requirement and how
|
|
|
|
|
* we apportion it. The xSUFX is considered sacrificial,
|
|
|
|
|
* something we can reduce or do without.
|
|
|
|
|
* 0 1 2 3
|
|
|
|
|
* 12345678901234567890123456789012
|
|
|
|
|
* * HEADING = Longest Description!
|
|
|
|
|
* xPRFX ----------______________________ xSUFX
|
|
|
|
|
* ( xPRFX has pos 2 & 10 for 'extending' when at minimums )
|
|
|
|
|
*
|
2013-01-31 11:30:00 +05:30
|
|
|
|
* The first 4 screen rows are reserved for explanatory text, and
|
|
|
|
|
* the maximum number of columns is Screen_cols / xPRFX + 1 space
|
|
|
|
|
* between columns. Thus, for example, with 42 fields a tty will
|
2012-06-30 10:30:55 +05:30
|
|
|
|
* still remain useable under these extremes:
|
2013-01-31 11:30:00 +05:30
|
|
|
|
* rows columns what's
|
|
|
|
|
* tty top tty top displayed
|
|
|
|
|
* --- --- --- --- ------------------
|
|
|
|
|
* 46 42 10 1 xPRFX only
|
|
|
|
|
* 46 42 32 1 full xPRFX + xSUFX
|
|
|
|
|
* 6 2 231 21 xPRFX only
|
|
|
|
|
* 10 6 231 7 full xPRFX + xSUFX
|
2011-05-26 15:03:32 +05:30
|
|
|
|
*/
|
|
|
|
|
static void display_fields (int focus, int extend) {
|
2013-01-29 11:30:00 +05:30
|
|
|
|
#define mkERR { putp("\n"); putp(N_txt(XTRA_winsize_txt)); return; }
|
2013-01-31 11:30:00 +05:30
|
|
|
|
#define mxCOL ( (Screen_cols / 11) > 0 ? (Screen_cols / 11) : 1 )
|
2011-03-31 16:45:12 +05:30
|
|
|
|
#define yRSVD 4
|
2017-10-08 10:30:00 +05:30
|
|
|
|
#define xEQUS 2 // length of suffix beginning '= '
|
|
|
|
|
#define xSUFX 22 // total suffix length, incl xEQUS
|
2011-05-26 15:03:32 +05:30
|
|
|
|
#define xPRFX (10 + xadd)
|
|
|
|
|
#define xTOTL (xPRFX + xSUFX)
|
2017-10-08 10:30:00 +05:30
|
|
|
|
static int col_sav, row_sav;
|
2011-05-26 15:03:32 +05:30
|
|
|
|
WIN_t *w = Curwin; // avoid gcc bloat with a local copy
|
|
|
|
|
int i; // utility int (a row, tot cols, ix)
|
|
|
|
|
int smax; // printable width of xSUFX
|
|
|
|
|
int xadd = 0; // spacing between data columns
|
|
|
|
|
int cmax = Screen_cols; // total data column width
|
|
|
|
|
int rmax = Screen_rows - yRSVD; // total useable rows
|
2011-03-31 16:45:12 +05:30
|
|
|
|
|
2014-02-25 11:30:00 +05:30
|
|
|
|
i = (EU_MAXPFLGS % mxCOL) ? 1 : 0;
|
|
|
|
|
if (rmax < i + (EU_MAXPFLGS / mxCOL)) mkERR;
|
|
|
|
|
i = EU_MAXPFLGS / rmax;
|
|
|
|
|
if (EU_MAXPFLGS % rmax) ++i;
|
2011-06-23 19:15:09 +05:30
|
|
|
|
if (i > 1) { cmax /= i; xadd = 1; }
|
2011-05-26 15:03:32 +05:30
|
|
|
|
if (cmax > xTOTL) cmax = xTOTL;
|
|
|
|
|
smax = cmax - xPRFX;
|
2013-01-29 11:30:00 +05:30
|
|
|
|
if (smax < 0) mkERR;
|
2011-03-31 16:45:12 +05:30
|
|
|
|
|
2013-01-29 11:30:00 +05:30
|
|
|
|
/* we'll go the extra distance to avoid any potential screen flicker
|
|
|
|
|
which occurs under some terminal emulators (but it was our fault) */
|
|
|
|
|
if (col_sav != Screen_cols || row_sav != Screen_rows) {
|
|
|
|
|
col_sav = Screen_cols;
|
|
|
|
|
row_sav = Screen_rows;
|
|
|
|
|
putp(Cap_clr_eos);
|
|
|
|
|
}
|
|
|
|
|
fflush(stdout);
|
|
|
|
|
|
2014-02-25 11:30:00 +05:30
|
|
|
|
for (i = 0; i < EU_MAXPFLGS; ++i) {
|
2013-01-16 11:30:00 +05:30
|
|
|
|
int b = FLDviz(w, i), x = (i / rmax) * cmax, y = (i % rmax) + yRSVD;
|
2012-09-19 11:31:01 +05:30
|
|
|
|
const char *e = (i == focus && extend) ? w->capclr_hdr : "";
|
2013-01-16 11:30:00 +05:30
|
|
|
|
FLG_t f = FLDget(w, i);
|
2017-10-08 10:30:00 +05:30
|
|
|
|
char sbuf[xSUFX*4]; // 4 = max multi-byte
|
top: refactored for correct multi-byte string handling
When this project first began implementing translation
support nearly 6 years ago, we overcame many 'gettext'
obstacles and limitations. And, of course, there were
not any actual translations at the time so our testing
was quite limited plus, in many cases, only simulated.
None of that, however, can justify or excuse the total
lack of attention to top's approach to NLS, especially
since some actual translations have existed for years.
When the issue referenced below was raised, I suffered
immediate feelings of anxiety, doubt and pending doom.
This was mostly because top strives to avoid line wrap
at all costs and that did not bode well for multi-byte
translated strings, using several bytes per character.
I was also concerned over possible performance impact,
assuming it was even possible to properly handle utf8.
But, after wrestling with the problem for several days
those initial feelings have now been replaced by guilt
over any trouble I initially caused those translators.
One can only imagine how frustrating it must have been
after the translation effort to then see top display a
misaligned column header and fields management page or
truncated screens like those of help or color mapping.
------------------------------------------------------
Ok, with that off my chest let's review these changes,
now that top properly handles UTF8 multi-byte strings.
. Performance - virtually all of this newly added cost
for multi-byte support is incurred during interactions
with the user. So, performance is not really an issue.
The one occasion when performance is impacted is found
during 'summary_show()' processing, due to an addition
of one new call to 'utf8_delta()' in 'show_special()'.
. Extra Wide Characters - I have not yet and may never
figure out a way to support languages like zh_CN where
the characters can be wider than most other languages.
. Translated User Name - at some future point we could
implement translation of user names. But as the author
of the issue acknowledged such names are non-standard.
Thus task display still incurs no new multi-byte costs
beyond those already incurred in that escape.c module.
For raising the issue I extend my sincerest thanks to:
Göran Uddeborg
Reference(s):
https://gitlab.com/procps-ng/procps/issues/68
Signed-off-by: Jim Warner <james.warner@comcast.net>
2017-09-27 10:32:22 +05:30
|
|
|
|
int xcol, xfld;
|
|
|
|
|
|
2017-12-15 10:30:00 +05:30
|
|
|
|
/* prep sacrificial suffix (allowing for beginning '= ')
|
|
|
|
|
note: width passed to 'utf8_embody' may go negative, but he'll be just fine */
|
2017-10-08 10:30:00 +05:30
|
|
|
|
snprintf(sbuf, sizeof(sbuf), "= %.*s", utf8_embody(N_fld(f), smax - xEQUS), N_fld(f));
|
|
|
|
|
|
top: refactored for correct multi-byte string handling
When this project first began implementing translation
support nearly 6 years ago, we overcame many 'gettext'
obstacles and limitations. And, of course, there were
not any actual translations at the time so our testing
was quite limited plus, in many cases, only simulated.
None of that, however, can justify or excuse the total
lack of attention to top's approach to NLS, especially
since some actual translations have existed for years.
When the issue referenced below was raised, I suffered
immediate feelings of anxiety, doubt and pending doom.
This was mostly because top strives to avoid line wrap
at all costs and that did not bode well for multi-byte
translated strings, using several bytes per character.
I was also concerned over possible performance impact,
assuming it was even possible to properly handle utf8.
But, after wrestling with the problem for several days
those initial feelings have now been replaced by guilt
over any trouble I initially caused those translators.
One can only imagine how frustrating it must have been
after the translation effort to then see top display a
misaligned column header and fields management page or
truncated screens like those of help or color mapping.
------------------------------------------------------
Ok, with that off my chest let's review these changes,
now that top properly handles UTF8 multi-byte strings.
. Performance - virtually all of this newly added cost
for multi-byte support is incurred during interactions
with the user. So, performance is not really an issue.
The one occasion when performance is impacted is found
during 'summary_show()' processing, due to an addition
of one new call to 'utf8_delta()' in 'show_special()'.
. Extra Wide Characters - I have not yet and may never
figure out a way to support languages like zh_CN where
the characters can be wider than most other languages.
. Translated User Name - at some future point we could
implement translation of user names. But as the author
of the issue acknowledged such names are non-standard.
Thus task display still incurs no new multi-byte costs
beyond those already incurred in that escape.c module.
For raising the issue I extend my sincerest thanks to:
Göran Uddeborg
Reference(s):
https://gitlab.com/procps-ng/procps/issues/68
Signed-off-by: Jim Warner <james.warner@comcast.net>
2017-09-27 10:32:22 +05:30
|
|
|
|
// obtain translated deltas (if any) ...
|
|
|
|
|
xcol = utf8_delta(fmtmk("%.*s", utf8_embody(N_col(f), 7), N_col(f)));
|
2017-10-08 10:30:00 +05:30
|
|
|
|
xfld = utf8_delta(sbuf + xEQUS); // ignore beginning '= '
|
2011-05-26 15:03:32 +05:30
|
|
|
|
|
top: refactored for correct multi-byte string handling
When this project first began implementing translation
support nearly 6 years ago, we overcame many 'gettext'
obstacles and limitations. And, of course, there were
not any actual translations at the time so our testing
was quite limited plus, in many cases, only simulated.
None of that, however, can justify or excuse the total
lack of attention to top's approach to NLS, especially
since some actual translations have existed for years.
When the issue referenced below was raised, I suffered
immediate feelings of anxiety, doubt and pending doom.
This was mostly because top strives to avoid line wrap
at all costs and that did not bode well for multi-byte
translated strings, using several bytes per character.
I was also concerned over possible performance impact,
assuming it was even possible to properly handle utf8.
But, after wrestling with the problem for several days
those initial feelings have now been replaced by guilt
over any trouble I initially caused those translators.
One can only imagine how frustrating it must have been
after the translation effort to then see top display a
misaligned column header and fields management page or
truncated screens like those of help or color mapping.
------------------------------------------------------
Ok, with that off my chest let's review these changes,
now that top properly handles UTF8 multi-byte strings.
. Performance - virtually all of this newly added cost
for multi-byte support is incurred during interactions
with the user. So, performance is not really an issue.
The one occasion when performance is impacted is found
during 'summary_show()' processing, due to an addition
of one new call to 'utf8_delta()' in 'show_special()'.
. Extra Wide Characters - I have not yet and may never
figure out a way to support languages like zh_CN where
the characters can be wider than most other languages.
. Translated User Name - at some future point we could
implement translation of user names. But as the author
of the issue acknowledged such names are non-standard.
Thus task display still incurs no new multi-byte costs
beyond those already incurred in that escape.c module.
For raising the issue I extend my sincerest thanks to:
Göran Uddeborg
Reference(s):
https://gitlab.com/procps-ng/procps/issues/68
Signed-off-by: Jim Warner <james.warner@comcast.net>
2017-09-27 10:32:22 +05:30
|
|
|
|
PUTT("%s%c%s%s %s%-*.*s%s%s%s %-*.*s%s"
|
2013-01-16 11:30:00 +05:30
|
|
|
|
, tg2(x, y)
|
2011-03-31 16:45:12 +05:30
|
|
|
|
, b ? '*' : ' '
|
|
|
|
|
, b ? w->cap_bold : Cap_norm
|
2011-05-26 15:03:32 +05:30
|
|
|
|
, e
|
2012-02-29 11:30:00 +05:30
|
|
|
|
, i == focus ? w->capclr_hdr : ""
|
top: refactored for correct multi-byte string handling
When this project first began implementing translation
support nearly 6 years ago, we overcame many 'gettext'
obstacles and limitations. And, of course, there were
not any actual translations at the time so our testing
was quite limited plus, in many cases, only simulated.
None of that, however, can justify or excuse the total
lack of attention to top's approach to NLS, especially
since some actual translations have existed for years.
When the issue referenced below was raised, I suffered
immediate feelings of anxiety, doubt and pending doom.
This was mostly because top strives to avoid line wrap
at all costs and that did not bode well for multi-byte
translated strings, using several bytes per character.
I was also concerned over possible performance impact,
assuming it was even possible to properly handle utf8.
But, after wrestling with the problem for several days
those initial feelings have now been replaced by guilt
over any trouble I initially caused those translators.
One can only imagine how frustrating it must have been
after the translation effort to then see top display a
misaligned column header and fields management page or
truncated screens like those of help or color mapping.
------------------------------------------------------
Ok, with that off my chest let's review these changes,
now that top properly handles UTF8 multi-byte strings.
. Performance - virtually all of this newly added cost
for multi-byte support is incurred during interactions
with the user. So, performance is not really an issue.
The one occasion when performance is impacted is found
during 'summary_show()' processing, due to an addition
of one new call to 'utf8_delta()' in 'show_special()'.
. Extra Wide Characters - I have not yet and may never
figure out a way to support languages like zh_CN where
the characters can be wider than most other languages.
. Translated User Name - at some future point we could
implement translation of user names. But as the author
of the issue acknowledged such names are non-standard.
Thus task display still incurs no new multi-byte costs
beyond those already incurred in that escape.c module.
For raising the issue I extend my sincerest thanks to:
Göran Uddeborg
Reference(s):
https://gitlab.com/procps-ng/procps/issues/68
Signed-off-by: Jim Warner <james.warner@comcast.net>
2017-09-27 10:32:22 +05:30
|
|
|
|
, 7 + xcol, 7 + xcol
|
2012-09-19 12:32:02 +05:30
|
|
|
|
, N_col(f)
|
2011-03-31 16:45:12 +05:30
|
|
|
|
, Cap_norm
|
|
|
|
|
, b ? w->cap_bold : ""
|
2011-05-26 15:03:32 +05:30
|
|
|
|
, e
|
top: refactored for correct multi-byte string handling
When this project first began implementing translation
support nearly 6 years ago, we overcame many 'gettext'
obstacles and limitations. And, of course, there were
not any actual translations at the time so our testing
was quite limited plus, in many cases, only simulated.
None of that, however, can justify or excuse the total
lack of attention to top's approach to NLS, especially
since some actual translations have existed for years.
When the issue referenced below was raised, I suffered
immediate feelings of anxiety, doubt and pending doom.
This was mostly because top strives to avoid line wrap
at all costs and that did not bode well for multi-byte
translated strings, using several bytes per character.
I was also concerned over possible performance impact,
assuming it was even possible to properly handle utf8.
But, after wrestling with the problem for several days
those initial feelings have now been replaced by guilt
over any trouble I initially caused those translators.
One can only imagine how frustrating it must have been
after the translation effort to then see top display a
misaligned column header and fields management page or
truncated screens like those of help or color mapping.
------------------------------------------------------
Ok, with that off my chest let's review these changes,
now that top properly handles UTF8 multi-byte strings.
. Performance - virtually all of this newly added cost
for multi-byte support is incurred during interactions
with the user. So, performance is not really an issue.
The one occasion when performance is impacted is found
during 'summary_show()' processing, due to an addition
of one new call to 'utf8_delta()' in 'show_special()'.
. Extra Wide Characters - I have not yet and may never
figure out a way to support languages like zh_CN where
the characters can be wider than most other languages.
. Translated User Name - at some future point we could
implement translation of user names. But as the author
of the issue acknowledged such names are non-standard.
Thus task display still incurs no new multi-byte costs
beyond those already incurred in that escape.c module.
For raising the issue I extend my sincerest thanks to:
Göran Uddeborg
Reference(s):
https://gitlab.com/procps-ng/procps/issues/68
Signed-off-by: Jim Warner <james.warner@comcast.net>
2017-09-27 10:32:22 +05:30
|
|
|
|
, smax + xfld, smax + xfld
|
2011-05-26 15:03:32 +05:30
|
|
|
|
, sbuf
|
2013-01-29 11:30:00 +05:30
|
|
|
|
, Cap_norm);
|
2011-03-31 16:45:12 +05:30
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
putp(Caps_off);
|
2013-01-29 11:30:00 +05:30
|
|
|
|
#undef mkERR
|
2011-05-26 15:03:32 +05:30
|
|
|
|
#undef mxCOL
|
2011-03-31 16:45:12 +05:30
|
|
|
|
#undef yRSVD
|
2017-10-08 10:30:00 +05:30
|
|
|
|
#undef xEQUS
|
2011-05-26 15:03:32 +05:30
|
|
|
|
#undef xSUFX
|
|
|
|
|
#undef xPRFX
|
|
|
|
|
#undef xTOTL
|
2011-03-31 16:45:12 +05:30
|
|
|
|
} // end: display_fields
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
/*
|
|
|
|
|
* Manage all fields aspects (order/toggle/sort), for all windows. */
|
|
|
|
|
static void fields_utility (void) {
|
2012-06-30 10:30:00 +05:30
|
|
|
|
#ifndef SCROLLVAR_NO
|
|
|
|
|
#define unSCRL { w->begpflg = w->varcolbeg = 0; OFFw(w, Show_HICOLS); }
|
|
|
|
|
#else
|
2011-12-06 06:27:46 +05:30
|
|
|
|
#define unSCRL { w->begpflg = 0; OFFw(w, Show_HICOLS); }
|
2012-06-30 10:30:00 +05:30
|
|
|
|
#endif
|
2011-05-05 15:37:25 +05:30
|
|
|
|
#define swapEM { char c; unSCRL; c = w->rc.fieldscur[i]; \
|
2011-03-31 16:45:12 +05:30
|
|
|
|
w->rc.fieldscur[i] = *p; *p = c; p = &w->rc.fieldscur[i]; }
|
2018-05-18 10:30:00 +05:30
|
|
|
|
#define spewFI { char *t; f = w->rc.sortindx; t = strchr(w->rc.fieldscur, f + FLD_OFFSET); \
|
2011-03-31 16:45:12 +05:30
|
|
|
|
if (!t) t = strchr(w->rc.fieldscur, (f + FLD_OFFSET) | 0x80); \
|
|
|
|
|
i = (t) ? (int)(t - w->rc.fieldscur) : 0; }
|
|
|
|
|
WIN_t *w = Curwin; // avoid gcc bloat with a local copy
|
|
|
|
|
const char *h = NULL;
|
2011-05-05 15:37:25 +05:30
|
|
|
|
char *p = NULL;
|
2011-03-31 16:45:12 +05:30
|
|
|
|
int i, key;
|
|
|
|
|
FLG_t f;
|
|
|
|
|
|
|
|
|
|
spewFI
|
2013-01-16 11:30:00 +05:30
|
|
|
|
signify_that:
|
|
|
|
|
putp(Cap_clr_scr);
|
|
|
|
|
adj_geometry();
|
2011-03-31 16:45:12 +05:30
|
|
|
|
|
|
|
|
|
do {
|
2012-09-19 12:32:02 +05:30
|
|
|
|
if (!h) h = N_col(f);
|
2011-05-26 15:03:32 +05:30
|
|
|
|
putp(Cap_home);
|
2011-10-12 00:32:59 +05:30
|
|
|
|
show_special(1, fmtmk(N_unq(FIELD_header_fmt)
|
|
|
|
|
, w->grpname, CHKw(w, Show_FOREST) ? N_txt(FOREST_views_txt) : h));
|
2013-01-16 11:30:00 +05:30
|
|
|
|
display_fields(i, (p != NULL));
|
|
|
|
|
fflush(stdout);
|
|
|
|
|
|
2013-06-30 10:30:00 +05:30
|
|
|
|
if (Frames_signal) goto signify_that;
|
2013-02-15 11:30:00 +05:30
|
|
|
|
key = iokey(1);
|
2013-01-16 11:30:00 +05:30
|
|
|
|
if (key < 1) goto signify_that;
|
2011-05-26 15:03:32 +05:30
|
|
|
|
|
2013-01-16 11:30:00 +05:30
|
|
|
|
switch (key) {
|
2011-03-31 16:45:12 +05:30
|
|
|
|
case kbd_UP:
|
|
|
|
|
if (i > 0) { --i; if (p) swapEM }
|
|
|
|
|
break;
|
|
|
|
|
case kbd_DOWN:
|
2014-02-25 11:30:00 +05:30
|
|
|
|
if (i + 1 < EU_MAXPFLGS) { ++i; if (p) swapEM }
|
2011-03-31 16:45:12 +05:30
|
|
|
|
break;
|
|
|
|
|
case kbd_LEFT:
|
|
|
|
|
case kbd_ENTER:
|
|
|
|
|
p = NULL;
|
|
|
|
|
break;
|
|
|
|
|
case kbd_RIGHT:
|
|
|
|
|
p = &w->rc.fieldscur[i];
|
|
|
|
|
break;
|
|
|
|
|
case kbd_HOME:
|
|
|
|
|
case kbd_PGUP:
|
2011-04-14 02:38:14 +05:30
|
|
|
|
if (!p) i = 0;
|
2011-03-31 16:45:12 +05:30
|
|
|
|
break;
|
|
|
|
|
case kbd_END:
|
|
|
|
|
case kbd_PGDN:
|
2014-02-25 11:30:00 +05:30
|
|
|
|
if (!p) i = EU_MAXPFLGS - 1;
|
2011-03-31 16:45:12 +05:30
|
|
|
|
break;
|
|
|
|
|
case kbd_SPACE:
|
|
|
|
|
case 'd':
|
2011-04-14 02:38:14 +05:30
|
|
|
|
if (!p) { FLDtog(w, i); unSCRL }
|
2011-03-31 16:45:12 +05:30
|
|
|
|
break;
|
|
|
|
|
case 's':
|
2011-08-30 17:35:45 +05:30
|
|
|
|
#ifdef TREE_NORESET
|
|
|
|
|
if (!p && !CHKw(w, Show_FOREST)) { w->rc.sortindx = f = FLDget(w, i); h = NULL; unSCRL }
|
|
|
|
|
#else
|
|
|
|
|
if (!p) { w->rc.sortindx = f = FLDget(w, i); h = NULL; unSCRL; OFFw(w, Show_FOREST); }
|
|
|
|
|
#endif
|
2011-03-31 16:45:12 +05:30
|
|
|
|
break;
|
|
|
|
|
case 'a':
|
|
|
|
|
case 'w':
|
|
|
|
|
Curwin = w = ('a' == key) ? w->next : w->prev;
|
|
|
|
|
spewFI
|
2012-06-30 10:30:55 +05:30
|
|
|
|
h = p = NULL;
|
2011-03-31 16:45:12 +05:30
|
|
|
|
break;
|
|
|
|
|
default: // keep gcc happy
|
|
|
|
|
break;
|
|
|
|
|
}
|
2013-01-16 11:30:00 +05:30
|
|
|
|
} while (key != 'q' && key != kbd_ESC);
|
2011-04-14 02:38:14 +05:30
|
|
|
|
#undef unSCRL
|
2011-03-31 16:45:12 +05:30
|
|
|
|
#undef swapEM
|
|
|
|
|
#undef spewFI
|
|
|
|
|
} // end: fields_utility
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
/*
|
2012-10-03 23:43:13 +05:30
|
|
|
|
* This routine takes care of auto sizing field widths
|
|
|
|
|
* if/when the user sets Rc.fixed_widest to -1. Along the
|
|
|
|
|
* way he reinitializes some things for the next frame. */
|
|
|
|
|
static inline void widths_resize (void) {
|
|
|
|
|
int i;
|
|
|
|
|
|
|
|
|
|
// next var may also be set by the guys that actually truncate stuff
|
|
|
|
|
Autox_found = 0;
|
2014-02-25 11:30:00 +05:30
|
|
|
|
for (i = 0; i < EU_MAXPFLGS; i++) {
|
2012-10-03 23:43:13 +05:30
|
|
|
|
if (Autox_array[i]) {
|
|
|
|
|
Fieldstab[i].width++;
|
|
|
|
|
Autox_array[i] = 0;
|
|
|
|
|
Autox_found = 1;
|
|
|
|
|
}
|
|
|
|
|
}
|
2020-01-01 10:30:00 +05:30
|
|
|
|
// trigger a call to calibrate_fields (via zap_fieldstab)
|
|
|
|
|
if (Autox_found) Frames_signal = BREAK_autox;
|
2012-10-03 23:43:13 +05:30
|
|
|
|
} // end: widths_resize
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
/*
|
|
|
|
|
* This routine exists just to consolidate most of the messin'
|
2012-09-19 11:31:01 +05:30
|
|
|
|
* around with the Fieldstab array and some related stuff. */
|
2011-03-31 16:45:12 +05:30
|
|
|
|
static void zap_fieldstab (void) {
|
2018-01-25 11:30:00 +05:30
|
|
|
|
#ifdef WIDEN_COLUMN
|
|
|
|
|
#define maX(E) ( (wtab[E].wnls > wtab[E].wmin) \
|
|
|
|
|
? wtab[E].wnls : wtab[E].wmin )
|
|
|
|
|
static struct {
|
|
|
|
|
int wmin; // minimum field width (-1 == variable width)
|
|
|
|
|
int wnls; // translated header column requirements
|
|
|
|
|
int watx; // +1 == non-scalable auto sized columns
|
|
|
|
|
} wtab[EU_MAXPFLGS];
|
|
|
|
|
#endif
|
2011-08-17 16:31:35 +05:30
|
|
|
|
static int once;
|
2012-09-19 11:31:01 +05:30
|
|
|
|
unsigned digits;
|
2011-03-31 16:45:12 +05:30
|
|
|
|
char buf[8];
|
2018-01-25 11:30:00 +05:30
|
|
|
|
int i;
|
2011-03-31 16:45:12 +05:30
|
|
|
|
|
2012-09-19 11:31:01 +05:30
|
|
|
|
if (!once) {
|
2018-01-22 11:30:00 +05:30
|
|
|
|
Fieldstab[EU_CPN].width = 1;
|
|
|
|
|
Fieldstab[EU_NMA].width = 2;
|
2014-02-25 11:30:00 +05:30
|
|
|
|
Fieldstab[EU_PID].width = Fieldstab[EU_PPD].width
|
|
|
|
|
= Fieldstab[EU_PGD].width = Fieldstab[EU_SID].width
|
|
|
|
|
= Fieldstab[EU_TGD].width = Fieldstab[EU_TPG].width = 5;
|
2012-09-19 11:31:01 +05:30
|
|
|
|
if (5 < (digits = get_pid_digits())) {
|
|
|
|
|
if (10 < digits) error_exit(N_txt(FAIL_widepid_txt));
|
2014-02-25 11:30:00 +05:30
|
|
|
|
Fieldstab[EU_PID].width = Fieldstab[EU_PPD].width
|
|
|
|
|
= Fieldstab[EU_PGD].width = Fieldstab[EU_SID].width
|
|
|
|
|
= Fieldstab[EU_TGD].width = Fieldstab[EU_TPG].width = digits;
|
2012-09-19 11:31:01 +05:30
|
|
|
|
}
|
2018-01-25 11:30:00 +05:30
|
|
|
|
#ifdef WIDEN_COLUMN
|
|
|
|
|
// identify our non-scalable auto sized columns
|
|
|
|
|
wtab[EU_UED].watx = wtab[EU_UEN].watx = wtab[EU_URD].watx
|
|
|
|
|
= wtab[EU_URN].watx = wtab[EU_USD].watx = wtab[EU_USN].watx
|
|
|
|
|
= wtab[EU_GID].watx = wtab[EU_GRP].watx = wtab[EU_TTY].watx
|
|
|
|
|
= wtab[EU_WCH].watx = wtab[EU_NS1].watx = wtab[EU_NS2].watx
|
|
|
|
|
= wtab[EU_NS3].watx = wtab[EU_NS4].watx = wtab[EU_NS5].watx
|
|
|
|
|
= wtab[EU_NS6].watx = wtab[EU_LXC].watx = +1;
|
|
|
|
|
/* establish translatable header 'column' requirements
|
|
|
|
|
and ensure .width reflects the widest value */
|
|
|
|
|
for (i = 0; i < EU_MAXPFLGS; i++) {
|
|
|
|
|
wtab[i].wmin = Fieldstab[i].width;
|
|
|
|
|
wtab[i].wnls = (int)strlen(N_col(i)) - utf8_delta(N_col(i));
|
|
|
|
|
if (wtab[i].wmin != -1)
|
|
|
|
|
Fieldstab[i].width = maX(i);
|
|
|
|
|
}
|
|
|
|
|
#endif
|
2012-09-19 11:31:01 +05:30
|
|
|
|
once = 1;
|
|
|
|
|
}
|
2011-03-31 16:45:12 +05:30
|
|
|
|
|
2011-08-17 16:31:35 +05:30
|
|
|
|
/*** hotplug_acclimated ***/
|
2012-09-19 11:31:01 +05:30
|
|
|
|
|
2011-09-12 17:48:23 +05:30
|
|
|
|
Cpu_pmax = 99.9;
|
2012-02-01 11:30:00 +05:30
|
|
|
|
if (Rc.mode_irixps && smp_num_cpus > 1 && !Thread_mode) {
|
|
|
|
|
Cpu_pmax = 100.0 * smp_num_cpus;
|
|
|
|
|
if (smp_num_cpus > 10) {
|
2011-09-12 17:48:23 +05:30
|
|
|
|
if (Cpu_pmax > 99999.0) Cpu_pmax = 99999.0;
|
|
|
|
|
} else {
|
|
|
|
|
if (Cpu_pmax > 999.9) Cpu_pmax = 999.9;
|
2011-08-30 17:35:45 +05:30
|
|
|
|
}
|
2011-03-31 16:45:12 +05:30
|
|
|
|
}
|
2018-01-22 11:30:00 +05:30
|
|
|
|
|
2018-01-25 11:30:00 +05:30
|
|
|
|
#ifdef WIDEN_COLUMN
|
|
|
|
|
digits = (unsigned)snprintf(buf, sizeof(buf), "%u", (unsigned)smp_num_cpus);
|
|
|
|
|
if (wtab[EU_CPN].wmin < digits) {
|
|
|
|
|
if (5 < digits) error_exit(N_txt(FAIL_widecpu_txt));
|
|
|
|
|
wtab[EU_CPN].wmin = digits;
|
|
|
|
|
Fieldstab[EU_CPN].width = maX(EU_CPN);
|
|
|
|
|
}
|
|
|
|
|
digits = (unsigned)snprintf(buf, sizeof(buf), "%u", (unsigned)Numa_node_tot);
|
|
|
|
|
if (wtab[EU_NMA].wmin < digits) {
|
|
|
|
|
wtab[EU_NMA].wmin = digits;
|
|
|
|
|
Fieldstab[EU_NMA].width = maX(EU_NMA);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
// and accommodate optional wider non-scalable columns (maybe)
|
|
|
|
|
if (!AUTOX_MODE) {
|
|
|
|
|
for (i = 0; i < EU_MAXPFLGS; i++) {
|
|
|
|
|
if (wtab[i].watx)
|
|
|
|
|
Fieldstab[i].width = Rc.fixed_widest ? Rc.fixed_widest + maX(i) : maX(i);
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
#else
|
2018-01-22 11:30:00 +05:30
|
|
|
|
digits = (unsigned)snprintf(buf, sizeof(buf), "%u", (unsigned)smp_num_cpus);
|
|
|
|
|
if (1 < digits) {
|
|
|
|
|
if (5 < digits) error_exit(N_txt(FAIL_widecpu_txt));
|
|
|
|
|
Fieldstab[EU_CPN].width = digits;
|
|
|
|
|
}
|
|
|
|
|
digits = (unsigned)snprintf(buf, sizeof(buf), "%u", (unsigned)Numa_node_tot);
|
|
|
|
|
if (2 < digits) {
|
|
|
|
|
Fieldstab[EU_NMA].width = digits;
|
2012-09-19 11:31:01 +05:30
|
|
|
|
}
|
2018-01-25 11:30:00 +05:30
|
|
|
|
// and accommodate optional wider non-scalable columns (maybe)
|
2012-10-03 23:43:13 +05:30
|
|
|
|
if (!AUTOX_MODE) {
|
2014-02-25 11:30:00 +05:30
|
|
|
|
Fieldstab[EU_UED].width = Fieldstab[EU_URD].width
|
|
|
|
|
= Fieldstab[EU_USD].width = Fieldstab[EU_GID].width
|
2012-10-03 23:43:13 +05:30
|
|
|
|
= Rc.fixed_widest ? 5 + Rc.fixed_widest : 5;
|
2014-02-25 11:30:00 +05:30
|
|
|
|
Fieldstab[EU_UEN].width = Fieldstab[EU_URN].width
|
|
|
|
|
= Fieldstab[EU_USN].width = Fieldstab[EU_GRP].width
|
2012-10-03 23:43:13 +05:30
|
|
|
|
= Rc.fixed_widest ? 8 + Rc.fixed_widest : 8;
|
2015-06-13 10:30:00 +05:30
|
|
|
|
Fieldstab[EU_TTY].width = Fieldstab[EU_LXC].width
|
2012-10-03 23:43:13 +05:30
|
|
|
|
= Rc.fixed_widest ? 8 + Rc.fixed_widest : 8;
|
2014-02-25 11:30:00 +05:30
|
|
|
|
Fieldstab[EU_WCH].width
|
2012-10-03 23:43:13 +05:30
|
|
|
|
= Rc.fixed_widest ? 10 + Rc.fixed_widest : 10;
|
2014-02-25 11:30:00 +05:30
|
|
|
|
for (i = EU_NS1; i < EU_NS1 + NUM_NS; i++)
|
2013-11-11 11:30:00 +05:30
|
|
|
|
Fieldstab[i].width
|
|
|
|
|
= Rc.fixed_widest ? 10 + Rc.fixed_widest : 10;
|
2012-10-03 23:43:13 +05:30
|
|
|
|
}
|
2018-01-25 11:30:00 +05:30
|
|
|
|
#endif
|
2012-09-21 11:31:01 +05:30
|
|
|
|
|
top: provide the means to adjust scaled process memory
This commit is an unrequested outgrowth of the earlier
change dealing with summary area memory field scaling.
That user selectable scaling provision is now extended
to include 6 (at present) task oriented memory fields.
The new companion 'e' (lower case) interactive command
has been added and, like the 'E' command, it can cycle
each of the currently displayed memory columns between
KiB through TiB. There are, however, some differences.
Where '+' indicates summary area truncation at a given
radix, task memory fields are automatically scaled for
their column. Thus, not all rows use the same scaling.
And, while summary area field widths were not changed,
the task memory columns were widened in order to offer
more meaningful data when the radix was increased. The
precision is automatically increased in step with each
radix: MiB displays 2 decimal places, GiB 3 and TiB 4.
To compliment that additional precision, both the %CPU
and %MEM fields were widened by 1 column and now offer
precision up to 3 decimal places. But, unique to %CPU,
widening could already have occurred due to the number
of processors in some massively parallel boxes. At any
rate, total extra width for both memory and percentage
fields could amount to twenty (precious) columns more.
So for both the memory and % fields the original width
(along with loss of precision) can be restored via new
compiler conditionals which this commit also provides.
p.s. and it will be rcfile preserved for any restarts!
(now that we know a '.' + 2 spaces is squeezed to one)
(everything's perfectly justified, but it's just luck)
Reference(s):
http://www.freelists.org/post/procps/top-regression-reports
Signed-off-by: Jim Warner <james.warner@comcast.net>
2012-12-14 11:30:00 +05:30
|
|
|
|
/* plus user selectable scaling */
|
2014-02-25 11:30:00 +05:30
|
|
|
|
Fieldstab[EU_VRT].scale = Fieldstab[EU_SWP].scale
|
|
|
|
|
= Fieldstab[EU_RES].scale = Fieldstab[EU_COD].scale
|
|
|
|
|
= Fieldstab[EU_DAT].scale = Fieldstab[EU_SHR].scale
|
2016-04-13 10:30:00 +05:30
|
|
|
|
= Fieldstab[EU_USE].scale = Fieldstab[EU_RZA].scale
|
|
|
|
|
= Fieldstab[EU_RZF].scale = Fieldstab[EU_RZL].scale
|
|
|
|
|
= Fieldstab[EU_RZS].scale = Rc.task_mscale;
|
top: provide the means to adjust scaled process memory
This commit is an unrequested outgrowth of the earlier
change dealing with summary area memory field scaling.
That user selectable scaling provision is now extended
to include 6 (at present) task oriented memory fields.
The new companion 'e' (lower case) interactive command
has been added and, like the 'E' command, it can cycle
each of the currently displayed memory columns between
KiB through TiB. There are, however, some differences.
Where '+' indicates summary area truncation at a given
radix, task memory fields are automatically scaled for
their column. Thus, not all rows use the same scaling.
And, while summary area field widths were not changed,
the task memory columns were widened in order to offer
more meaningful data when the radix was increased. The
precision is automatically increased in step with each
radix: MiB displays 2 decimal places, GiB 3 and TiB 4.
To compliment that additional precision, both the %CPU
and %MEM fields were widened by 1 column and now offer
precision up to 3 decimal places. But, unique to %CPU,
widening could already have occurred due to the number
of processors in some massively parallel boxes. At any
rate, total extra width for both memory and percentage
fields could amount to twenty (precious) columns more.
So for both the memory and % fields the original width
(along with loss of precision) can be restored via new
compiler conditionals which this commit also provides.
p.s. and it will be rcfile preserved for any restarts!
(now that we know a '.' + 2 spaces is squeezed to one)
(everything's perfectly justified, but it's just luck)
Reference(s):
http://www.freelists.org/post/procps/top-regression-reports
Signed-off-by: Jim Warner <james.warner@comcast.net>
2012-12-14 11:30:00 +05:30
|
|
|
|
|
2011-08-30 17:35:45 +05:30
|
|
|
|
// lastly, ensure we've got proper column headers...
|
|
|
|
|
calibrate_fields();
|
2018-01-25 11:30:00 +05:30
|
|
|
|
#undef maX
|
2011-03-31 16:45:12 +05:30
|
|
|
|
} // end: zap_fieldstab
|
|
|
|
|
|
|
|
|
|
/*###### Library Interface #############################################*/
|
|
|
|
|
|
2002-05-30 09:14:46 +05:30
|
|
|
|
/*
|
2011-12-29 23:20:32 +05:30
|
|
|
|
* This guy's modeled on libproc's 'eight_cpu_numbers' function except
|
2002-12-05 04:18:30 +05:30
|
|
|
|
* we preserve all cpu data in our CPU_t array which is organized
|
2002-10-02 05:40:30 +05:30
|
|
|
|
* as follows:
|
2017-03-23 10:30:00 +05:30
|
|
|
|
* Cpu_tics[0] thru Cpu_tics[n] == tics for each separate cpu
|
|
|
|
|
* Cpu_tics[sumSLOT] == tics from /proc/stat line #1
|
|
|
|
|
* [ and beyond sumSLOT == tics for each cpu NUMA node ] */
|
|
|
|
|
static void cpus_refresh (void) {
|
2013-04-25 10:30:00 +05:30
|
|
|
|
#define sumSLOT ( smp_num_cpus )
|
|
|
|
|
#define totSLOT ( 1 + smp_num_cpus + Numa_node_tot)
|
2002-10-02 05:40:30 +05:30
|
|
|
|
static FILE *fp = NULL;
|
2013-04-14 10:30:00 +05:30
|
|
|
|
static int siz, sav_slot = -1;
|
|
|
|
|
static char *buf;
|
2013-11-09 11:30:00 +05:30
|
|
|
|
CPU_t *sum_ptr; // avoid gcc subscript bloat
|
2013-04-25 10:30:00 +05:30
|
|
|
|
int i, num, tot_read;
|
|
|
|
|
int node;
|
2013-04-14 10:30:00 +05:30
|
|
|
|
char *bp;
|
2011-03-31 16:45:12 +05:30
|
|
|
|
|
2011-05-05 15:37:25 +05:30
|
|
|
|
/*** hotplug_acclimated ***/
|
2013-04-08 12:30:00 +05:30
|
|
|
|
if (sav_slot != sumSLOT) {
|
|
|
|
|
sav_slot = sumSLOT;
|
2011-03-31 16:45:12 +05:30
|
|
|
|
zap_fieldstab();
|
|
|
|
|
if (fp) { fclose(fp); fp = NULL; }
|
2017-03-23 10:30:00 +05:30
|
|
|
|
if (Cpu_tics) free(Cpu_tics);
|
2011-03-31 16:45:12 +05:30
|
|
|
|
}
|
2002-10-02 05:40:30 +05:30
|
|
|
|
|
2002-11-08 06:01:28 +05:30
|
|
|
|
/* by opening this file once, we'll avoid the hit on minor page faults
|
|
|
|
|
(sorry Linux, but you'll have to close it for us) */
|
2002-10-02 05:40:30 +05:30
|
|
|
|
if (!fp) {
|
|
|
|
|
if (!(fp = fopen("/proc/stat", "r")))
|
2011-10-12 00:32:59 +05:30
|
|
|
|
error_exit(fmtmk(N_fmt(FAIL_statopn_fmt), strerror(errno)));
|
2013-04-08 12:30:00 +05:30
|
|
|
|
/* note: we allocate one more CPU_t via totSLOT than 'cpus' so that a
|
|
|
|
|
slot can hold tics representing the /proc/stat cpu summary */
|
2017-03-23 10:30:00 +05:30
|
|
|
|
Cpu_tics = alloc_c(totSLOT * sizeof(CPU_t));
|
2002-10-02 05:40:30 +05:30
|
|
|
|
}
|
|
|
|
|
rewind(fp);
|
|
|
|
|
fflush(fp);
|
|
|
|
|
|
2020-06-26 10:30:00 +05:30
|
|
|
|
#define buffGRW 8192
|
2013-04-14 10:30:00 +05:30
|
|
|
|
/* we slurp in the entire directory thus avoiding repeated calls to fgets,
|
|
|
|
|
especially in a massively parallel environment. additionally, each cpu
|
|
|
|
|
line is then frozen in time rather than changing until we get around to
|
|
|
|
|
accessing it. this helps to minimize (not eliminate) most distortions. */
|
|
|
|
|
tot_read = 0;
|
|
|
|
|
if (buf) buf[0] = '\0';
|
|
|
|
|
else buf = alloc_c((siz = buffGRW));
|
|
|
|
|
while (0 < (num = fread(buf + tot_read, 1, (siz - tot_read), fp))) {
|
|
|
|
|
tot_read += num;
|
|
|
|
|
if (tot_read < siz) break;
|
|
|
|
|
buf = alloc_r(buf, (siz += buffGRW));
|
|
|
|
|
};
|
|
|
|
|
buf[tot_read] = '\0';
|
|
|
|
|
bp = buf;
|
|
|
|
|
#undef buffGRW
|
|
|
|
|
|
2012-02-01 11:30:00 +05:30
|
|
|
|
// remember from last time around
|
2017-03-23 10:30:00 +05:30
|
|
|
|
sum_ptr = &Cpu_tics[sumSLOT];
|
2013-11-09 11:30:00 +05:30
|
|
|
|
memcpy(&sum_ptr->sav, &sum_ptr->cur, sizeof(CT_t));
|
2012-02-01 11:30:00 +05:30
|
|
|
|
// then value the last slot with the cpu summary line
|
2016-03-03 16:13:52 +05:30
|
|
|
|
if (4 > sscanf(bp, "cpu %llu %llu %llu %llu %llu %llu %llu %llu"
|
2013-11-09 11:30:00 +05:30
|
|
|
|
, &sum_ptr->cur.u, &sum_ptr->cur.n, &sum_ptr->cur.s
|
|
|
|
|
, &sum_ptr->cur.i, &sum_ptr->cur.w, &sum_ptr->cur.x
|
|
|
|
|
, &sum_ptr->cur.y, &sum_ptr->cur.z))
|
2011-10-12 00:32:59 +05:30
|
|
|
|
error_exit(N_txt(FAIL_statget_txt));
|
2012-02-11 02:45:15 +05:30
|
|
|
|
#ifndef CPU_ZEROTICS
|
2013-11-09 11:30:00 +05:30
|
|
|
|
sum_ptr->cur.tot = sum_ptr->cur.u + sum_ptr->cur.s
|
|
|
|
|
+ sum_ptr->cur.n + sum_ptr->cur.i + sum_ptr->cur.w
|
|
|
|
|
+ sum_ptr->cur.x + sum_ptr->cur.y + sum_ptr->cur.z;
|
2012-02-11 02:45:15 +05:30
|
|
|
|
/* if a cpu has registered substantially fewer tics than those expected,
|
|
|
|
|
we'll force it to be treated as 'idle' so as not to present misleading
|
|
|
|
|
percentages. */
|
2013-11-09 11:30:00 +05:30
|
|
|
|
sum_ptr->edge =
|
|
|
|
|
((sum_ptr->cur.tot - sum_ptr->sav.tot) / smp_num_cpus) / (100 / TICS_EDGE);
|
2013-04-08 12:30:00 +05:30
|
|
|
|
#endif
|
|
|
|
|
|
2013-11-08 11:30:00 +05:30
|
|
|
|
// forget all of the prior node statistics (maybe)
|
2017-05-13 10:33:00 +05:30
|
|
|
|
if (CHKw(Curwin, View_CPUNOD) && Numa_node_tot)
|
2013-11-09 11:30:00 +05:30
|
|
|
|
memset(sum_ptr + 1, 0, Numa_node_tot * sizeof(CPU_t));
|
2013-04-08 12:30:00 +05:30
|
|
|
|
|
|
|
|
|
// now value each separate cpu's tics...
|
|
|
|
|
for (i = 0; i < sumSLOT; i++) {
|
2017-03-23 10:30:00 +05:30
|
|
|
|
CPU_t *cpu_ptr = &Cpu_tics[i]; // avoid gcc subscript bloat
|
2020-05-24 10:30:00 +05:30
|
|
|
|
#ifdef PRETEND48CPU
|
2020-05-30 10:30:00 +05:30
|
|
|
|
int j;
|
|
|
|
|
if (i == 0) j = 0; else ++j;
|
|
|
|
|
if (j >= Cpu_true_tot) { bp = buf; j = 0; }
|
2011-03-31 16:45:12 +05:30
|
|
|
|
#endif
|
2013-04-14 10:30:00 +05:30
|
|
|
|
bp = 1 + strchr(bp, '\n');
|
2012-02-01 11:30:00 +05:30
|
|
|
|
// remember from last time around
|
2013-11-09 11:30:00 +05:30
|
|
|
|
memcpy(&cpu_ptr->sav, &cpu_ptr->cur, sizeof(CT_t));
|
2016-03-03 16:13:52 +05:30
|
|
|
|
if (4 > sscanf(bp, "cpu%d %llu %llu %llu %llu %llu %llu %llu %llu", &cpu_ptr->id
|
2013-11-09 11:30:00 +05:30
|
|
|
|
, &cpu_ptr->cur.u, &cpu_ptr->cur.n, &cpu_ptr->cur.s
|
|
|
|
|
, &cpu_ptr->cur.i, &cpu_ptr->cur.w, &cpu_ptr->cur.x
|
|
|
|
|
, &cpu_ptr->cur.y, &cpu_ptr->cur.z)) {
|
2012-02-01 11:30:00 +05:30
|
|
|
|
break; // tolerate cpus taken offline
|
2011-03-31 16:45:12 +05:30
|
|
|
|
}
|
2013-04-08 12:30:00 +05:30
|
|
|
|
|
2012-02-07 11:29:59 +05:30
|
|
|
|
#ifndef CPU_ZEROTICS
|
2013-11-09 11:30:00 +05:30
|
|
|
|
cpu_ptr->edge = sum_ptr->edge;
|
2012-02-11 02:45:15 +05:30
|
|
|
|
#endif
|
2020-05-24 10:30:00 +05:30
|
|
|
|
#ifdef PRETEND48CPU
|
2013-11-09 11:30:00 +05:30
|
|
|
|
cpu_ptr->id = i;
|
2013-04-08 12:30:00 +05:30
|
|
|
|
#endif
|
2013-11-08 11:30:00 +05:30
|
|
|
|
/* henceforth, with just a little more arithmetic we can avoid
|
|
|
|
|
maintaining *any* node stats unless they're actually needed */
|
|
|
|
|
if (CHKw(Curwin, View_CPUNOD)
|
|
|
|
|
&& Numa_node_tot
|
2017-05-13 10:33:00 +05:30
|
|
|
|
&& -1 < (node = numa_node_of_cpu(cpu_ptr->id))) {
|
2013-11-08 11:30:00 +05:30
|
|
|
|
// use our own pointer to avoid gcc subscript bloat
|
2013-11-09 11:30:00 +05:30
|
|
|
|
CPU_t *nod_ptr = sum_ptr + 1 + node;
|
|
|
|
|
nod_ptr->cur.u += cpu_ptr->cur.u; nod_ptr->sav.u += cpu_ptr->sav.u;
|
|
|
|
|
nod_ptr->cur.n += cpu_ptr->cur.n; nod_ptr->sav.n += cpu_ptr->sav.n;
|
|
|
|
|
nod_ptr->cur.s += cpu_ptr->cur.s; nod_ptr->sav.s += cpu_ptr->sav.s;
|
|
|
|
|
nod_ptr->cur.i += cpu_ptr->cur.i; nod_ptr->sav.i += cpu_ptr->sav.i;
|
|
|
|
|
nod_ptr->cur.w += cpu_ptr->cur.w; nod_ptr->sav.w += cpu_ptr->sav.w;
|
|
|
|
|
nod_ptr->cur.x += cpu_ptr->cur.x; nod_ptr->sav.x += cpu_ptr->sav.x;
|
|
|
|
|
nod_ptr->cur.y += cpu_ptr->cur.y; nod_ptr->sav.y += cpu_ptr->sav.y;
|
|
|
|
|
nod_ptr->cur.z += cpu_ptr->cur.z; nod_ptr->sav.z += cpu_ptr->sav.z;
|
2013-11-08 11:30:00 +05:30
|
|
|
|
#ifndef CPU_ZEROTICS
|
|
|
|
|
/* yep, we re-value this repeatedly for each cpu encountered, but we
|
|
|
|
|
can then avoid a prior loop to selectively initialize each node */
|
2013-11-09 11:30:00 +05:30
|
|
|
|
nod_ptr->edge = sum_ptr->edge;
|
2013-11-08 11:30:00 +05:30
|
|
|
|
#endif
|
2013-11-09 11:30:00 +05:30
|
|
|
|
cpu_ptr->node = node;
|
2014-01-05 11:30:00 +05:30
|
|
|
|
#ifndef OFF_NUMASKIP
|
|
|
|
|
nod_ptr->id = -1;
|
|
|
|
|
#endif
|
2013-04-08 12:30:00 +05:30
|
|
|
|
}
|
2013-11-08 11:30:00 +05:30
|
|
|
|
} // end: for each cpu
|
2013-04-08 12:30:00 +05:30
|
|
|
|
|
2012-02-01 11:30:00 +05:30
|
|
|
|
Cpu_faux_tot = i; // tolerate cpus taken offline
|
2013-04-08 12:30:00 +05:30
|
|
|
|
#undef sumSLOT
|
|
|
|
|
#undef totSLOT
|
2011-03-31 16:45:12 +05:30
|
|
|
|
} // end: cpus_refresh
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
#ifdef OFF_HST_HASH
|
|
|
|
|
/*
|
|
|
|
|
* Binary Search for HST_t's put/get support */
|
|
|
|
|
|
|
|
|
|
static inline HST_t *hstbsrch (HST_t *hst, int max, int pid) {
|
|
|
|
|
int mid, min = 0;
|
|
|
|
|
|
|
|
|
|
while (min <= max) {
|
|
|
|
|
mid = (min + max) / 2;
|
|
|
|
|
if (pid < hst[mid].pid) max = mid - 1;
|
|
|
|
|
else if (pid > hst[mid].pid) min = mid + 1;
|
|
|
|
|
else return &hst[mid];
|
|
|
|
|
}
|
|
|
|
|
return NULL;
|
|
|
|
|
} // end: hstbsrch
|
|
|
|
|
|
|
|
|
|
#else
|
|
|
|
|
/*
|
|
|
|
|
* Hashing functions for HST_t's put/get support
|
|
|
|
|
* (not your normal 'chaining', those damn HST_t's might move!) */
|
|
|
|
|
|
|
|
|
|
#define _HASH_(K) (K & (HHASH_SIZ - 1))
|
|
|
|
|
|
|
|
|
|
static inline HST_t *hstget (int pid) {
|
|
|
|
|
int V = PHash_sav[_HASH_(pid)];
|
2002-10-02 05:40:30 +05:30
|
|
|
|
|
2011-03-31 16:45:12 +05:30
|
|
|
|
while (-1 < V) {
|
|
|
|
|
if (PHist_sav[V].pid == pid) return &PHist_sav[V];
|
|
|
|
|
V = PHist_sav[V].lnk; }
|
|
|
|
|
return NULL;
|
|
|
|
|
} // end: hstget
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
static inline void hstput (unsigned idx) {
|
|
|
|
|
int V = _HASH_(PHist_new[idx].pid);
|
|
|
|
|
|
|
|
|
|
PHist_new[idx].lnk = PHash_new[V];
|
|
|
|
|
PHash_new[V] = idx;
|
|
|
|
|
} // end: hstput
|
|
|
|
|
|
|
|
|
|
#undef _HASH_
|
|
|
|
|
#endif
|
2002-10-02 05:40:30 +05:30
|
|
|
|
|
2002-11-08 06:01:28 +05:30
|
|
|
|
/*
|
|
|
|
|
* Refresh procs *Helper* function to eliminate yet one more need
|
|
|
|
|
* to loop through our darn proc_t table. He's responsible for:
|
|
|
|
|
* 1) calculating the elapsed time since the previous frame
|
|
|
|
|
* 2) counting the number of tasks in each state (run, sleep, etc)
|
2002-12-05 04:18:30 +05:30
|
|
|
|
* 3) maintaining the HST_t's and priming the proc_t pcpu field
|
2002-11-08 06:01:28 +05:30
|
|
|
|
* 4) establishing the total number tasks for this frame */
|
2012-02-07 22:41:11 +05:30
|
|
|
|
static void procs_hlp (proc_t *this) {
|
2011-06-23 19:15:09 +05:30
|
|
|
|
#ifdef OFF_HST_HASH
|
2011-03-31 16:45:12 +05:30
|
|
|
|
static unsigned maxt_sav = 0; // prior frame's max tasks
|
2011-06-23 19:15:09 +05:30
|
|
|
|
#endif
|
2002-12-05 04:18:30 +05:30
|
|
|
|
TIC_t tics;
|
2011-03-31 16:45:12 +05:30
|
|
|
|
HST_t *h;
|
2002-11-08 06:01:28 +05:30
|
|
|
|
|
2011-03-31 16:45:12 +05:30
|
|
|
|
if (!this) {
|
top: protect against distortion when system time reset
If a system's time is adjusted backwards, then elapsed
time could appear as negative. This yielded a negative
%CPU value. Alternately if zeros were suppressed ('0')
the result was a blank %CPU column. In both cases that
distortion would last for one display cycle or until a
user forced a display refresh via some keyboard input.
The original recommendation was trading gettimeofday()
for clock_gettime() using CLOCK_MONOTONIC. But on some
systems that might not be possible, forcing the use of
CLOCK_REALTIME instead. Not only would that complicate
the build system, but it may leave us with minus %CPU.
Another approach was to ensure that elapsed time could
never be negative. Of course, this produced distortion
of %CPU values but it would be proportionally correct.
This wasn't dissimilar to a distortion already present
should the time be adjusted forward or backward within
any 'remaining' top delay intervals. These aberrations
would be avoided with clock_gettime & CLOCK_MONOTONIC,
but that is a less than ideal solution as noted above.
This final solution, which originated down under, will
simply rely on the /proc/uptime seconds, which will be
immune to *any* tampering with the system clock. Thus,
we now have a fix for the distortion we didn't know we
suffered plus a negative %CPU that began this odyssey.
Thanks to:
sk.alvin.x@gmail.com, for the original effort
jcapik@redhat.com, for a heads up on CLOCK_MONOTONIC
csmall-procps@enc.com.au, for the best suggestion of all
Reference(s):
. original post/patch
http://www.freelists.org/post/procps/PATCH-top-use-clock-gettime-instead-of-gettimeofday
. heads up on CLOCK_MONOTONIC
http://www.freelists.org/post/procps/PATCH-top-use-clock-gettime-instead-of-gettimeofday,2
. the final solution
http://www.freelists.org/post/procps/PATCH-top-use-clock-gettime-instead-of-gettimeofday,11
Signed-off-by: Jim Warner <james.warner@comcast.net>
2014-04-25 10:30:00 +05:30
|
|
|
|
static double uptime_sav;
|
|
|
|
|
double uptime_cur;
|
2002-11-08 06:01:28 +05:30
|
|
|
|
float et;
|
2011-03-31 16:45:12 +05:30
|
|
|
|
void *v;
|
2002-11-08 06:01:28 +05:30
|
|
|
|
|
top: protect against distortion when system time reset
If a system's time is adjusted backwards, then elapsed
time could appear as negative. This yielded a negative
%CPU value. Alternately if zeros were suppressed ('0')
the result was a blank %CPU column. In both cases that
distortion would last for one display cycle or until a
user forced a display refresh via some keyboard input.
The original recommendation was trading gettimeofday()
for clock_gettime() using CLOCK_MONOTONIC. But on some
systems that might not be possible, forcing the use of
CLOCK_REALTIME instead. Not only would that complicate
the build system, but it may leave us with minus %CPU.
Another approach was to ensure that elapsed time could
never be negative. Of course, this produced distortion
of %CPU values but it would be proportionally correct.
This wasn't dissimilar to a distortion already present
should the time be adjusted forward or backward within
any 'remaining' top delay intervals. These aberrations
would be avoided with clock_gettime & CLOCK_MONOTONIC,
but that is a less than ideal solution as noted above.
This final solution, which originated down under, will
simply rely on the /proc/uptime seconds, which will be
immune to *any* tampering with the system clock. Thus,
we now have a fix for the distortion we didn't know we
suffered plus a negative %CPU that began this odyssey.
Thanks to:
sk.alvin.x@gmail.com, for the original effort
jcapik@redhat.com, for a heads up on CLOCK_MONOTONIC
csmall-procps@enc.com.au, for the best suggestion of all
Reference(s):
. original post/patch
http://www.freelists.org/post/procps/PATCH-top-use-clock-gettime-instead-of-gettimeofday
. heads up on CLOCK_MONOTONIC
http://www.freelists.org/post/procps/PATCH-top-use-clock-gettime-instead-of-gettimeofday,2
. the final solution
http://www.freelists.org/post/procps/PATCH-top-use-clock-gettime-instead-of-gettimeofday,11
Signed-off-by: Jim Warner <james.warner@comcast.net>
2014-04-25 10:30:00 +05:30
|
|
|
|
uptime(&uptime_cur, NULL);
|
|
|
|
|
et = uptime_cur - uptime_sav;
|
2014-04-27 10:30:00 +05:30
|
|
|
|
if (et < 0.01) et = 0.005;
|
top: protect against distortion when system time reset
If a system's time is adjusted backwards, then elapsed
time could appear as negative. This yielded a negative
%CPU value. Alternately if zeros were suppressed ('0')
the result was a blank %CPU column. In both cases that
distortion would last for one display cycle or until a
user forced a display refresh via some keyboard input.
The original recommendation was trading gettimeofday()
for clock_gettime() using CLOCK_MONOTONIC. But on some
systems that might not be possible, forcing the use of
CLOCK_REALTIME instead. Not only would that complicate
the build system, but it may leave us with minus %CPU.
Another approach was to ensure that elapsed time could
never be negative. Of course, this produced distortion
of %CPU values but it would be proportionally correct.
This wasn't dissimilar to a distortion already present
should the time be adjusted forward or backward within
any 'remaining' top delay intervals. These aberrations
would be avoided with clock_gettime & CLOCK_MONOTONIC,
but that is a less than ideal solution as noted above.
This final solution, which originated down under, will
simply rely on the /proc/uptime seconds, which will be
immune to *any* tampering with the system clock. Thus,
we now have a fix for the distortion we didn't know we
suffered plus a negative %CPU that began this odyssey.
Thanks to:
sk.alvin.x@gmail.com, for the original effort
jcapik@redhat.com, for a heads up on CLOCK_MONOTONIC
csmall-procps@enc.com.au, for the best suggestion of all
Reference(s):
. original post/patch
http://www.freelists.org/post/procps/PATCH-top-use-clock-gettime-instead-of-gettimeofday
. heads up on CLOCK_MONOTONIC
http://www.freelists.org/post/procps/PATCH-top-use-clock-gettime-instead-of-gettimeofday,2
. the final solution
http://www.freelists.org/post/procps/PATCH-top-use-clock-gettime-instead-of-gettimeofday,11
Signed-off-by: Jim Warner <james.warner@comcast.net>
2014-04-25 10:30:00 +05:30
|
|
|
|
uptime_sav = uptime_cur;
|
2002-11-08 06:01:28 +05:30
|
|
|
|
|
|
|
|
|
// if in Solaris mode, adjust our scaling for all cpus
|
2012-02-01 11:30:00 +05:30
|
|
|
|
Frame_etscale = 100.0f / ((float)Hertz * (float)et * (Rc.mode_irixps ? 1 : smp_num_cpus));
|
2011-06-23 19:15:09 +05:30
|
|
|
|
#ifdef OFF_HST_HASH
|
2002-11-08 06:01:28 +05:30
|
|
|
|
maxt_sav = Frame_maxtask;
|
2011-06-23 19:15:09 +05:30
|
|
|
|
#endif
|
2002-11-08 06:01:28 +05:30
|
|
|
|
Frame_maxtask = Frame_running = Frame_sleepin = Frame_stopped = Frame_zombied = 0;
|
|
|
|
|
|
2011-03-31 16:45:12 +05:30
|
|
|
|
// prep for saving this frame's HST_t's (and reuse mem each time around)
|
|
|
|
|
v = PHist_sav;
|
|
|
|
|
PHist_sav = PHist_new;
|
|
|
|
|
PHist_new = v;
|
|
|
|
|
#ifdef OFF_HST_HASH
|
|
|
|
|
// prep for binary search by sorting the last frame's HST_t's
|
|
|
|
|
qsort(PHist_sav, maxt_sav, sizeof(HST_t), (QFP_t)sort_HST_t);
|
|
|
|
|
#else
|
|
|
|
|
v = PHash_sav;
|
|
|
|
|
PHash_sav = PHash_new;
|
|
|
|
|
PHash_new = v;
|
|
|
|
|
memcpy(PHash_new, HHash_nul, sizeof(HHash_nul));
|
|
|
|
|
#endif
|
2002-11-08 06:01:28 +05:30
|
|
|
|
return;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
switch (this->state) {
|
|
|
|
|
case 'R':
|
|
|
|
|
Frame_running++;
|
|
|
|
|
break;
|
2018-01-13 11:30:00 +05:30
|
|
|
|
case 't': // 't' (tracing stop)
|
2002-11-08 06:01:28 +05:30
|
|
|
|
case 'T':
|
|
|
|
|
Frame_stopped++;
|
|
|
|
|
break;
|
|
|
|
|
case 'Z':
|
|
|
|
|
Frame_zombied++;
|
|
|
|
|
break;
|
2018-01-13 11:30:00 +05:30
|
|
|
|
default:
|
|
|
|
|
/* currently: 'D' (disk sleep),
|
|
|
|
|
'I' (idle),
|
|
|
|
|
'P' (parked),
|
|
|
|
|
'S' (sleeping),
|
|
|
|
|
'X' (dead - actually 'dying' & probably never seen)
|
|
|
|
|
*/
|
|
|
|
|
Frame_sleepin++;
|
2011-03-31 16:45:12 +05:30
|
|
|
|
break;
|
2002-11-08 06:01:28 +05:30
|
|
|
|
}
|
|
|
|
|
|
2011-03-31 16:45:12 +05:30
|
|
|
|
if (Frame_maxtask+1 >= HHist_siz) {
|
2018-05-18 10:30:00 +05:30
|
|
|
|
/* we're subject to integer overflow if total linux tasks ever approach |
|
|
|
|
|
400+ million (but, do you think memory might be the bigger problem?) | */
|
2018-05-18 10:30:00 +05:30
|
|
|
|
HHist_siz = HHist_siz * 5 / 4 + 100;
|
2011-12-20 19:53:37 +05:30
|
|
|
|
PHist_sav = alloc_r(PHist_sav, sizeof(HST_t) * HHist_siz);
|
|
|
|
|
PHist_new = alloc_r(PHist_new, sizeof(HST_t) * HHist_siz);
|
2002-11-08 06:01:28 +05:30
|
|
|
|
}
|
2011-03-31 16:45:12 +05:30
|
|
|
|
|
2002-11-08 06:01:28 +05:30
|
|
|
|
/* calculate time in this process; the sum of user time (utime) and
|
|
|
|
|
system time (stime) -- but PLEASE dont waste time and effort on
|
|
|
|
|
calcs and saves that go unused, like the old top! */
|
2011-03-31 16:45:12 +05:30
|
|
|
|
PHist_new[Frame_maxtask].pid = this->tid;
|
|
|
|
|
PHist_new[Frame_maxtask].tics = tics = (this->utime + this->stime);
|
2012-07-08 14:32:58 +05:30
|
|
|
|
// finally, save major/minor fault counts in case the deltas are displayable
|
|
|
|
|
PHist_new[Frame_maxtask].maj = this->maj_flt;
|
|
|
|
|
PHist_new[Frame_maxtask].min = this->min_flt;
|
2002-11-25 03:34:03 +05:30
|
|
|
|
|
2011-03-31 16:45:12 +05:30
|
|
|
|
#ifdef OFF_HST_HASH
|
2012-07-08 14:32:58 +05:30
|
|
|
|
// find matching entry from previous frame and make stuff elapsed
|
|
|
|
|
if ((h = hstbsrch(PHist_sav, maxt_sav - 1, this->tid))) {
|
|
|
|
|
tics -= h->tics;
|
|
|
|
|
this->maj_delta = this->maj_flt - h->maj;
|
|
|
|
|
this->min_delta = this->min_flt - h->min;
|
|
|
|
|
}
|
2002-12-15 03:00:58 +05:30
|
|
|
|
#else
|
2011-03-31 16:45:12 +05:30
|
|
|
|
// hash & save for the next frame
|
|
|
|
|
hstput(Frame_maxtask);
|
2012-07-08 14:32:58 +05:30
|
|
|
|
// find matching entry from previous frame and make stuff elapsed
|
|
|
|
|
if ((h = hstget(this->tid))) {
|
|
|
|
|
tics -= h->tics;
|
|
|
|
|
this->maj_delta = this->maj_flt - h->maj;
|
|
|
|
|
this->min_delta = this->min_flt - h->min;
|
|
|
|
|
}
|
2002-12-15 03:00:58 +05:30
|
|
|
|
#endif
|
|
|
|
|
|
2011-03-31 16:45:12 +05:30
|
|
|
|
/* we're just saving elapsed tics, to be converted into %cpu if
|
|
|
|
|
this task wins it's displayable screen row lottery... */
|
2002-11-08 06:01:28 +05:30
|
|
|
|
this->pcpu = tics;
|
2011-03-31 16:45:12 +05:30
|
|
|
|
|
2002-11-08 06:01:28 +05:30
|
|
|
|
// shout this to the world with the final call (or us the next time in)
|
|
|
|
|
Frame_maxtask++;
|
2012-02-07 22:41:11 +05:30
|
|
|
|
} // end: procs_hlp
|
2002-11-08 06:01:28 +05:30
|
|
|
|
|
|
|
|
|
|
2002-10-02 05:40:30 +05:30
|
|
|
|
/*
|
|
|
|
|
* This guy's modeled on libproc's 'readproctab' function except
|
2002-06-19 05:15:30 +05:30
|
|
|
|
* we reuse and extend any prior proc_t's. He's been customized
|
|
|
|
|
* for our specific needs and to avoid the use of <stdarg.h> */
|
2011-08-30 17:35:45 +05:30
|
|
|
|
static void procs_refresh (void) {
|
2012-02-07 22:41:11 +05:30
|
|
|
|
#define n_used Frame_maxtask // maintained by procs_hlp()
|
2011-11-17 22:01:07 +05:30
|
|
|
|
static proc_t **private_ppt; // our base proc_t ptr table
|
|
|
|
|
static int n_alloc = 0; // size of our private_ppt
|
|
|
|
|
static int n_saved = 0; // last window ppt size
|
|
|
|
|
proc_t *ptask;
|
2002-06-19 05:15:30 +05:30
|
|
|
|
PROCTAB* PT;
|
2011-08-30 17:35:45 +05:30
|
|
|
|
int i;
|
2018-08-08 10:30:00 +05:30
|
|
|
|
proc_t *(*read_something)(PROCTAB*, proc_t *);
|
2002-06-19 05:15:30 +05:30
|
|
|
|
|
2012-02-07 22:41:11 +05:30
|
|
|
|
procs_hlp(NULL); // prep for a new frame
|
2011-03-31 16:45:12 +05:30
|
|
|
|
if (NULL == (PT = openproc(Frames_libflags, Monpids)))
|
2011-10-14 22:15:44 +05:30
|
|
|
|
error_exit(fmtmk(N_fmt(FAIL_openlib_fmt), strerror(errno)));
|
2011-08-11 03:12:14 +05:30
|
|
|
|
read_something = Thread_mode ? readeither : readproc;
|
2002-06-19 05:15:30 +05:30
|
|
|
|
|
2011-11-17 22:01:07 +05:30
|
|
|
|
for (;;) {
|
|
|
|
|
if (n_used == n_alloc) {
|
2018-05-18 10:30:00 +05:30
|
|
|
|
/* we're subject to integer overflow if total linux tasks ever approach |
|
|
|
|
|
400+ million (but, do you think memory might be the bigger problem?) | */
|
2018-05-18 10:30:00 +05:30
|
|
|
|
n_alloc = 10 + ((n_alloc * 5) / 4); // grow by over 25%
|
2018-08-08 10:30:00 +05:30
|
|
|
|
private_ppt = alloc_r(private_ppt, sizeof(proc_t *) * n_alloc);
|
2011-11-17 22:01:07 +05:30
|
|
|
|
// ensure NULL pointers for the additional memory just acquired
|
2018-08-08 10:30:00 +05:30
|
|
|
|
memset(private_ppt + n_used, 0, sizeof(proc_t *) * (n_alloc - n_used));
|
2002-11-08 06:01:28 +05:30
|
|
|
|
}
|
2011-11-17 22:01:07 +05:30
|
|
|
|
// on the way to n_alloc, the library will allocate the underlying
|
|
|
|
|
// proc_t storage whenever our private_ppt[] pointer is NULL...
|
|
|
|
|
if (!(ptask = read_something(PT, private_ppt[n_used]))) break;
|
2012-02-07 22:41:11 +05:30
|
|
|
|
procs_hlp((private_ppt[n_used] = ptask)); // tally this proc_t
|
2002-06-19 05:15:30 +05:30
|
|
|
|
}
|
2011-08-11 03:12:14 +05:30
|
|
|
|
|
2002-06-19 05:15:30 +05:30
|
|
|
|
closeproc(PT);
|
|
|
|
|
|
2011-08-30 17:35:45 +05:30
|
|
|
|
// lastly, refresh each window's proc pointers table...
|
2011-11-17 22:01:07 +05:30
|
|
|
|
if (n_saved == n_alloc)
|
|
|
|
|
for (i = 0; i < GROUPSMAX; i++)
|
2018-08-08 10:30:00 +05:30
|
|
|
|
memcpy(Winstk[i].ppt, private_ppt, sizeof(proc_t *) * n_used);
|
2011-11-17 22:01:07 +05:30
|
|
|
|
else {
|
|
|
|
|
n_saved = n_alloc;
|
|
|
|
|
for (i = 0; i < GROUPSMAX; i++) {
|
2018-08-08 10:30:00 +05:30
|
|
|
|
Winstk[i].ppt = alloc_r(Winstk[i].ppt, sizeof(proc_t *) * n_alloc);
|
|
|
|
|
memcpy(Winstk[i].ppt, private_ppt, sizeof(proc_t *) * n_used);
|
2011-11-17 22:01:07 +05:30
|
|
|
|
}
|
2002-06-19 05:15:30 +05:30
|
|
|
|
}
|
2011-11-17 22:01:07 +05:30
|
|
|
|
#undef n_used
|
2011-03-31 16:45:12 +05:30
|
|
|
|
} // end: procs_refresh
|
2011-07-14 16:46:02 +05:30
|
|
|
|
|
|
|
|
|
|
|
|
|
|
/*
|
|
|
|
|
* This serves as our interface to the memory & cpu count (sysinfo)
|
|
|
|
|
* portion of libproc. In support of those hotpluggable resources,
|
2014-05-27 10:30:00 +05:30
|
|
|
|
* the sampling frequencies are reduced so as to minimize overhead. */
|
2011-07-14 16:46:02 +05:30
|
|
|
|
static void sysinfo_refresh (int forced) {
|
2016-06-01 10:30:00 +05:30
|
|
|
|
static time_t sav_secs;
|
2011-07-14 16:46:02 +05:30
|
|
|
|
time_t cur_secs;
|
|
|
|
|
|
|
|
|
|
if (forced)
|
2016-06-01 10:30:00 +05:30
|
|
|
|
sav_secs = 0;
|
2016-04-26 10:30:00 +05:30
|
|
|
|
cur_secs = time(NULL);
|
2011-07-14 16:46:02 +05:30
|
|
|
|
|
2011-08-17 16:31:35 +05:30
|
|
|
|
/*** hotplug_acclimated ***/
|
2016-06-01 10:30:00 +05:30
|
|
|
|
if (3 <= cur_secs - sav_secs) {
|
2011-07-14 16:46:02 +05:30
|
|
|
|
meminfo();
|
2020-05-24 10:30:00 +05:30
|
|
|
|
#ifndef PRETEND48CPU
|
2011-07-14 16:46:02 +05:30
|
|
|
|
cpuinfo();
|
|
|
|
|
#endif
|
2017-05-13 10:33:00 +05:30
|
|
|
|
Numa_node_tot = numa_max_node() + 1;
|
2016-06-01 10:30:00 +05:30
|
|
|
|
sav_secs = cur_secs;
|
|
|
|
|
}
|
2011-07-14 16:46:02 +05:30
|
|
|
|
} // end: sysinfo_refresh
|
2011-03-31 16:45:12 +05:30
|
|
|
|
|
top: add a flexible 'Inspect' capability
This commit introduces an extremely powerful, flexible
brand new capability. Now, users can pause the normal
iterative display and inspect the contents of any file
or output from any script, command, or even pipelines.
It's invoked via the 'Y' interactive command which, in
turn, is supported with simple user supplied additions
as new entries in the top personal configuration file.
A separate new 'Inspect' window supports scrolling and
searching, similar to the main top display. Except it
extends existing 'L'/'&' (locate/locate-next) commands
so that an out-of-view match automatically adjusts the
horizontal position bringing such data into view. And
it provides for multiple successive same line matches.
Also, the basic 'more/less' navigation keys are active
in this new 'Inspect' window, to ease user transition.
There are no program changes required when entries are
added to or deleted from the rcfile. And there are no
known limits to the complexity of a script, command or
pipeline, other than the unidirectional nature imposed
by the 'popen' function call which top cannot violate.
Since it's impossible to predict exactly what contents
will be generated, top treats all output as raw binary
data. Any control characters display in '^C' notation
while all other unprintable characters show as '<AB>'.
The biggest problem encountered was with the find/next
capability since that strstr guy was really diminished
given the possibility that numerous 'strings' could be
encountered *within* many of top's raw, binary 'rows'.
Oh, and another problem was in maintaining the perfect
left & right text justification of this commit message
along with all of the commit summaries. Some of those
summaries (like this very one) are of course, slightly
shorter, to make room for the 'man document' addition.
Enjoy!
Signed-off-by: Jim Warner <james.warner@comcast.net>
2012-11-25 10:30:05 +05:30
|
|
|
|
/*###### Inspect Other Output ##########################################*/
|
|
|
|
|
|
|
|
|
|
/*
|
|
|
|
|
* HOWTO Extend the top 'inspect' functionality:
|
|
|
|
|
*
|
|
|
|
|
* To exploit the 'Y' interactive command, one must add entries to
|
|
|
|
|
* the top personal configuration file. Such entries simply reflect
|
|
|
|
|
* a file to be read or command/pipeline to be executed whose results
|
|
|
|
|
* will then be displayed in a separate scrollable window.
|
|
|
|
|
*
|
|
|
|
|
* Entries beginning with a '#' character are ignored, regardless of
|
|
|
|
|
* content. Otherwise they consist of the following 3 elements, each
|
|
|
|
|
* of which must be separated by a tab character (thus 2 '\t' total):
|
|
|
|
|
* type: literal 'file' or 'pipe'
|
|
|
|
|
* name: selection shown on the Inspect screen
|
|
|
|
|
* fmts: string representing a path or command
|
|
|
|
|
*
|
|
|
|
|
* The two types of Inspect entries are not interchangeable.
|
|
|
|
|
* Those designated 'file' will be accessed using fopen/fread and must
|
|
|
|
|
* reference a single file in the 'fmts' element. Entries specifying
|
|
|
|
|
* 'pipe' will employ popen/fread, their 'fmts' element could contain
|
|
|
|
|
* many pipelined commands and, none can be interactive.
|
|
|
|
|
*
|
|
|
|
|
* Here are some examples of both types of inspection entries.
|
|
|
|
|
* The first entry will be ignored due to the initial '#' character.
|
|
|
|
|
* For clarity, the pseudo tab depictions (^I) are surrounded by an
|
|
|
|
|
* extra space but the actual tabs would not be.
|
|
|
|
|
*
|
|
|
|
|
* # pipe ^I Sockets ^I lsof -n -P -i 2>&1
|
|
|
|
|
* pipe ^I Open Files ^I lsof -P -p %d 2>&1
|
|
|
|
|
* file ^I NUMA Info ^I /proc/%d/numa_maps
|
|
|
|
|
* pipe ^I Log ^I tail -n100 /var/log/syslog | sort -Mr
|
|
|
|
|
*
|
|
|
|
|
* Caution: If the output contains unprintable characters they will
|
|
|
|
|
* be displayed in either the ^I notation or hexidecimal <FF> form.
|
|
|
|
|
* This applies to tab characters as well. So if one wants a more
|
|
|
|
|
* accurate display, any tabs should be expanded within the 'fmts'.
|
|
|
|
|
*
|
|
|
|
|
* The following example takes what could have been a 'file' entry
|
|
|
|
|
* but employs a 'pipe' instead so as to expand the tabs.
|
|
|
|
|
*
|
|
|
|
|
* # next would have contained '\t' ...
|
|
|
|
|
* # file ^I <your_name> ^I /proc/%d/status
|
|
|
|
|
* # but this will eliminate embedded '\t' ...
|
|
|
|
|
* pipe ^I <your_name> ^I cat /proc/%d/status | expand -
|
2018-07-25 10:30:00 +05:30
|
|
|
|
*
|
|
|
|
|
* Note: If a pipe such as the following was established, one must
|
|
|
|
|
* use Ctrl-C to terminate that pipe in order to review the results.
|
|
|
|
|
* This is the single occasion where a '^C' will not terminate top.
|
|
|
|
|
*
|
|
|
|
|
* pipe ^I Trace ^I /usr/bin/strace -p %d 2>&1
|
top: add a flexible 'Inspect' capability
This commit introduces an extremely powerful, flexible
brand new capability. Now, users can pause the normal
iterative display and inspect the contents of any file
or output from any script, command, or even pipelines.
It's invoked via the 'Y' interactive command which, in
turn, is supported with simple user supplied additions
as new entries in the top personal configuration file.
A separate new 'Inspect' window supports scrolling and
searching, similar to the main top display. Except it
extends existing 'L'/'&' (locate/locate-next) commands
so that an out-of-view match automatically adjusts the
horizontal position bringing such data into view. And
it provides for multiple successive same line matches.
Also, the basic 'more/less' navigation keys are active
in this new 'Inspect' window, to ease user transition.
There are no program changes required when entries are
added to or deleted from the rcfile. And there are no
known limits to the complexity of a script, command or
pipeline, other than the unidirectional nature imposed
by the 'popen' function call which top cannot violate.
Since it's impossible to predict exactly what contents
will be generated, top treats all output as raw binary
data. Any control characters display in '^C' notation
while all other unprintable characters show as '<AB>'.
The biggest problem encountered was with the find/next
capability since that strstr guy was really diminished
given the possibility that numerous 'strings' could be
encountered *within* many of top's raw, binary 'rows'.
Oh, and another problem was in maintaining the perfect
left & right text justification of this commit message
along with all of the commit summaries. Some of those
summaries (like this very one) are of course, slightly
shorter, to make room for the 'man document' addition.
Enjoy!
Signed-off-by: Jim Warner <james.warner@comcast.net>
2012-11-25 10:30:05 +05:30
|
|
|
|
*/
|
|
|
|
|
|
2012-12-04 11:30:00 +05:30
|
|
|
|
/*
|
|
|
|
|
* Our driving table support, the basis for generalized inspection,
|
|
|
|
|
* built at startup (if at all) from rcfile or demo entries. */
|
|
|
|
|
struct I_ent {
|
|
|
|
|
void (*func)(char *, int); // a pointer to file/pipe/demo function
|
|
|
|
|
char *type; // the type of entry ('file' or 'pipe')
|
|
|
|
|
char *name; // the selection label for display
|
|
|
|
|
char *fmts; // format string to build path or command
|
|
|
|
|
int farg; // 1 = '%d' in fmts, 0 = not (future use)
|
|
|
|
|
const char *caps; // not really caps, show_special() delim's
|
|
|
|
|
char *fstr; // entry's current/active search string
|
top: highlight all regular search string(s) when found
With the recent inspect search highlight provisions in
place, the lack of highlighting in task based searches
has grown from being only irritating to a real defect.
Thus, this commit introduces parallel functionality to
those searches initiated within a visible task window.
And just as separate inspect searches are possible for
each selection, per window task searches are provided.
However, it should be noted that there are differences
between task based searches and inspect type searches:
* There is no concept of out-of-view data when dealing
. with task rows -- if the data can't bee seen, it has
. not, in fact, been constructed from a proc_t struct.
* While inspect data is output at the character level,
. up to now all task display data was only potentially
. output and it was always based on a complete string.
* With task search highlighting, rows now containing a
. match must be output in pieces and, therefore, can't
. be optimized away like other rows which haven't been
. been altered. This is because top cannot predict the
. the contents of a search string or, how many matches
. might occur in a given row. Short search strings and
. many matches would raise buffer needs geometrically.
(now that we know a '.' + 2 spaces is squeezed to one)
(everything's perfectly justified, but it's just luck)
Signed-off-by: Jim Warner <james.warner@comcast.net>
2012-12-08 11:30:00 +05:30
|
|
|
|
int flen; // above's strlen, without call overhead
|
2012-12-04 11:30:00 +05:30
|
|
|
|
};
|
|
|
|
|
struct I_struc {
|
|
|
|
|
int demo; // do NOT save table entries in rcfile
|
|
|
|
|
int total; // total I_ent table entries
|
|
|
|
|
char *raw; // all entries for 'W', incl '#' & blank
|
|
|
|
|
struct I_ent *tab;
|
|
|
|
|
};
|
|
|
|
|
static struct I_struc Inspect;
|
|
|
|
|
|
|
|
|
|
static char **Insp_p; // pointers to each line start
|
|
|
|
|
static int Insp_nl; // total lines, total Insp_p entries
|
top: extend multi-byte support to 'Inspection' feature
The previous commit implemented multi-byte support for
the basic top user interaction and display provisions.
This commit completes multi-byte support by addressing
that 'Inspect Other Output' feature (the 'Y' command).
Few people probably exploit this very powerful feature
which allows the perusing of any file or piped output.
And even if nobody uses 'Y', someone will stumble over
it on the help screen and try it out. Assuming top was
not built with INSP_OFFDEMO defined, they'll end up on
the screen our translators have faithfully translated.
Without this patch, such a screen would display with a
bunch of 'unprintable' characters which will then show
in the standard (less-like) way as: '^A', '<C3>', etc.
In other words, those poor screens will be a big mess!
[ this program can even display an executable binary ]
[ while at that same time supporting Find/Find Next. ]
[ imagine, a file with no guarantee of real strings! ]
[ just try a Find using less with such binary files. ]
With this commit, the translated 'Y' demo screens will
now be properly shown, providing no invalid multi-byte
characters have been detected. Should that be the case
then they'll be displayed in that less-like way above.
And, if users go on to fully exploit this 'Y' command,
there is a good chance that a file or pipe might yield
output in a utf-8 multi-byte form. Should that be true
such output will thus be handled appropriately by top.
[ in many respects, this change was more challenging ]
[ than the basic support within the previous commit. ]
[ story of my life: least used = most effort needed. ]
Many thanks to our procps-ng translators which enabled
a proper test of these changed 'Y' command provisions:
. Vietnamese: Trần Ngọc Quân
. Polish: Jakub Bogusz
. German: Mario Blättermann
. French: Frédéric Marchal, Stéphane Aulery
[ and my sincerest apologies too, for my negligence! ]
Reference(s):
https://gitlab.com/procps-ng/procps/issues/68
Signed-off-by: Jim Warner <james.warner@comcast.net>
2017-09-27 10:33:33 +05:30
|
|
|
|
static int Insp_utf8; // treat Insp_buf as translatable, else raw
|
2012-12-04 11:30:00 +05:30
|
|
|
|
static char *Insp_buf; // the results from insp_do_file/pipe
|
|
|
|
|
static size_t Insp_bufsz; // allocated size of Insp_buf
|
|
|
|
|
static size_t Insp_bufrd; // bytes actually in Insp_buf
|
|
|
|
|
static struct I_ent *Insp_sel; // currently selected Inspect entry
|
top: add a flexible 'Inspect' capability
This commit introduces an extremely powerful, flexible
brand new capability. Now, users can pause the normal
iterative display and inspect the contents of any file
or output from any script, command, or even pipelines.
It's invoked via the 'Y' interactive command which, in
turn, is supported with simple user supplied additions
as new entries in the top personal configuration file.
A separate new 'Inspect' window supports scrolling and
searching, similar to the main top display. Except it
extends existing 'L'/'&' (locate/locate-next) commands
so that an out-of-view match automatically adjusts the
horizontal position bringing such data into view. And
it provides for multiple successive same line matches.
Also, the basic 'more/less' navigation keys are active
in this new 'Inspect' window, to ease user transition.
There are no program changes required when entries are
added to or deleted from the rcfile. And there are no
known limits to the complexity of a script, command or
pipeline, other than the unidirectional nature imposed
by the 'popen' function call which top cannot violate.
Since it's impossible to predict exactly what contents
will be generated, top treats all output as raw binary
data. Any control characters display in '^C' notation
while all other unprintable characters show as '<AB>'.
The biggest problem encountered was with the find/next
capability since that strstr guy was really diminished
given the possibility that numerous 'strings' could be
encountered *within* many of top's raw, binary 'rows'.
Oh, and another problem was in maintaining the perfect
left & right text justification of this commit message
along with all of the commit summaries. Some of those
summaries (like this very one) are of course, slightly
shorter, to make room for the 'man document' addition.
Enjoy!
Signed-off-by: Jim Warner <james.warner@comcast.net>
2012-11-25 10:30:05 +05:30
|
|
|
|
|
|
|
|
|
// Our 'make status line' macro
|
|
|
|
|
#define INSP_MKSL(big,txt) { int _sz = big ? Screen_cols : 80; \
|
top: extend multi-byte support to 'Inspection' feature
The previous commit implemented multi-byte support for
the basic top user interaction and display provisions.
This commit completes multi-byte support by addressing
that 'Inspect Other Output' feature (the 'Y' command).
Few people probably exploit this very powerful feature
which allows the perusing of any file or piped output.
And even if nobody uses 'Y', someone will stumble over
it on the help screen and try it out. Assuming top was
not built with INSP_OFFDEMO defined, they'll end up on
the screen our translators have faithfully translated.
Without this patch, such a screen would display with a
bunch of 'unprintable' characters which will then show
in the standard (less-like) way as: '^A', '<C3>', etc.
In other words, those poor screens will be a big mess!
[ this program can even display an executable binary ]
[ while at that same time supporting Find/Find Next. ]
[ imagine, a file with no guarantee of real strings! ]
[ just try a Find using less with such binary files. ]
With this commit, the translated 'Y' demo screens will
now be properly shown, providing no invalid multi-byte
characters have been detected. Should that be the case
then they'll be displayed in that less-like way above.
And, if users go on to fully exploit this 'Y' command,
there is a good chance that a file or pipe might yield
output in a utf-8 multi-byte form. Should that be true
such output will thus be handled appropriately by top.
[ in many respects, this change was more challenging ]
[ than the basic support within the previous commit. ]
[ story of my life: least used = most effort needed. ]
Many thanks to our procps-ng translators which enabled
a proper test of these changed 'Y' command provisions:
. Vietnamese: Trần Ngọc Quân
. Polish: Jakub Bogusz
. German: Mario Blättermann
. French: Frédéric Marchal, Stéphane Aulery
[ and my sincerest apologies too, for my negligence! ]
Reference(s):
https://gitlab.com/procps-ng/procps/issues/68
Signed-off-by: Jim Warner <james.warner@comcast.net>
2017-09-27 10:33:33 +05:30
|
|
|
|
const char *_p; \
|
|
|
|
|
_sz += utf8_delta(txt); \
|
|
|
|
|
_p = fmtmk("%-*.*s", _sz, _sz, txt); \
|
|
|
|
|
PUTT("%s%s%.*s%s", tg2(0, (Msg_row = 3)), Curwin->capclr_hdr \
|
|
|
|
|
, utf8_embody(_p, Screen_cols), _p, Cap_clr_eol); \
|
2013-01-16 11:30:00 +05:30
|
|
|
|
putp(Caps_off); fflush(stdout); }
|
top: add a flexible 'Inspect' capability
This commit introduces an extremely powerful, flexible
brand new capability. Now, users can pause the normal
iterative display and inspect the contents of any file
or output from any script, command, or even pipelines.
It's invoked via the 'Y' interactive command which, in
turn, is supported with simple user supplied additions
as new entries in the top personal configuration file.
A separate new 'Inspect' window supports scrolling and
searching, similar to the main top display. Except it
extends existing 'L'/'&' (locate/locate-next) commands
so that an out-of-view match automatically adjusts the
horizontal position bringing such data into view. And
it provides for multiple successive same line matches.
Also, the basic 'more/less' navigation keys are active
in this new 'Inspect' window, to ease user transition.
There are no program changes required when entries are
added to or deleted from the rcfile. And there are no
known limits to the complexity of a script, command or
pipeline, other than the unidirectional nature imposed
by the 'popen' function call which top cannot violate.
Since it's impossible to predict exactly what contents
will be generated, top treats all output as raw binary
data. Any control characters display in '^C' notation
while all other unprintable characters show as '<AB>'.
The biggest problem encountered was with the find/next
capability since that strstr guy was really diminished
given the possibility that numerous 'strings' could be
encountered *within* many of top's raw, binary 'rows'.
Oh, and another problem was in maintaining the perfect
left & right text justification of this commit message
along with all of the commit summaries. Some of those
summaries (like this very one) are of course, slightly
shorter, to make room for the 'man document' addition.
Enjoy!
Signed-off-by: Jim Warner <james.warner@comcast.net>
2012-11-25 10:30:05 +05:30
|
|
|
|
|
|
|
|
|
// Our 'row length' macro, equivalent to a strlen() call
|
2012-11-28 11:30:00 +05:30
|
|
|
|
#define INSP_RLEN(idx) (int)(Insp_p[idx +1] - Insp_p[idx] -1)
|
top: add a flexible 'Inspect' capability
This commit introduces an extremely powerful, flexible
brand new capability. Now, users can pause the normal
iterative display and inspect the contents of any file
or output from any script, command, or even pipelines.
It's invoked via the 'Y' interactive command which, in
turn, is supported with simple user supplied additions
as new entries in the top personal configuration file.
A separate new 'Inspect' window supports scrolling and
searching, similar to the main top display. Except it
extends existing 'L'/'&' (locate/locate-next) commands
so that an out-of-view match automatically adjusts the
horizontal position bringing such data into view. And
it provides for multiple successive same line matches.
Also, the basic 'more/less' navigation keys are active
in this new 'Inspect' window, to ease user transition.
There are no program changes required when entries are
added to or deleted from the rcfile. And there are no
known limits to the complexity of a script, command or
pipeline, other than the unidirectional nature imposed
by the 'popen' function call which top cannot violate.
Since it's impossible to predict exactly what contents
will be generated, top treats all output as raw binary
data. Any control characters display in '^C' notation
while all other unprintable characters show as '<AB>'.
The biggest problem encountered was with the find/next
capability since that strstr guy was really diminished
given the possibility that numerous 'strings' could be
encountered *within* many of top's raw, binary 'rows'.
Oh, and another problem was in maintaining the perfect
left & right text justification of this commit message
along with all of the commit summaries. Some of those
summaries (like this very one) are of course, slightly
shorter, to make room for the 'man document' addition.
Enjoy!
Signed-off-by: Jim Warner <james.warner@comcast.net>
2012-11-25 10:30:05 +05:30
|
|
|
|
|
2018-07-25 10:30:00 +05:30
|
|
|
|
// Our 'busy/working' macro
|
|
|
|
|
#define INSP_BUSY(enu) { INSP_MKSL(0, N_txt(enu)) }
|
top: add a flexible 'Inspect' capability
This commit introduces an extremely powerful, flexible
brand new capability. Now, users can pause the normal
iterative display and inspect the contents of any file
or output from any script, command, or even pipelines.
It's invoked via the 'Y' interactive command which, in
turn, is supported with simple user supplied additions
as new entries in the top personal configuration file.
A separate new 'Inspect' window supports scrolling and
searching, similar to the main top display. Except it
extends existing 'L'/'&' (locate/locate-next) commands
so that an out-of-view match automatically adjusts the
horizontal position bringing such data into view. And
it provides for multiple successive same line matches.
Also, the basic 'more/less' navigation keys are active
in this new 'Inspect' window, to ease user transition.
There are no program changes required when entries are
added to or deleted from the rcfile. And there are no
known limits to the complexity of a script, command or
pipeline, other than the unidirectional nature imposed
by the 'popen' function call which top cannot violate.
Since it's impossible to predict exactly what contents
will be generated, top treats all output as raw binary
data. Any control characters display in '^C' notation
while all other unprintable characters show as '<AB>'.
The biggest problem encountered was with the find/next
capability since that strstr guy was really diminished
given the possibility that numerous 'strings' could be
encountered *within* many of top's raw, binary 'rows'.
Oh, and another problem was in maintaining the perfect
left & right text justification of this commit message
along with all of the commit summaries. Some of those
summaries (like this very one) are of course, slightly
shorter, to make room for the 'man document' addition.
Enjoy!
Signed-off-by: Jim Warner <james.warner@comcast.net>
2012-11-25 10:30:05 +05:30
|
|
|
|
|
|
|
|
|
|
|
|
|
|
/*
|
|
|
|
|
* Establish the number of lines present in the Insp_buf glob plus
|
|
|
|
|
* build the all important row start array. It is that array that
|
|
|
|
|
* others will rely on since we dare not try to use strlen() on what
|
|
|
|
|
* is potentially raw binary data. Who knows what some user might
|
|
|
|
|
* name as a file or include in a pipeline (scary, ain't it?). */
|
|
|
|
|
static void insp_cnt_nl (void) {
|
|
|
|
|
char *beg = Insp_buf;
|
|
|
|
|
char *cur = Insp_buf;
|
|
|
|
|
char *end = Insp_buf + Insp_bufrd + 1;
|
|
|
|
|
|
|
|
|
|
#ifdef INSP_SAVEBUF
|
|
|
|
|
{
|
|
|
|
|
static int n = 1;
|
|
|
|
|
char fn[SMLBUFSIZ];
|
|
|
|
|
FILE *fd;
|
|
|
|
|
snprintf(fn, sizeof(fn), "%s.Insp_buf.%02d.txt", Myname, n++);
|
|
|
|
|
fd = fopen(fn, "w");
|
|
|
|
|
if (fd) {
|
|
|
|
|
fwrite(Insp_buf, 1, Insp_bufrd, fd);
|
|
|
|
|
fclose(fd);
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
#endif
|
2018-08-08 10:30:00 +05:30
|
|
|
|
Insp_p = alloc_c(sizeof(char *) * 2);
|
top: add a flexible 'Inspect' capability
This commit introduces an extremely powerful, flexible
brand new capability. Now, users can pause the normal
iterative display and inspect the contents of any file
or output from any script, command, or even pipelines.
It's invoked via the 'Y' interactive command which, in
turn, is supported with simple user supplied additions
as new entries in the top personal configuration file.
A separate new 'Inspect' window supports scrolling and
searching, similar to the main top display. Except it
extends existing 'L'/'&' (locate/locate-next) commands
so that an out-of-view match automatically adjusts the
horizontal position bringing such data into view. And
it provides for multiple successive same line matches.
Also, the basic 'more/less' navigation keys are active
in this new 'Inspect' window, to ease user transition.
There are no program changes required when entries are
added to or deleted from the rcfile. And there are no
known limits to the complexity of a script, command or
pipeline, other than the unidirectional nature imposed
by the 'popen' function call which top cannot violate.
Since it's impossible to predict exactly what contents
will be generated, top treats all output as raw binary
data. Any control characters display in '^C' notation
while all other unprintable characters show as '<AB>'.
The biggest problem encountered was with the find/next
capability since that strstr guy was really diminished
given the possibility that numerous 'strings' could be
encountered *within* many of top's raw, binary 'rows'.
Oh, and another problem was in maintaining the perfect
left & right text justification of this commit message
along with all of the commit summaries. Some of those
summaries (like this very one) are of course, slightly
shorter, to make room for the 'man document' addition.
Enjoy!
Signed-off-by: Jim Warner <james.warner@comcast.net>
2012-11-25 10:30:05 +05:30
|
|
|
|
|
|
|
|
|
for (Insp_nl = 0; beg < end; beg++) {
|
|
|
|
|
if (*beg == '\n') {
|
|
|
|
|
Insp_p[Insp_nl++] = cur;
|
|
|
|
|
// keep our array ahead of next potential need (plus the 2 above)
|
2018-08-08 10:30:00 +05:30
|
|
|
|
Insp_p = alloc_r(Insp_p, (sizeof(char *) * (Insp_nl +3)));
|
top: add a flexible 'Inspect' capability
This commit introduces an extremely powerful, flexible
brand new capability. Now, users can pause the normal
iterative display and inspect the contents of any file
or output from any script, command, or even pipelines.
It's invoked via the 'Y' interactive command which, in
turn, is supported with simple user supplied additions
as new entries in the top personal configuration file.
A separate new 'Inspect' window supports scrolling and
searching, similar to the main top display. Except it
extends existing 'L'/'&' (locate/locate-next) commands
so that an out-of-view match automatically adjusts the
horizontal position bringing such data into view. And
it provides for multiple successive same line matches.
Also, the basic 'more/less' navigation keys are active
in this new 'Inspect' window, to ease user transition.
There are no program changes required when entries are
added to or deleted from the rcfile. And there are no
known limits to the complexity of a script, command or
pipeline, other than the unidirectional nature imposed
by the 'popen' function call which top cannot violate.
Since it's impossible to predict exactly what contents
will be generated, top treats all output as raw binary
data. Any control characters display in '^C' notation
while all other unprintable characters show as '<AB>'.
The biggest problem encountered was with the find/next
capability since that strstr guy was really diminished
given the possibility that numerous 'strings' could be
encountered *within* many of top's raw, binary 'rows'.
Oh, and another problem was in maintaining the perfect
left & right text justification of this commit message
along with all of the commit summaries. Some of those
summaries (like this very one) are of course, slightly
shorter, to make room for the 'man document' addition.
Enjoy!
Signed-off-by: Jim Warner <james.warner@comcast.net>
2012-11-25 10:30:05 +05:30
|
|
|
|
cur = beg +1;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
Insp_p[0] = Insp_buf;
|
|
|
|
|
Insp_p[Insp_nl++] = cur;
|
|
|
|
|
Insp_p[Insp_nl] = end;
|
2013-07-04 10:30:00 +05:30
|
|
|
|
if ((end - cur) == 1) // if there's an eof null delimiter,
|
top: add a flexible 'Inspect' capability
This commit introduces an extremely powerful, flexible
brand new capability. Now, users can pause the normal
iterative display and inspect the contents of any file
or output from any script, command, or even pipelines.
It's invoked via the 'Y' interactive command which, in
turn, is supported with simple user supplied additions
as new entries in the top personal configuration file.
A separate new 'Inspect' window supports scrolling and
searching, similar to the main top display. Except it
extends existing 'L'/'&' (locate/locate-next) commands
so that an out-of-view match automatically adjusts the
horizontal position bringing such data into view. And
it provides for multiple successive same line matches.
Also, the basic 'more/less' navigation keys are active
in this new 'Inspect' window, to ease user transition.
There are no program changes required when entries are
added to or deleted from the rcfile. And there are no
known limits to the complexity of a script, command or
pipeline, other than the unidirectional nature imposed
by the 'popen' function call which top cannot violate.
Since it's impossible to predict exactly what contents
will be generated, top treats all output as raw binary
data. Any control characters display in '^C' notation
while all other unprintable characters show as '<AB>'.
The biggest problem encountered was with the find/next
capability since that strstr guy was really diminished
given the possibility that numerous 'strings' could be
encountered *within* many of top's raw, binary 'rows'.
Oh, and another problem was in maintaining the perfect
left & right text justification of this commit message
along with all of the commit summaries. Some of those
summaries (like this very one) are of course, slightly
shorter, to make room for the 'man document' addition.
Enjoy!
Signed-off-by: Jim Warner <james.warner@comcast.net>
2012-11-25 10:30:05 +05:30
|
|
|
|
--Insp_nl; // don't count it as a new line
|
|
|
|
|
} // end: insp_cnt_nl
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
#ifndef INSP_OFFDEMO
|
|
|
|
|
/*
|
|
|
|
|
* The pseudo output DEMO utility. */
|
|
|
|
|
static void insp_do_demo (char *fmts, int pid) {
|
|
|
|
|
(void)fmts; (void)pid;
|
2012-12-23 11:30:00 +05:30
|
|
|
|
/* next will put us on a par with the real file/pipe read buffers
|
|
|
|
|
( and also avoid a harmless, but evil sounding, valgrind warning ) */
|
|
|
|
|
Insp_bufsz = READMINSZ + strlen(N_txt(YINSP_dstory_txt));
|
|
|
|
|
Insp_buf = alloc_c(Insp_bufsz);
|
2012-12-04 11:30:00 +05:30
|
|
|
|
Insp_bufrd = snprintf(Insp_buf, Insp_bufsz, "%s", N_txt(YINSP_dstory_txt));
|
top: add a flexible 'Inspect' capability
This commit introduces an extremely powerful, flexible
brand new capability. Now, users can pause the normal
iterative display and inspect the contents of any file
or output from any script, command, or even pipelines.
It's invoked via the 'Y' interactive command which, in
turn, is supported with simple user supplied additions
as new entries in the top personal configuration file.
A separate new 'Inspect' window supports scrolling and
searching, similar to the main top display. Except it
extends existing 'L'/'&' (locate/locate-next) commands
so that an out-of-view match automatically adjusts the
horizontal position bringing such data into view. And
it provides for multiple successive same line matches.
Also, the basic 'more/less' navigation keys are active
in this new 'Inspect' window, to ease user transition.
There are no program changes required when entries are
added to or deleted from the rcfile. And there are no
known limits to the complexity of a script, command or
pipeline, other than the unidirectional nature imposed
by the 'popen' function call which top cannot violate.
Since it's impossible to predict exactly what contents
will be generated, top treats all output as raw binary
data. Any control characters display in '^C' notation
while all other unprintable characters show as '<AB>'.
The biggest problem encountered was with the find/next
capability since that strstr guy was really diminished
given the possibility that numerous 'strings' could be
encountered *within* many of top's raw, binary 'rows'.
Oh, and another problem was in maintaining the perfect
left & right text justification of this commit message
along with all of the commit summaries. Some of those
summaries (like this very one) are of course, slightly
shorter, to make room for the 'man document' addition.
Enjoy!
Signed-off-by: Jim Warner <james.warner@comcast.net>
2012-11-25 10:30:05 +05:30
|
|
|
|
insp_cnt_nl();
|
|
|
|
|
} // end: insp_do_demo
|
|
|
|
|
#endif
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
/*
|
|
|
|
|
* The generalized FILE utility. */
|
|
|
|
|
static void insp_do_file (char *fmts, int pid) {
|
|
|
|
|
char buf[LRGBUFSIZ];
|
|
|
|
|
FILE *fp;
|
|
|
|
|
int rc;
|
|
|
|
|
|
|
|
|
|
snprintf(buf, sizeof(buf), fmts, pid);
|
|
|
|
|
fp = fopen(buf, "r");
|
|
|
|
|
rc = readfile(fp, &Insp_buf, &Insp_bufsz, &Insp_bufrd);
|
|
|
|
|
if (fp) fclose(fp);
|
|
|
|
|
if (rc) Insp_bufrd = snprintf(Insp_buf, Insp_bufsz, "%s"
|
|
|
|
|
, fmtmk(N_fmt(YINSP_failed_fmt), strerror(errno)));
|
|
|
|
|
insp_cnt_nl();
|
|
|
|
|
} // end: insp_do_file
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
/*
|
|
|
|
|
* The generalized PIPE utility. */
|
|
|
|
|
static void insp_do_pipe (char *fmts, int pid) {
|
|
|
|
|
char buf[LRGBUFSIZ];
|
2018-07-25 10:30:00 +05:30
|
|
|
|
struct sigaction sa;
|
top: add a flexible 'Inspect' capability
This commit introduces an extremely powerful, flexible
brand new capability. Now, users can pause the normal
iterative display and inspect the contents of any file
or output from any script, command, or even pipelines.
It's invoked via the 'Y' interactive command which, in
turn, is supported with simple user supplied additions
as new entries in the top personal configuration file.
A separate new 'Inspect' window supports scrolling and
searching, similar to the main top display. Except it
extends existing 'L'/'&' (locate/locate-next) commands
so that an out-of-view match automatically adjusts the
horizontal position bringing such data into view. And
it provides for multiple successive same line matches.
Also, the basic 'more/less' navigation keys are active
in this new 'Inspect' window, to ease user transition.
There are no program changes required when entries are
added to or deleted from the rcfile. And there are no
known limits to the complexity of a script, command or
pipeline, other than the unidirectional nature imposed
by the 'popen' function call which top cannot violate.
Since it's impossible to predict exactly what contents
will be generated, top treats all output as raw binary
data. Any control characters display in '^C' notation
while all other unprintable characters show as '<AB>'.
The biggest problem encountered was with the find/next
capability since that strstr guy was really diminished
given the possibility that numerous 'strings' could be
encountered *within* many of top's raw, binary 'rows'.
Oh, and another problem was in maintaining the perfect
left & right text justification of this commit message
along with all of the commit summaries. Some of those
summaries (like this very one) are of course, slightly
shorter, to make room for the 'man document' addition.
Enjoy!
Signed-off-by: Jim Warner <james.warner@comcast.net>
2012-11-25 10:30:05 +05:30
|
|
|
|
FILE *fp;
|
|
|
|
|
int rc;
|
|
|
|
|
|
2018-07-25 10:30:00 +05:30
|
|
|
|
memset(&sa, 0, sizeof(sa));
|
|
|
|
|
sigemptyset(&sa.sa_mask);
|
|
|
|
|
sa.sa_handler = SIG_IGN;
|
|
|
|
|
sigaction(SIGINT, &sa, NULL);
|
|
|
|
|
|
top: add a flexible 'Inspect' capability
This commit introduces an extremely powerful, flexible
brand new capability. Now, users can pause the normal
iterative display and inspect the contents of any file
or output from any script, command, or even pipelines.
It's invoked via the 'Y' interactive command which, in
turn, is supported with simple user supplied additions
as new entries in the top personal configuration file.
A separate new 'Inspect' window supports scrolling and
searching, similar to the main top display. Except it
extends existing 'L'/'&' (locate/locate-next) commands
so that an out-of-view match automatically adjusts the
horizontal position bringing such data into view. And
it provides for multiple successive same line matches.
Also, the basic 'more/less' navigation keys are active
in this new 'Inspect' window, to ease user transition.
There are no program changes required when entries are
added to or deleted from the rcfile. And there are no
known limits to the complexity of a script, command or
pipeline, other than the unidirectional nature imposed
by the 'popen' function call which top cannot violate.
Since it's impossible to predict exactly what contents
will be generated, top treats all output as raw binary
data. Any control characters display in '^C' notation
while all other unprintable characters show as '<AB>'.
The biggest problem encountered was with the find/next
capability since that strstr guy was really diminished
given the possibility that numerous 'strings' could be
encountered *within* many of top's raw, binary 'rows'.
Oh, and another problem was in maintaining the perfect
left & right text justification of this commit message
along with all of the commit summaries. Some of those
summaries (like this very one) are of course, slightly
shorter, to make room for the 'man document' addition.
Enjoy!
Signed-off-by: Jim Warner <james.warner@comcast.net>
2012-11-25 10:30:05 +05:30
|
|
|
|
snprintf(buf, sizeof(buf), fmts, pid);
|
|
|
|
|
fp = popen(buf, "r");
|
|
|
|
|
rc = readfile(fp, &Insp_buf, &Insp_bufsz, &Insp_bufrd);
|
|
|
|
|
if (fp) pclose(fp);
|
|
|
|
|
if (rc) Insp_bufrd = snprintf(Insp_buf, Insp_bufsz, "%s"
|
|
|
|
|
, fmtmk(N_fmt(YINSP_failed_fmt), strerror(errno)));
|
|
|
|
|
insp_cnt_nl();
|
2018-07-25 10:30:00 +05:30
|
|
|
|
|
|
|
|
|
sa.sa_handler = sig_endpgm;
|
|
|
|
|
sigaction(SIGINT, &sa, NULL);
|
top: add a flexible 'Inspect' capability
This commit introduces an extremely powerful, flexible
brand new capability. Now, users can pause the normal
iterative display and inspect the contents of any file
or output from any script, command, or even pipelines.
It's invoked via the 'Y' interactive command which, in
turn, is supported with simple user supplied additions
as new entries in the top personal configuration file.
A separate new 'Inspect' window supports scrolling and
searching, similar to the main top display. Except it
extends existing 'L'/'&' (locate/locate-next) commands
so that an out-of-view match automatically adjusts the
horizontal position bringing such data into view. And
it provides for multiple successive same line matches.
Also, the basic 'more/less' navigation keys are active
in this new 'Inspect' window, to ease user transition.
There are no program changes required when entries are
added to or deleted from the rcfile. And there are no
known limits to the complexity of a script, command or
pipeline, other than the unidirectional nature imposed
by the 'popen' function call which top cannot violate.
Since it's impossible to predict exactly what contents
will be generated, top treats all output as raw binary
data. Any control characters display in '^C' notation
while all other unprintable characters show as '<AB>'.
The biggest problem encountered was with the find/next
capability since that strstr guy was really diminished
given the possibility that numerous 'strings' could be
encountered *within* many of top's raw, binary 'rows'.
Oh, and another problem was in maintaining the perfect
left & right text justification of this commit message
along with all of the commit summaries. Some of those
summaries (like this very one) are of course, slightly
shorter, to make room for the 'man document' addition.
Enjoy!
Signed-off-by: Jim Warner <james.warner@comcast.net>
2012-11-25 10:30:05 +05:30
|
|
|
|
} // end: insp_do_pipe
|
|
|
|
|
|
|
|
|
|
|
2012-12-03 11:30:00 +05:30
|
|
|
|
/*
|
|
|
|
|
* This guy is a *Helper* function serving the following two masters:
|
2012-12-04 11:30:00 +05:30
|
|
|
|
* insp_find_str() - find the next Insp_sel->fstr match
|
top: extend multi-byte support to 'Inspection' feature
The previous commit implemented multi-byte support for
the basic top user interaction and display provisions.
This commit completes multi-byte support by addressing
that 'Inspect Other Output' feature (the 'Y' command).
Few people probably exploit this very powerful feature
which allows the perusing of any file or piped output.
And even if nobody uses 'Y', someone will stumble over
it on the help screen and try it out. Assuming top was
not built with INSP_OFFDEMO defined, they'll end up on
the screen our translators have faithfully translated.
Without this patch, such a screen would display with a
bunch of 'unprintable' characters which will then show
in the standard (less-like) way as: '^A', '<C3>', etc.
In other words, those poor screens will be a big mess!
[ this program can even display an executable binary ]
[ while at that same time supporting Find/Find Next. ]
[ imagine, a file with no guarantee of real strings! ]
[ just try a Find using less with such binary files. ]
With this commit, the translated 'Y' demo screens will
now be properly shown, providing no invalid multi-byte
characters have been detected. Should that be the case
then they'll be displayed in that less-like way above.
And, if users go on to fully exploit this 'Y' command,
there is a good chance that a file or pipe might yield
output in a utf-8 multi-byte form. Should that be true
such output will thus be handled appropriately by top.
[ in many respects, this change was more challenging ]
[ than the basic support within the previous commit. ]
[ story of my life: least used = most effort needed. ]
Many thanks to our procps-ng translators which enabled
a proper test of these changed 'Y' command provisions:
. Vietnamese: Trần Ngọc Quân
. Polish: Jakub Bogusz
. German: Mario Blättermann
. French: Frédéric Marchal, Stéphane Aulery
[ and my sincerest apologies too, for my negligence! ]
Reference(s):
https://gitlab.com/procps-ng/procps/issues/68
Signed-off-by: Jim Warner <james.warner@comcast.net>
2017-09-27 10:33:33 +05:30
|
|
|
|
* insp_mkrow_... - highlight any Insp_sel->fstr matches in-view
|
2012-12-04 11:30:00 +05:30
|
|
|
|
* If Insp_sel->fstr is found in the designated row, he returns the
|
top: highlight all regular search string(s) when found
With the recent inspect search highlight provisions in
place, the lack of highlighting in task based searches
has grown from being only irritating to a real defect.
Thus, this commit introduces parallel functionality to
those searches initiated within a visible task window.
And just as separate inspect searches are possible for
each selection, per window task searches are provided.
However, it should be noted that there are differences
between task based searches and inspect type searches:
* There is no concept of out-of-view data when dealing
. with task rows -- if the data can't bee seen, it has
. not, in fact, been constructed from a proc_t struct.
* While inspect data is output at the character level,
. up to now all task display data was only potentially
. output and it was always based on a complete string.
* With task search highlighting, rows now containing a
. match must be output in pieces and, therefore, can't
. be optimized away like other rows which haven't been
. been altered. This is because top cannot predict the
. the contents of a search string or, how many matches
. might occur in a given row. Short search strings and
. many matches would raise buffer needs geometrically.
(now that we know a '.' + 2 spaces is squeezed to one)
(everything's perfectly justified, but it's just luck)
Signed-off-by: Jim Warner <james.warner@comcast.net>
2012-12-08 11:30:00 +05:30
|
|
|
|
* offset from the start of the row, otherwise he returns a huge
|
2012-12-03 11:30:00 +05:30
|
|
|
|
* integer so traditional fencepost usage can be employed. */
|
|
|
|
|
static inline int insp_find_ofs (int col, int row) {
|
|
|
|
|
#define begFS (int)(fnd - Insp_p[row])
|
|
|
|
|
char *p, *fnd = NULL;
|
|
|
|
|
|
2012-12-04 11:30:00 +05:30
|
|
|
|
if (Insp_sel->fstr[0]) {
|
2012-12-03 11:30:00 +05:30
|
|
|
|
// skip this row, if there's no chance of a match
|
2012-12-04 11:30:00 +05:30
|
|
|
|
if (memchr(Insp_p[row], Insp_sel->fstr[0], INSP_RLEN(row))) {
|
2012-12-03 11:30:00 +05:30
|
|
|
|
for ( ; col < INSP_RLEN(row); col++) {
|
|
|
|
|
if (!*(p = Insp_p[row] + col)) // skip any empty strings
|
|
|
|
|
continue;
|
2012-12-04 11:30:00 +05:30
|
|
|
|
fnd = STRSTR(p, Insp_sel->fstr); // with binary data, each
|
|
|
|
|
if (fnd) // row may have '\0'. so
|
|
|
|
|
break; // our scans must be done
|
|
|
|
|
col += strlen(p); // as individual strings.
|
|
|
|
|
}
|
|
|
|
|
if (fnd && fnd < Insp_p[row + 1]) // and, we must watch out
|
|
|
|
|
return begFS; // for potential overrun!
|
2012-12-03 11:30:00 +05:30
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
return INT_MAX;
|
|
|
|
|
#undef begFS
|
|
|
|
|
} // end: insp_find_ofs
|
|
|
|
|
|
|
|
|
|
|
top: add a flexible 'Inspect' capability
This commit introduces an extremely powerful, flexible
brand new capability. Now, users can pause the normal
iterative display and inspect the contents of any file
or output from any script, command, or even pipelines.
It's invoked via the 'Y' interactive command which, in
turn, is supported with simple user supplied additions
as new entries in the top personal configuration file.
A separate new 'Inspect' window supports scrolling and
searching, similar to the main top display. Except it
extends existing 'L'/'&' (locate/locate-next) commands
so that an out-of-view match automatically adjusts the
horizontal position bringing such data into view. And
it provides for multiple successive same line matches.
Also, the basic 'more/less' navigation keys are active
in this new 'Inspect' window, to ease user transition.
There are no program changes required when entries are
added to or deleted from the rcfile. And there are no
known limits to the complexity of a script, command or
pipeline, other than the unidirectional nature imposed
by the 'popen' function call which top cannot violate.
Since it's impossible to predict exactly what contents
will be generated, top treats all output as raw binary
data. Any control characters display in '^C' notation
while all other unprintable characters show as '<AB>'.
The biggest problem encountered was with the find/next
capability since that strstr guy was really diminished
given the possibility that numerous 'strings' could be
encountered *within* many of top's raw, binary 'rows'.
Oh, and another problem was in maintaining the perfect
left & right text justification of this commit message
along with all of the commit summaries. Some of those
summaries (like this very one) are of course, slightly
shorter, to make room for the 'man document' addition.
Enjoy!
Signed-off-by: Jim Warner <james.warner@comcast.net>
2012-11-25 10:30:05 +05:30
|
|
|
|
/*
|
|
|
|
|
* This guy supports the inspect 'L' and '&' search provisions
|
2012-12-03 11:30:00 +05:30
|
|
|
|
* and returns the row and *optimal* column for viewing any match
|
top: add a flexible 'Inspect' capability
This commit introduces an extremely powerful, flexible
brand new capability. Now, users can pause the normal
iterative display and inspect the contents of any file
or output from any script, command, or even pipelines.
It's invoked via the 'Y' interactive command which, in
turn, is supported with simple user supplied additions
as new entries in the top personal configuration file.
A separate new 'Inspect' window supports scrolling and
searching, similar to the main top display. Except it
extends existing 'L'/'&' (locate/locate-next) commands
so that an out-of-view match automatically adjusts the
horizontal position bringing such data into view. And
it provides for multiple successive same line matches.
Also, the basic 'more/less' navigation keys are active
in this new 'Inspect' window, to ease user transition.
There are no program changes required when entries are
added to or deleted from the rcfile. And there are no
known limits to the complexity of a script, command or
pipeline, other than the unidirectional nature imposed
by the 'popen' function call which top cannot violate.
Since it's impossible to predict exactly what contents
will be generated, top treats all output as raw binary
data. Any control characters display in '^C' notation
while all other unprintable characters show as '<AB>'.
The biggest problem encountered was with the find/next
capability since that strstr guy was really diminished
given the possibility that numerous 'strings' could be
encountered *within* many of top's raw, binary 'rows'.
Oh, and another problem was in maintaining the perfect
left & right text justification of this commit message
along with all of the commit summaries. Some of those
summaries (like this very one) are of course, slightly
shorter, to make room for the 'man document' addition.
Enjoy!
Signed-off-by: Jim Warner <james.warner@comcast.net>
2012-11-25 10:30:05 +05:30
|
|
|
|
* ( we'll always opt for left column justification since any )
|
2012-12-03 11:30:00 +05:30
|
|
|
|
* ( preceding ctrl chars appropriate an unpredictable amount ) */
|
|
|
|
|
static void insp_find_str (int ch, int *col, int *row) {
|
top: add a flexible 'Inspect' capability
This commit introduces an extremely powerful, flexible
brand new capability. Now, users can pause the normal
iterative display and inspect the contents of any file
or output from any script, command, or even pipelines.
It's invoked via the 'Y' interactive command which, in
turn, is supported with simple user supplied additions
as new entries in the top personal configuration file.
A separate new 'Inspect' window supports scrolling and
searching, similar to the main top display. Except it
extends existing 'L'/'&' (locate/locate-next) commands
so that an out-of-view match automatically adjusts the
horizontal position bringing such data into view. And
it provides for multiple successive same line matches.
Also, the basic 'more/less' navigation keys are active
in this new 'Inspect' window, to ease user transition.
There are no program changes required when entries are
added to or deleted from the rcfile. And there are no
known limits to the complexity of a script, command or
pipeline, other than the unidirectional nature imposed
by the 'popen' function call which top cannot violate.
Since it's impossible to predict exactly what contents
will be generated, top treats all output as raw binary
data. Any control characters display in '^C' notation
while all other unprintable characters show as '<AB>'.
The biggest problem encountered was with the find/next
capability since that strstr guy was really diminished
given the possibility that numerous 'strings' could be
encountered *within* many of top's raw, binary 'rows'.
Oh, and another problem was in maintaining the perfect
left & right text justification of this commit message
along with all of the commit summaries. Some of those
summaries (like this very one) are of course, slightly
shorter, to make room for the 'man document' addition.
Enjoy!
Signed-off-by: Jim Warner <james.warner@comcast.net>
2012-11-25 10:30:05 +05:30
|
|
|
|
#define reDUX (found) ? N_txt(WORD_another_txt) : ""
|
|
|
|
|
static int found;
|
|
|
|
|
|
2012-12-04 11:30:00 +05:30
|
|
|
|
if ((ch == '&' || ch == 'n') && !Insp_sel->fstr[0]) {
|
top: add a flexible 'Inspect' capability
This commit introduces an extremely powerful, flexible
brand new capability. Now, users can pause the normal
iterative display and inspect the contents of any file
or output from any script, command, or even pipelines.
It's invoked via the 'Y' interactive command which, in
turn, is supported with simple user supplied additions
as new entries in the top personal configuration file.
A separate new 'Inspect' window supports scrolling and
searching, similar to the main top display. Except it
extends existing 'L'/'&' (locate/locate-next) commands
so that an out-of-view match automatically adjusts the
horizontal position bringing such data into view. And
it provides for multiple successive same line matches.
Also, the basic 'more/less' navigation keys are active
in this new 'Inspect' window, to ease user transition.
There are no program changes required when entries are
added to or deleted from the rcfile. And there are no
known limits to the complexity of a script, command or
pipeline, other than the unidirectional nature imposed
by the 'popen' function call which top cannot violate.
Since it's impossible to predict exactly what contents
will be generated, top treats all output as raw binary
data. Any control characters display in '^C' notation
while all other unprintable characters show as '<AB>'.
The biggest problem encountered was with the find/next
capability since that strstr guy was really diminished
given the possibility that numerous 'strings' could be
encountered *within* many of top's raw, binary 'rows'.
Oh, and another problem was in maintaining the perfect
left & right text justification of this commit message
along with all of the commit summaries. Some of those
summaries (like this very one) are of course, slightly
shorter, to make room for the 'man document' addition.
Enjoy!
Signed-off-by: Jim Warner <james.warner@comcast.net>
2012-11-25 10:30:05 +05:30
|
|
|
|
show_msg(N_txt(FIND_no_next_txt));
|
|
|
|
|
return;
|
|
|
|
|
}
|
|
|
|
|
if (ch == 'L' || ch == '/') {
|
2014-04-27 10:30:00 +05:30
|
|
|
|
char *str = ioline(N_txt(GET_find_str_txt));
|
|
|
|
|
if (*str == kbd_ESC) return;
|
|
|
|
|
snprintf(Insp_sel->fstr, FNDBUFSIZ, "%s", str);
|
2012-12-04 11:30:00 +05:30
|
|
|
|
Insp_sel->flen = strlen(Insp_sel->fstr);
|
top: add a flexible 'Inspect' capability
This commit introduces an extremely powerful, flexible
brand new capability. Now, users can pause the normal
iterative display and inspect the contents of any file
or output from any script, command, or even pipelines.
It's invoked via the 'Y' interactive command which, in
turn, is supported with simple user supplied additions
as new entries in the top personal configuration file.
A separate new 'Inspect' window supports scrolling and
searching, similar to the main top display. Except it
extends existing 'L'/'&' (locate/locate-next) commands
so that an out-of-view match automatically adjusts the
horizontal position bringing such data into view. And
it provides for multiple successive same line matches.
Also, the basic 'more/less' navigation keys are active
in this new 'Inspect' window, to ease user transition.
There are no program changes required when entries are
added to or deleted from the rcfile. And there are no
known limits to the complexity of a script, command or
pipeline, other than the unidirectional nature imposed
by the 'popen' function call which top cannot violate.
Since it's impossible to predict exactly what contents
will be generated, top treats all output as raw binary
data. Any control characters display in '^C' notation
while all other unprintable characters show as '<AB>'.
The biggest problem encountered was with the find/next
capability since that strstr guy was really diminished
given the possibility that numerous 'strings' could be
encountered *within* many of top's raw, binary 'rows'.
Oh, and another problem was in maintaining the perfect
left & right text justification of this commit message
along with all of the commit summaries. Some of those
summaries (like this very one) are of course, slightly
shorter, to make room for the 'man document' addition.
Enjoy!
Signed-off-by: Jim Warner <james.warner@comcast.net>
2012-11-25 10:30:05 +05:30
|
|
|
|
found = 0;
|
|
|
|
|
}
|
2012-12-04 11:30:00 +05:30
|
|
|
|
if (Insp_sel->fstr[0]) {
|
2012-12-03 11:30:00 +05:30
|
|
|
|
int xx, yy;
|
|
|
|
|
|
2018-07-25 10:30:00 +05:30
|
|
|
|
INSP_BUSY(YINSP_waitin_txt);
|
2012-11-28 11:30:00 +05:30
|
|
|
|
for (xx = *col, yy = *row; yy < Insp_nl; ) {
|
2012-12-03 11:30:00 +05:30
|
|
|
|
xx = insp_find_ofs(xx, yy);
|
|
|
|
|
if (xx < INSP_RLEN(yy)) {
|
|
|
|
|
found = 1;
|
2012-12-06 11:30:00 +05:30
|
|
|
|
if (xx == *col && yy == *row) { // matched where we were!
|
|
|
|
|
++xx; // ( was the user maybe )
|
|
|
|
|
continue; // ( trying to fool us? )
|
2012-11-28 11:30:00 +05:30
|
|
|
|
}
|
2012-12-03 11:30:00 +05:30
|
|
|
|
*col = xx;
|
|
|
|
|
*row = yy;
|
|
|
|
|
return;
|
top: add a flexible 'Inspect' capability
This commit introduces an extremely powerful, flexible
brand new capability. Now, users can pause the normal
iterative display and inspect the contents of any file
or output from any script, command, or even pipelines.
It's invoked via the 'Y' interactive command which, in
turn, is supported with simple user supplied additions
as new entries in the top personal configuration file.
A separate new 'Inspect' window supports scrolling and
searching, similar to the main top display. Except it
extends existing 'L'/'&' (locate/locate-next) commands
so that an out-of-view match automatically adjusts the
horizontal position bringing such data into view. And
it provides for multiple successive same line matches.
Also, the basic 'more/less' navigation keys are active
in this new 'Inspect' window, to ease user transition.
There are no program changes required when entries are
added to or deleted from the rcfile. And there are no
known limits to the complexity of a script, command or
pipeline, other than the unidirectional nature imposed
by the 'popen' function call which top cannot violate.
Since it's impossible to predict exactly what contents
will be generated, top treats all output as raw binary
data. Any control characters display in '^C' notation
while all other unprintable characters show as '<AB>'.
The biggest problem encountered was with the find/next
capability since that strstr guy was really diminished
given the possibility that numerous 'strings' could be
encountered *within* many of top's raw, binary 'rows'.
Oh, and another problem was in maintaining the perfect
left & right text justification of this commit message
along with all of the commit summaries. Some of those
summaries (like this very one) are of course, slightly
shorter, to make room for the 'man document' addition.
Enjoy!
Signed-off-by: Jim Warner <james.warner@comcast.net>
2012-11-25 10:30:05 +05:30
|
|
|
|
}
|
2012-11-28 11:30:00 +05:30
|
|
|
|
xx = 0;
|
|
|
|
|
++yy;
|
top: add a flexible 'Inspect' capability
This commit introduces an extremely powerful, flexible
brand new capability. Now, users can pause the normal
iterative display and inspect the contents of any file
or output from any script, command, or even pipelines.
It's invoked via the 'Y' interactive command which, in
turn, is supported with simple user supplied additions
as new entries in the top personal configuration file.
A separate new 'Inspect' window supports scrolling and
searching, similar to the main top display. Except it
extends existing 'L'/'&' (locate/locate-next) commands
so that an out-of-view match automatically adjusts the
horizontal position bringing such data into view. And
it provides for multiple successive same line matches.
Also, the basic 'more/less' navigation keys are active
in this new 'Inspect' window, to ease user transition.
There are no program changes required when entries are
added to or deleted from the rcfile. And there are no
known limits to the complexity of a script, command or
pipeline, other than the unidirectional nature imposed
by the 'popen' function call which top cannot violate.
Since it's impossible to predict exactly what contents
will be generated, top treats all output as raw binary
data. Any control characters display in '^C' notation
while all other unprintable characters show as '<AB>'.
The biggest problem encountered was with the find/next
capability since that strstr guy was really diminished
given the possibility that numerous 'strings' could be
encountered *within* many of top's raw, binary 'rows'.
Oh, and another problem was in maintaining the perfect
left & right text justification of this commit message
along with all of the commit summaries. Some of those
summaries (like this very one) are of course, slightly
shorter, to make room for the 'man document' addition.
Enjoy!
Signed-off-by: Jim Warner <james.warner@comcast.net>
2012-11-25 10:30:05 +05:30
|
|
|
|
}
|
2012-12-04 11:30:00 +05:30
|
|
|
|
show_msg(fmtmk(N_fmt(FIND_no_find_fmt), reDUX, Insp_sel->fstr));
|
top: add a flexible 'Inspect' capability
This commit introduces an extremely powerful, flexible
brand new capability. Now, users can pause the normal
iterative display and inspect the contents of any file
or output from any script, command, or even pipelines.
It's invoked via the 'Y' interactive command which, in
turn, is supported with simple user supplied additions
as new entries in the top personal configuration file.
A separate new 'Inspect' window supports scrolling and
searching, similar to the main top display. Except it
extends existing 'L'/'&' (locate/locate-next) commands
so that an out-of-view match automatically adjusts the
horizontal position bringing such data into view. And
it provides for multiple successive same line matches.
Also, the basic 'more/less' navigation keys are active
in this new 'Inspect' window, to ease user transition.
There are no program changes required when entries are
added to or deleted from the rcfile. And there are no
known limits to the complexity of a script, command or
pipeline, other than the unidirectional nature imposed
by the 'popen' function call which top cannot violate.
Since it's impossible to predict exactly what contents
will be generated, top treats all output as raw binary
data. Any control characters display in '^C' notation
while all other unprintable characters show as '<AB>'.
The biggest problem encountered was with the find/next
capability since that strstr guy was really diminished
given the possibility that numerous 'strings' could be
encountered *within* many of top's raw, binary 'rows'.
Oh, and another problem was in maintaining the perfect
left & right text justification of this commit message
along with all of the commit summaries. Some of those
summaries (like this very one) are of course, slightly
shorter, to make room for the 'man document' addition.
Enjoy!
Signed-off-by: Jim Warner <james.warner@comcast.net>
2012-11-25 10:30:05 +05:30
|
|
|
|
}
|
|
|
|
|
#undef reDUX
|
2012-12-03 11:30:00 +05:30
|
|
|
|
} // end: insp_find_str
|
top: add a flexible 'Inspect' capability
This commit introduces an extremely powerful, flexible
brand new capability. Now, users can pause the normal
iterative display and inspect the contents of any file
or output from any script, command, or even pipelines.
It's invoked via the 'Y' interactive command which, in
turn, is supported with simple user supplied additions
as new entries in the top personal configuration file.
A separate new 'Inspect' window supports scrolling and
searching, similar to the main top display. Except it
extends existing 'L'/'&' (locate/locate-next) commands
so that an out-of-view match automatically adjusts the
horizontal position bringing such data into view. And
it provides for multiple successive same line matches.
Also, the basic 'more/less' navigation keys are active
in this new 'Inspect' window, to ease user transition.
There are no program changes required when entries are
added to or deleted from the rcfile. And there are no
known limits to the complexity of a script, command or
pipeline, other than the unidirectional nature imposed
by the 'popen' function call which top cannot violate.
Since it's impossible to predict exactly what contents
will be generated, top treats all output as raw binary
data. Any control characters display in '^C' notation
while all other unprintable characters show as '<AB>'.
The biggest problem encountered was with the find/next
capability since that strstr guy was really diminished
given the possibility that numerous 'strings' could be
encountered *within* many of top's raw, binary 'rows'.
Oh, and another problem was in maintaining the perfect
left & right text justification of this commit message
along with all of the commit summaries. Some of those
summaries (like this very one) are of course, slightly
shorter, to make room for the 'man document' addition.
Enjoy!
Signed-off-by: Jim Warner <james.warner@comcast.net>
2012-11-25 10:30:05 +05:30
|
|
|
|
|
|
|
|
|
|
|
|
|
|
/*
|
2012-12-03 11:30:00 +05:30
|
|
|
|
* This guy is a *Helper* function responsible for positioning a
|
|
|
|
|
* single row in the current 'X axis', then displaying the results.
|
|
|
|
|
* Along the way, he makes sure control characters and/or unprintable
|
|
|
|
|
* characters display in a less-like fashion:
|
|
|
|
|
* '^A' for control chars
|
|
|
|
|
* '<BC>' for other unprintable stuff
|
|
|
|
|
* Those will be highlighted with the current windows's capclr_msg,
|
|
|
|
|
* while visible search matches display with capclr_hdr for emphasis.
|
|
|
|
|
* ( we hide ugly plumbing in macros to concentrate on the algorithm ) */
|
top: extend multi-byte support to 'Inspection' feature
The previous commit implemented multi-byte support for
the basic top user interaction and display provisions.
This commit completes multi-byte support by addressing
that 'Inspect Other Output' feature (the 'Y' command).
Few people probably exploit this very powerful feature
which allows the perusing of any file or piped output.
And even if nobody uses 'Y', someone will stumble over
it on the help screen and try it out. Assuming top was
not built with INSP_OFFDEMO defined, they'll end up on
the screen our translators have faithfully translated.
Without this patch, such a screen would display with a
bunch of 'unprintable' characters which will then show
in the standard (less-like) way as: '^A', '<C3>', etc.
In other words, those poor screens will be a big mess!
[ this program can even display an executable binary ]
[ while at that same time supporting Find/Find Next. ]
[ imagine, a file with no guarantee of real strings! ]
[ just try a Find using less with such binary files. ]
With this commit, the translated 'Y' demo screens will
now be properly shown, providing no invalid multi-byte
characters have been detected. Should that be the case
then they'll be displayed in that less-like way above.
And, if users go on to fully exploit this 'Y' command,
there is a good chance that a file or pipe might yield
output in a utf-8 multi-byte form. Should that be true
such output will thus be handled appropriately by top.
[ in many respects, this change was more challenging ]
[ than the basic support within the previous commit. ]
[ story of my life: least used = most effort needed. ]
Many thanks to our procps-ng translators which enabled
a proper test of these changed 'Y' command provisions:
. Vietnamese: Trần Ngọc Quân
. Polish: Jakub Bogusz
. German: Mario Blättermann
. French: Frédéric Marchal, Stéphane Aulery
[ and my sincerest apologies too, for my negligence! ]
Reference(s):
https://gitlab.com/procps-ng/procps/issues/68
Signed-off-by: Jim Warner <james.warner@comcast.net>
2017-09-27 10:33:33 +05:30
|
|
|
|
static void insp_mkrow_raw (int col, int row) {
|
2018-01-06 11:30:00 +05:30
|
|
|
|
#define maxSZ ( Screen_cols - to )
|
top: add a flexible 'Inspect' capability
This commit introduces an extremely powerful, flexible
brand new capability. Now, users can pause the normal
iterative display and inspect the contents of any file
or output from any script, command, or even pipelines.
It's invoked via the 'Y' interactive command which, in
turn, is supported with simple user supplied additions
as new entries in the top personal configuration file.
A separate new 'Inspect' window supports scrolling and
searching, similar to the main top display. Except it
extends existing 'L'/'&' (locate/locate-next) commands
so that an out-of-view match automatically adjusts the
horizontal position bringing such data into view. And
it provides for multiple successive same line matches.
Also, the basic 'more/less' navigation keys are active
in this new 'Inspect' window, to ease user transition.
There are no program changes required when entries are
added to or deleted from the rcfile. And there are no
known limits to the complexity of a script, command or
pipeline, other than the unidirectional nature imposed
by the 'popen' function call which top cannot violate.
Since it's impossible to predict exactly what contents
will be generated, top treats all output as raw binary
data. Any control characters display in '^C' notation
while all other unprintable characters show as '<AB>'.
The biggest problem encountered was with the find/next
capability since that strstr guy was really diminished
given the possibility that numerous 'strings' could be
encountered *within* many of top's raw, binary 'rows'.
Oh, and another problem was in maintaining the perfect
left & right text justification of this commit message
along with all of the commit summaries. Some of those
summaries (like this very one) are of course, slightly
shorter, to make room for the 'man document' addition.
Enjoy!
Signed-off-by: Jim Warner <james.warner@comcast.net>
2012-11-25 10:30:05 +05:30
|
|
|
|
#define capNO { if (hicap) { putp(Caps_off); hicap = 0; } }
|
2012-12-04 11:30:00 +05:30
|
|
|
|
#define mkFND { PUTT("%s%.*s%s", Curwin->capclr_hdr, maxSZ, Insp_sel->fstr, Caps_off); \
|
|
|
|
|
fr += Insp_sel->flen -1; to += Insp_sel->flen; hicap = 0; }
|
2012-12-03 11:30:00 +05:30
|
|
|
|
#ifndef INSP_JUSTNOT
|
2018-01-06 11:30:00 +05:30
|
|
|
|
#define mkCTL { const char *p = fmtmk("^%c", uch + '@'); \
|
|
|
|
|
PUTT("%s%.*s", (!hicap) ? Curwin->capclr_msg : "", maxSZ, p); to += 2; hicap = 1; }
|
|
|
|
|
#define mkUNP { const char *p = fmtmk("<%02X>", uch); \
|
|
|
|
|
PUTT("%s%.*s", (!hicap) ? Curwin->capclr_msg : "", maxSZ, p); to += 4; hicap = 1; }
|
2012-12-03 11:30:00 +05:30
|
|
|
|
#else
|
top: add a flexible 'Inspect' capability
This commit introduces an extremely powerful, flexible
brand new capability. Now, users can pause the normal
iterative display and inspect the contents of any file
or output from any script, command, or even pipelines.
It's invoked via the 'Y' interactive command which, in
turn, is supported with simple user supplied additions
as new entries in the top personal configuration file.
A separate new 'Inspect' window supports scrolling and
searching, similar to the main top display. Except it
extends existing 'L'/'&' (locate/locate-next) commands
so that an out-of-view match automatically adjusts the
horizontal position bringing such data into view. And
it provides for multiple successive same line matches.
Also, the basic 'more/less' navigation keys are active
in this new 'Inspect' window, to ease user transition.
There are no program changes required when entries are
added to or deleted from the rcfile. And there are no
known limits to the complexity of a script, command or
pipeline, other than the unidirectional nature imposed
by the 'popen' function call which top cannot violate.
Since it's impossible to predict exactly what contents
will be generated, top treats all output as raw binary
data. Any control characters display in '^C' notation
while all other unprintable characters show as '<AB>'.
The biggest problem encountered was with the find/next
capability since that strstr guy was really diminished
given the possibility that numerous 'strings' could be
encountered *within* many of top's raw, binary 'rows'.
Oh, and another problem was in maintaining the perfect
left & right text justification of this commit message
along with all of the commit summaries. Some of those
summaries (like this very one) are of course, slightly
shorter, to make room for the 'man document' addition.
Enjoy!
Signed-off-by: Jim Warner <james.warner@comcast.net>
2012-11-25 10:30:05 +05:30
|
|
|
|
#define mkCTL { if ((to += 2) <= Screen_cols) \
|
|
|
|
|
PUTT("%s^%c", (!hicap) ? Curwin->capclr_msg : "", uch + '@'); hicap = 1; }
|
|
|
|
|
#define mkUNP { if ((to += 4) <= Screen_cols) \
|
|
|
|
|
PUTT("%s<%02X>", (!hicap) ? Curwin->capclr_msg : "", uch); hicap = 1; }
|
2012-12-03 11:30:00 +05:30
|
|
|
|
#endif
|
2013-01-07 11:30:00 +05:30
|
|
|
|
#define mkSTD { capNO; if (++to <= Screen_cols) { static char _str[2]; \
|
|
|
|
|
_str[0] = uch; putp(_str); } }
|
2018-01-06 11:30:00 +05:30
|
|
|
|
unsigned char tline[SCREENMAX];
|
2012-12-03 11:30:00 +05:30
|
|
|
|
int fr, to, ofs;
|
|
|
|
|
int hicap = 0;
|
|
|
|
|
|
|
|
|
|
if (col < INSP_RLEN(row))
|
|
|
|
|
memcpy(tline, Insp_p[row] + col, sizeof(tline));
|
|
|
|
|
else tline[0] = '\n';
|
|
|
|
|
|
2018-01-06 11:30:00 +05:30
|
|
|
|
for (fr = 0, to = 0, ofs = 0; to < Screen_cols; fr++) {
|
2012-12-03 11:30:00 +05:30
|
|
|
|
if (!ofs)
|
|
|
|
|
ofs = insp_find_ofs(col + fr, row);
|
|
|
|
|
if (col + fr < ofs) {
|
|
|
|
|
unsigned char uch = tline[fr];
|
|
|
|
|
if (uch == '\n') break; // a no show (he,he)
|
|
|
|
|
if (uch > 126) mkUNP // show as: '<AB>'
|
|
|
|
|
else if (uch < 32) mkCTL // show as: '^C'
|
|
|
|
|
else mkSTD // a show off (he,he)
|
|
|
|
|
} else { mkFND // a big show (he,he)
|
|
|
|
|
ofs = 0;
|
|
|
|
|
}
|
2013-03-22 10:30:00 +05:30
|
|
|
|
if (col + fr >= INSP_RLEN(row)) break;
|
2012-12-03 11:30:00 +05:30
|
|
|
|
}
|
|
|
|
|
capNO;
|
|
|
|
|
putp(Cap_clr_eol);
|
|
|
|
|
|
|
|
|
|
#undef maxSZ
|
|
|
|
|
#undef capNO
|
|
|
|
|
#undef mkFND
|
|
|
|
|
#undef mkCTL
|
|
|
|
|
#undef mkUNP
|
|
|
|
|
#undef mkSTD
|
top: extend multi-byte support to 'Inspection' feature
The previous commit implemented multi-byte support for
the basic top user interaction and display provisions.
This commit completes multi-byte support by addressing
that 'Inspect Other Output' feature (the 'Y' command).
Few people probably exploit this very powerful feature
which allows the perusing of any file or piped output.
And even if nobody uses 'Y', someone will stumble over
it on the help screen and try it out. Assuming top was
not built with INSP_OFFDEMO defined, they'll end up on
the screen our translators have faithfully translated.
Without this patch, such a screen would display with a
bunch of 'unprintable' characters which will then show
in the standard (less-like) way as: '^A', '<C3>', etc.
In other words, those poor screens will be a big mess!
[ this program can even display an executable binary ]
[ while at that same time supporting Find/Find Next. ]
[ imagine, a file with no guarantee of real strings! ]
[ just try a Find using less with such binary files. ]
With this commit, the translated 'Y' demo screens will
now be properly shown, providing no invalid multi-byte
characters have been detected. Should that be the case
then they'll be displayed in that less-like way above.
And, if users go on to fully exploit this 'Y' command,
there is a good chance that a file or pipe might yield
output in a utf-8 multi-byte form. Should that be true
such output will thus be handled appropriately by top.
[ in many respects, this change was more challenging ]
[ than the basic support within the previous commit. ]
[ story of my life: least used = most effort needed. ]
Many thanks to our procps-ng translators which enabled
a proper test of these changed 'Y' command provisions:
. Vietnamese: Trần Ngọc Quân
. Polish: Jakub Bogusz
. German: Mario Blättermann
. French: Frédéric Marchal, Stéphane Aulery
[ and my sincerest apologies too, for my negligence! ]
Reference(s):
https://gitlab.com/procps-ng/procps/issues/68
Signed-off-by: Jim Warner <james.warner@comcast.net>
2017-09-27 10:33:33 +05:30
|
|
|
|
} // end: insp_mkrow_raw
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
/*
|
|
|
|
|
* This guy is a *Helper* function responsible for positioning a
|
|
|
|
|
* single row in the current 'X axis' within a multi-byte string
|
|
|
|
|
* then displaying the results. Along the way he ensures control
|
|
|
|
|
* characters will then be displayed in two positions like '^A'.
|
|
|
|
|
* ( assuming they can even get past those 'gettext' utilities ) */
|
|
|
|
|
static void insp_mkrow_utf8 (int col, int row) {
|
2018-01-06 11:30:00 +05:30
|
|
|
|
#define maxSZ ( Screen_cols - to )
|
top: extend multi-byte support to 'Inspection' feature
The previous commit implemented multi-byte support for
the basic top user interaction and display provisions.
This commit completes multi-byte support by addressing
that 'Inspect Other Output' feature (the 'Y' command).
Few people probably exploit this very powerful feature
which allows the perusing of any file or piped output.
And even if nobody uses 'Y', someone will stumble over
it on the help screen and try it out. Assuming top was
not built with INSP_OFFDEMO defined, they'll end up on
the screen our translators have faithfully translated.
Without this patch, such a screen would display with a
bunch of 'unprintable' characters which will then show
in the standard (less-like) way as: '^A', '<C3>', etc.
In other words, those poor screens will be a big mess!
[ this program can even display an executable binary ]
[ while at that same time supporting Find/Find Next. ]
[ imagine, a file with no guarantee of real strings! ]
[ just try a Find using less with such binary files. ]
With this commit, the translated 'Y' demo screens will
now be properly shown, providing no invalid multi-byte
characters have been detected. Should that be the case
then they'll be displayed in that less-like way above.
And, if users go on to fully exploit this 'Y' command,
there is a good chance that a file or pipe might yield
output in a utf-8 multi-byte form. Should that be true
such output will thus be handled appropriately by top.
[ in many respects, this change was more challenging ]
[ than the basic support within the previous commit. ]
[ story of my life: least used = most effort needed. ]
Many thanks to our procps-ng translators which enabled
a proper test of these changed 'Y' command provisions:
. Vietnamese: Trần Ngọc Quân
. Polish: Jakub Bogusz
. German: Mario Blättermann
. French: Frédéric Marchal, Stéphane Aulery
[ and my sincerest apologies too, for my negligence! ]
Reference(s):
https://gitlab.com/procps-ng/procps/issues/68
Signed-off-by: Jim Warner <james.warner@comcast.net>
2017-09-27 10:33:33 +05:30
|
|
|
|
#define mkFND { PUTT("%s%.*s%s", Curwin->capclr_hdr, maxSZ, Insp_sel->fstr, Caps_off); \
|
|
|
|
|
fr += Insp_sel->flen; to += Insp_sel->flen; }
|
|
|
|
|
#ifndef INSP_JUSTNOT
|
2018-01-06 11:30:00 +05:30
|
|
|
|
#define mkCTL { const char *p = fmtmk("^%c", uch + '@'); \
|
|
|
|
|
PUTT("%s%.*s%s", Curwin->capclr_msg, maxSZ, p, Caps_off); to += 2; }
|
top: extend multi-byte support to 'Inspection' feature
The previous commit implemented multi-byte support for
the basic top user interaction and display provisions.
This commit completes multi-byte support by addressing
that 'Inspect Other Output' feature (the 'Y' command).
Few people probably exploit this very powerful feature
which allows the perusing of any file or piped output.
And even if nobody uses 'Y', someone will stumble over
it on the help screen and try it out. Assuming top was
not built with INSP_OFFDEMO defined, they'll end up on
the screen our translators have faithfully translated.
Without this patch, such a screen would display with a
bunch of 'unprintable' characters which will then show
in the standard (less-like) way as: '^A', '<C3>', etc.
In other words, those poor screens will be a big mess!
[ this program can even display an executable binary ]
[ while at that same time supporting Find/Find Next. ]
[ imagine, a file with no guarantee of real strings! ]
[ just try a Find using less with such binary files. ]
With this commit, the translated 'Y' demo screens will
now be properly shown, providing no invalid multi-byte
characters have been detected. Should that be the case
then they'll be displayed in that less-like way above.
And, if users go on to fully exploit this 'Y' command,
there is a good chance that a file or pipe might yield
output in a utf-8 multi-byte form. Should that be true
such output will thus be handled appropriately by top.
[ in many respects, this change was more challenging ]
[ than the basic support within the previous commit. ]
[ story of my life: least used = most effort needed. ]
Many thanks to our procps-ng translators which enabled
a proper test of these changed 'Y' command provisions:
. Vietnamese: Trần Ngọc Quân
. Polish: Jakub Bogusz
. German: Mario Blättermann
. French: Frédéric Marchal, Stéphane Aulery
[ and my sincerest apologies too, for my negligence! ]
Reference(s):
https://gitlab.com/procps-ng/procps/issues/68
Signed-off-by: Jim Warner <james.warner@comcast.net>
2017-09-27 10:33:33 +05:30
|
|
|
|
#else
|
|
|
|
|
#define mkCTL { if ((to += 2) <= Screen_cols) \
|
|
|
|
|
PUTT("%s^%c%s", Curwin->capclr_msg, uch + '@', Caps_off); }
|
|
|
|
|
#endif
|
2017-10-02 04:29:59 +05:30
|
|
|
|
#define mkNUL { buf1[0] = ' '; doPUT(buf1) }
|
2018-01-06 11:30:00 +05:30
|
|
|
|
#define doPUT(buf) if ((to += cno) <= Screen_cols) putp(buf);
|
top: extend multi-byte support to 'Inspection' feature
The previous commit implemented multi-byte support for
the basic top user interaction and display provisions.
This commit completes multi-byte support by addressing
that 'Inspect Other Output' feature (the 'Y' command).
Few people probably exploit this very powerful feature
which allows the perusing of any file or piped output.
And even if nobody uses 'Y', someone will stumble over
it on the help screen and try it out. Assuming top was
not built with INSP_OFFDEMO defined, they'll end up on
the screen our translators have faithfully translated.
Without this patch, such a screen would display with a
bunch of 'unprintable' characters which will then show
in the standard (less-like) way as: '^A', '<C3>', etc.
In other words, those poor screens will be a big mess!
[ this program can even display an executable binary ]
[ while at that same time supporting Find/Find Next. ]
[ imagine, a file with no guarantee of real strings! ]
[ just try a Find using less with such binary files. ]
With this commit, the translated 'Y' demo screens will
now be properly shown, providing no invalid multi-byte
characters have been detected. Should that be the case
then they'll be displayed in that less-like way above.
And, if users go on to fully exploit this 'Y' command,
there is a good chance that a file or pipe might yield
output in a utf-8 multi-byte form. Should that be true
such output will thus be handled appropriately by top.
[ in many respects, this change was more challenging ]
[ than the basic support within the previous commit. ]
[ story of my life: least used = most effort needed. ]
Many thanks to our procps-ng translators which enabled
a proper test of these changed 'Y' command provisions:
. Vietnamese: Trần Ngọc Quân
. Polish: Jakub Bogusz
. German: Mario Blättermann
. French: Frédéric Marchal, Stéphane Aulery
[ and my sincerest apologies too, for my negligence! ]
Reference(s):
https://gitlab.com/procps-ng/procps/issues/68
Signed-off-by: Jim Warner <james.warner@comcast.net>
2017-09-27 10:33:33 +05:30
|
|
|
|
static char buf1[2], buf2[3], buf3[4], buf4[5];
|
2018-01-06 11:30:00 +05:30
|
|
|
|
unsigned char tline[BIGBUFSIZ];
|
top: extend multi-byte support to 'Inspection' feature
The previous commit implemented multi-byte support for
the basic top user interaction and display provisions.
This commit completes multi-byte support by addressing
that 'Inspect Other Output' feature (the 'Y' command).
Few people probably exploit this very powerful feature
which allows the perusing of any file or piped output.
And even if nobody uses 'Y', someone will stumble over
it on the help screen and try it out. Assuming top was
not built with INSP_OFFDEMO defined, they'll end up on
the screen our translators have faithfully translated.
Without this patch, such a screen would display with a
bunch of 'unprintable' characters which will then show
in the standard (less-like) way as: '^A', '<C3>', etc.
In other words, those poor screens will be a big mess!
[ this program can even display an executable binary ]
[ while at that same time supporting Find/Find Next. ]
[ imagine, a file with no guarantee of real strings! ]
[ just try a Find using less with such binary files. ]
With this commit, the translated 'Y' demo screens will
now be properly shown, providing no invalid multi-byte
characters have been detected. Should that be the case
then they'll be displayed in that less-like way above.
And, if users go on to fully exploit this 'Y' command,
there is a good chance that a file or pipe might yield
output in a utf-8 multi-byte form. Should that be true
such output will thus be handled appropriately by top.
[ in many respects, this change was more challenging ]
[ than the basic support within the previous commit. ]
[ story of my life: least used = most effort needed. ]
Many thanks to our procps-ng translators which enabled
a proper test of these changed 'Y' command provisions:
. Vietnamese: Trần Ngọc Quân
. Polish: Jakub Bogusz
. German: Mario Blättermann
. French: Frédéric Marchal, Stéphane Aulery
[ and my sincerest apologies too, for my negligence! ]
Reference(s):
https://gitlab.com/procps-ng/procps/issues/68
Signed-off-by: Jim Warner <james.warner@comcast.net>
2017-09-27 10:33:33 +05:30
|
|
|
|
int fr, to, ofs;
|
|
|
|
|
|
|
|
|
|
col = utf8_proper_col(Insp_p[row], col, 1);
|
|
|
|
|
if (col < INSP_RLEN(row))
|
|
|
|
|
memcpy(tline, Insp_p[row] + col, sizeof(tline));
|
|
|
|
|
else tline[0] = '\n';
|
|
|
|
|
|
2018-01-06 11:30:00 +05:30
|
|
|
|
for (fr = 0, to = 0, ofs = 0; to < Screen_cols; ) {
|
top: extend multi-byte support to 'Inspection' feature
The previous commit implemented multi-byte support for
the basic top user interaction and display provisions.
This commit completes multi-byte support by addressing
that 'Inspect Other Output' feature (the 'Y' command).
Few people probably exploit this very powerful feature
which allows the perusing of any file or piped output.
And even if nobody uses 'Y', someone will stumble over
it on the help screen and try it out. Assuming top was
not built with INSP_OFFDEMO defined, they'll end up on
the screen our translators have faithfully translated.
Without this patch, such a screen would display with a
bunch of 'unprintable' characters which will then show
in the standard (less-like) way as: '^A', '<C3>', etc.
In other words, those poor screens will be a big mess!
[ this program can even display an executable binary ]
[ while at that same time supporting Find/Find Next. ]
[ imagine, a file with no guarantee of real strings! ]
[ just try a Find using less with such binary files. ]
With this commit, the translated 'Y' demo screens will
now be properly shown, providing no invalid multi-byte
characters have been detected. Should that be the case
then they'll be displayed in that less-like way above.
And, if users go on to fully exploit this 'Y' command,
there is a good chance that a file or pipe might yield
output in a utf-8 multi-byte form. Should that be true
such output will thus be handled appropriately by top.
[ in many respects, this change was more challenging ]
[ than the basic support within the previous commit. ]
[ story of my life: least used = most effort needed. ]
Many thanks to our procps-ng translators which enabled
a proper test of these changed 'Y' command provisions:
. Vietnamese: Trần Ngọc Quân
. Polish: Jakub Bogusz
. German: Mario Blättermann
. French: Frédéric Marchal, Stéphane Aulery
[ and my sincerest apologies too, for my negligence! ]
Reference(s):
https://gitlab.com/procps-ng/procps/issues/68
Signed-off-by: Jim Warner <james.warner@comcast.net>
2017-09-27 10:33:33 +05:30
|
|
|
|
if (!ofs)
|
|
|
|
|
ofs = insp_find_ofs(col + fr, row);
|
|
|
|
|
if (col + fr < ofs) {
|
2018-01-06 11:30:00 +05:30
|
|
|
|
unsigned char uch = tline[fr];
|
|
|
|
|
int bno = UTF8_tab[uch];
|
|
|
|
|
int cno = utf8_cols(&tline[fr++], bno);
|
|
|
|
|
switch (bno) {
|
top: extend multi-byte support to 'Inspection' feature
The previous commit implemented multi-byte support for
the basic top user interaction and display provisions.
This commit completes multi-byte support by addressing
that 'Inspect Other Output' feature (the 'Y' command).
Few people probably exploit this very powerful feature
which allows the perusing of any file or piped output.
And even if nobody uses 'Y', someone will stumble over
it on the help screen and try it out. Assuming top was
not built with INSP_OFFDEMO defined, they'll end up on
the screen our translators have faithfully translated.
Without this patch, such a screen would display with a
bunch of 'unprintable' characters which will then show
in the standard (less-like) way as: '^A', '<C3>', etc.
In other words, those poor screens will be a big mess!
[ this program can even display an executable binary ]
[ while at that same time supporting Find/Find Next. ]
[ imagine, a file with no guarantee of real strings! ]
[ just try a Find using less with such binary files. ]
With this commit, the translated 'Y' demo screens will
now be properly shown, providing no invalid multi-byte
characters have been detected. Should that be the case
then they'll be displayed in that less-like way above.
And, if users go on to fully exploit this 'Y' command,
there is a good chance that a file or pipe might yield
output in a utf-8 multi-byte form. Should that be true
such output will thus be handled appropriately by top.
[ in many respects, this change was more challenging ]
[ than the basic support within the previous commit. ]
[ story of my life: least used = most effort needed. ]
Many thanks to our procps-ng translators which enabled
a proper test of these changed 'Y' command provisions:
. Vietnamese: Trần Ngọc Quân
. Polish: Jakub Bogusz
. German: Mario Blättermann
. French: Frédéric Marchal, Stéphane Aulery
[ and my sincerest apologies too, for my negligence! ]
Reference(s):
https://gitlab.com/procps-ng/procps/issues/68
Signed-off-by: Jim Warner <james.warner@comcast.net>
2017-09-27 10:33:33 +05:30
|
|
|
|
case 1:
|
2017-12-15 10:30:00 +05:30
|
|
|
|
if (uch == '\n') break;
|
2018-01-06 11:30:00 +05:30
|
|
|
|
if (uch < 32) mkCTL
|
2017-10-02 04:29:59 +05:30
|
|
|
|
else if (uch == 127) mkNUL
|
top: extend multi-byte support to 'Inspection' feature
The previous commit implemented multi-byte support for
the basic top user interaction and display provisions.
This commit completes multi-byte support by addressing
that 'Inspect Other Output' feature (the 'Y' command).
Few people probably exploit this very powerful feature
which allows the perusing of any file or piped output.
And even if nobody uses 'Y', someone will stumble over
it on the help screen and try it out. Assuming top was
not built with INSP_OFFDEMO defined, they'll end up on
the screen our translators have faithfully translated.
Without this patch, such a screen would display with a
bunch of 'unprintable' characters which will then show
in the standard (less-like) way as: '^A', '<C3>', etc.
In other words, those poor screens will be a big mess!
[ this program can even display an executable binary ]
[ while at that same time supporting Find/Find Next. ]
[ imagine, a file with no guarantee of real strings! ]
[ just try a Find using less with such binary files. ]
With this commit, the translated 'Y' demo screens will
now be properly shown, providing no invalid multi-byte
characters have been detected. Should that be the case
then they'll be displayed in that less-like way above.
And, if users go on to fully exploit this 'Y' command,
there is a good chance that a file or pipe might yield
output in a utf-8 multi-byte form. Should that be true
such output will thus be handled appropriately by top.
[ in many respects, this change was more challenging ]
[ than the basic support within the previous commit. ]
[ story of my life: least used = most effort needed. ]
Many thanks to our procps-ng translators which enabled
a proper test of these changed 'Y' command provisions:
. Vietnamese: Trần Ngọc Quân
. Polish: Jakub Bogusz
. German: Mario Blättermann
. French: Frédéric Marchal, Stéphane Aulery
[ and my sincerest apologies too, for my negligence! ]
Reference(s):
https://gitlab.com/procps-ng/procps/issues/68
Signed-off-by: Jim Warner <james.warner@comcast.net>
2017-09-27 10:33:33 +05:30
|
|
|
|
else { buf1[0] = uch; doPUT(buf1) }
|
|
|
|
|
break;
|
|
|
|
|
case 2:
|
|
|
|
|
buf2[0] = uch; buf2[1] = tline[fr++];
|
|
|
|
|
doPUT(buf2)
|
|
|
|
|
break;
|
|
|
|
|
case 3:
|
|
|
|
|
buf3[0] = uch; buf3[1] = tline[fr++]; buf3[2] = tline[fr++];
|
|
|
|
|
doPUT(buf3)
|
|
|
|
|
break;
|
|
|
|
|
case 4:
|
|
|
|
|
buf4[0] = uch; buf4[1] = tline[fr++]; buf4[2] = tline[fr++]; buf4[3] = tline[fr++];
|
|
|
|
|
doPUT(buf4)
|
|
|
|
|
break;
|
|
|
|
|
default:
|
2017-10-02 04:29:59 +05:30
|
|
|
|
mkNUL
|
top: extend multi-byte support to 'Inspection' feature
The previous commit implemented multi-byte support for
the basic top user interaction and display provisions.
This commit completes multi-byte support by addressing
that 'Inspect Other Output' feature (the 'Y' command).
Few people probably exploit this very powerful feature
which allows the perusing of any file or piped output.
And even if nobody uses 'Y', someone will stumble over
it on the help screen and try it out. Assuming top was
not built with INSP_OFFDEMO defined, they'll end up on
the screen our translators have faithfully translated.
Without this patch, such a screen would display with a
bunch of 'unprintable' characters which will then show
in the standard (less-like) way as: '^A', '<C3>', etc.
In other words, those poor screens will be a big mess!
[ this program can even display an executable binary ]
[ while at that same time supporting Find/Find Next. ]
[ imagine, a file with no guarantee of real strings! ]
[ just try a Find using less with such binary files. ]
With this commit, the translated 'Y' demo screens will
now be properly shown, providing no invalid multi-byte
characters have been detected. Should that be the case
then they'll be displayed in that less-like way above.
And, if users go on to fully exploit this 'Y' command,
there is a good chance that a file or pipe might yield
output in a utf-8 multi-byte form. Should that be true
such output will thus be handled appropriately by top.
[ in many respects, this change was more challenging ]
[ than the basic support within the previous commit. ]
[ story of my life: least used = most effort needed. ]
Many thanks to our procps-ng translators which enabled
a proper test of these changed 'Y' command provisions:
. Vietnamese: Trần Ngọc Quân
. Polish: Jakub Bogusz
. German: Mario Blättermann
. French: Frédéric Marchal, Stéphane Aulery
[ and my sincerest apologies too, for my negligence! ]
Reference(s):
https://gitlab.com/procps-ng/procps/issues/68
Signed-off-by: Jim Warner <james.warner@comcast.net>
2017-09-27 10:33:33 +05:30
|
|
|
|
break;
|
|
|
|
|
}
|
|
|
|
|
} else {
|
|
|
|
|
mkFND
|
|
|
|
|
ofs = 0;
|
|
|
|
|
}
|
|
|
|
|
if (col + fr >= INSP_RLEN(row)) break;
|
|
|
|
|
}
|
|
|
|
|
putp(Cap_clr_eol);
|
|
|
|
|
|
|
|
|
|
#undef maxSZ
|
|
|
|
|
#undef mkFND
|
|
|
|
|
#undef mkCTL
|
2017-10-02 04:29:59 +05:30
|
|
|
|
#undef mkNUL
|
top: extend multi-byte support to 'Inspection' feature
The previous commit implemented multi-byte support for
the basic top user interaction and display provisions.
This commit completes multi-byte support by addressing
that 'Inspect Other Output' feature (the 'Y' command).
Few people probably exploit this very powerful feature
which allows the perusing of any file or piped output.
And even if nobody uses 'Y', someone will stumble over
it on the help screen and try it out. Assuming top was
not built with INSP_OFFDEMO defined, they'll end up on
the screen our translators have faithfully translated.
Without this patch, such a screen would display with a
bunch of 'unprintable' characters which will then show
in the standard (less-like) way as: '^A', '<C3>', etc.
In other words, those poor screens will be a big mess!
[ this program can even display an executable binary ]
[ while at that same time supporting Find/Find Next. ]
[ imagine, a file with no guarantee of real strings! ]
[ just try a Find using less with such binary files. ]
With this commit, the translated 'Y' demo screens will
now be properly shown, providing no invalid multi-byte
characters have been detected. Should that be the case
then they'll be displayed in that less-like way above.
And, if users go on to fully exploit this 'Y' command,
there is a good chance that a file or pipe might yield
output in a utf-8 multi-byte form. Should that be true
such output will thus be handled appropriately by top.
[ in many respects, this change was more challenging ]
[ than the basic support within the previous commit. ]
[ story of my life: least used = most effort needed. ]
Many thanks to our procps-ng translators which enabled
a proper test of these changed 'Y' command provisions:
. Vietnamese: Trần Ngọc Quân
. Polish: Jakub Bogusz
. German: Mario Blättermann
. French: Frédéric Marchal, Stéphane Aulery
[ and my sincerest apologies too, for my negligence! ]
Reference(s):
https://gitlab.com/procps-ng/procps/issues/68
Signed-off-by: Jim Warner <james.warner@comcast.net>
2017-09-27 10:33:33 +05:30
|
|
|
|
#undef doPUT
|
|
|
|
|
} // end: insp_mkrow_utf8
|
2012-12-03 11:30:00 +05:30
|
|
|
|
|
|
|
|
|
|
|
|
|
|
/*
|
|
|
|
|
* This guy is an insp_view_choice() *Helper* function who displays
|
|
|
|
|
* a page worth of of the user's damages. He also creates a status
|
|
|
|
|
* line based on maximum digits for the current selection's lines and
|
|
|
|
|
* hozizontal position (so it serves to inform, not distract, by
|
|
|
|
|
* otherwise being jumpy). */
|
|
|
|
|
static inline void insp_show_pgs (int col, int row, int max) {
|
top: add a flexible 'Inspect' capability
This commit introduces an extremely powerful, flexible
brand new capability. Now, users can pause the normal
iterative display and inspect the contents of any file
or output from any script, command, or even pipelines.
It's invoked via the 'Y' interactive command which, in
turn, is supported with simple user supplied additions
as new entries in the top personal configuration file.
A separate new 'Inspect' window supports scrolling and
searching, similar to the main top display. Except it
extends existing 'L'/'&' (locate/locate-next) commands
so that an out-of-view match automatically adjusts the
horizontal position bringing such data into view. And
it provides for multiple successive same line matches.
Also, the basic 'more/less' navigation keys are active
in this new 'Inspect' window, to ease user transition.
There are no program changes required when entries are
added to or deleted from the rcfile. And there are no
known limits to the complexity of a script, command or
pipeline, other than the unidirectional nature imposed
by the 'popen' function call which top cannot violate.
Since it's impossible to predict exactly what contents
will be generated, top treats all output as raw binary
data. Any control characters display in '^C' notation
while all other unprintable characters show as '<AB>'.
The biggest problem encountered was with the find/next
capability since that strstr guy was really diminished
given the possibility that numerous 'strings' could be
encountered *within* many of top's raw, binary 'rows'.
Oh, and another problem was in maintaining the perfect
left & right text justification of this commit message
along with all of the commit summaries. Some of those
summaries (like this very one) are of course, slightly
shorter, to make room for the 'man document' addition.
Enjoy!
Signed-off-by: Jim Warner <james.warner@comcast.net>
2012-11-25 10:30:05 +05:30
|
|
|
|
char buf[SMLBUFSIZ];
|
top: extend multi-byte support to 'Inspection' feature
The previous commit implemented multi-byte support for
the basic top user interaction and display provisions.
This commit completes multi-byte support by addressing
that 'Inspect Other Output' feature (the 'Y' command).
Few people probably exploit this very powerful feature
which allows the perusing of any file or piped output.
And even if nobody uses 'Y', someone will stumble over
it on the help screen and try it out. Assuming top was
not built with INSP_OFFDEMO defined, they'll end up on
the screen our translators have faithfully translated.
Without this patch, such a screen would display with a
bunch of 'unprintable' characters which will then show
in the standard (less-like) way as: '^A', '<C3>', etc.
In other words, those poor screens will be a big mess!
[ this program can even display an executable binary ]
[ while at that same time supporting Find/Find Next. ]
[ imagine, a file with no guarantee of real strings! ]
[ just try a Find using less with such binary files. ]
With this commit, the translated 'Y' demo screens will
now be properly shown, providing no invalid multi-byte
characters have been detected. Should that be the case
then they'll be displayed in that less-like way above.
And, if users go on to fully exploit this 'Y' command,
there is a good chance that a file or pipe might yield
output in a utf-8 multi-byte form. Should that be true
such output will thus be handled appropriately by top.
[ in many respects, this change was more challenging ]
[ than the basic support within the previous commit. ]
[ story of my life: least used = most effort needed. ]
Many thanks to our procps-ng translators which enabled
a proper test of these changed 'Y' command provisions:
. Vietnamese: Trần Ngọc Quân
. Polish: Jakub Bogusz
. German: Mario Blättermann
. French: Frédéric Marchal, Stéphane Aulery
[ and my sincerest apologies too, for my negligence! ]
Reference(s):
https://gitlab.com/procps-ng/procps/issues/68
Signed-off-by: Jim Warner <james.warner@comcast.net>
2017-09-27 10:33:33 +05:30
|
|
|
|
void (*mkrow_func)(int, int);
|
top: add a flexible 'Inspect' capability
This commit introduces an extremely powerful, flexible
brand new capability. Now, users can pause the normal
iterative display and inspect the contents of any file
or output from any script, command, or even pipelines.
It's invoked via the 'Y' interactive command which, in
turn, is supported with simple user supplied additions
as new entries in the top personal configuration file.
A separate new 'Inspect' window supports scrolling and
searching, similar to the main top display. Except it
extends existing 'L'/'&' (locate/locate-next) commands
so that an out-of-view match automatically adjusts the
horizontal position bringing such data into view. And
it provides for multiple successive same line matches.
Also, the basic 'more/less' navigation keys are active
in this new 'Inspect' window, to ease user transition.
There are no program changes required when entries are
added to or deleted from the rcfile. And there are no
known limits to the complexity of a script, command or
pipeline, other than the unidirectional nature imposed
by the 'popen' function call which top cannot violate.
Since it's impossible to predict exactly what contents
will be generated, top treats all output as raw binary
data. Any control characters display in '^C' notation
while all other unprintable characters show as '<AB>'.
The biggest problem encountered was with the find/next
capability since that strstr guy was really diminished
given the possibility that numerous 'strings' could be
encountered *within* many of top's raw, binary 'rows'.
Oh, and another problem was in maintaining the perfect
left & right text justification of this commit message
along with all of the commit summaries. Some of those
summaries (like this very one) are of course, slightly
shorter, to make room for the 'man document' addition.
Enjoy!
Signed-off-by: Jim Warner <james.warner@comcast.net>
2012-11-25 10:30:05 +05:30
|
|
|
|
int r = snprintf(buf, sizeof(buf), "%d", Insp_nl);
|
|
|
|
|
int c = snprintf(buf, sizeof(buf), "%d", col +Screen_cols);
|
2020-03-10 10:30:00 +05:30
|
|
|
|
int l = row +1, ls = Insp_nl;
|
top: add a flexible 'Inspect' capability
This commit introduces an extremely powerful, flexible
brand new capability. Now, users can pause the normal
iterative display and inspect the contents of any file
or output from any script, command, or even pipelines.
It's invoked via the 'Y' interactive command which, in
turn, is supported with simple user supplied additions
as new entries in the top personal configuration file.
A separate new 'Inspect' window supports scrolling and
searching, similar to the main top display. Except it
extends existing 'L'/'&' (locate/locate-next) commands
so that an out-of-view match automatically adjusts the
horizontal position bringing such data into view. And
it provides for multiple successive same line matches.
Also, the basic 'more/less' navigation keys are active
in this new 'Inspect' window, to ease user transition.
There are no program changes required when entries are
added to or deleted from the rcfile. And there are no
known limits to the complexity of a script, command or
pipeline, other than the unidirectional nature imposed
by the 'popen' function call which top cannot violate.
Since it's impossible to predict exactly what contents
will be generated, top treats all output as raw binary
data. Any control characters display in '^C' notation
while all other unprintable characters show as '<AB>'.
The biggest problem encountered was with the find/next
capability since that strstr guy was really diminished
given the possibility that numerous 'strings' could be
encountered *within* many of top's raw, binary 'rows'.
Oh, and another problem was in maintaining the perfect
left & right text justification of this commit message
along with all of the commit summaries. Some of those
summaries (like this very one) are of course, slightly
shorter, to make room for the 'man document' addition.
Enjoy!
Signed-off-by: Jim Warner <james.warner@comcast.net>
2012-11-25 10:30:05 +05:30
|
|
|
|
|
2012-12-03 11:30:00 +05:30
|
|
|
|
if (!Insp_bufrd)
|
|
|
|
|
l = ls = 0;
|
top: add a flexible 'Inspect' capability
This commit introduces an extremely powerful, flexible
brand new capability. Now, users can pause the normal
iterative display and inspect the contents of any file
or output from any script, command, or even pipelines.
It's invoked via the 'Y' interactive command which, in
turn, is supported with simple user supplied additions
as new entries in the top personal configuration file.
A separate new 'Inspect' window supports scrolling and
searching, similar to the main top display. Except it
extends existing 'L'/'&' (locate/locate-next) commands
so that an out-of-view match automatically adjusts the
horizontal position bringing such data into view. And
it provides for multiple successive same line matches.
Also, the basic 'more/less' navigation keys are active
in this new 'Inspect' window, to ease user transition.
There are no program changes required when entries are
added to or deleted from the rcfile. And there are no
known limits to the complexity of a script, command or
pipeline, other than the unidirectional nature imposed
by the 'popen' function call which top cannot violate.
Since it's impossible to predict exactly what contents
will be generated, top treats all output as raw binary
data. Any control characters display in '^C' notation
while all other unprintable characters show as '<AB>'.
The biggest problem encountered was with the find/next
capability since that strstr guy was really diminished
given the possibility that numerous 'strings' could be
encountered *within* many of top's raw, binary 'rows'.
Oh, and another problem was in maintaining the perfect
left & right text justification of this commit message
along with all of the commit summaries. Some of those
summaries (like this very one) are of course, slightly
shorter, to make room for the 'man document' addition.
Enjoy!
Signed-off-by: Jim Warner <james.warner@comcast.net>
2012-11-25 10:30:05 +05:30
|
|
|
|
snprintf(buf, sizeof(buf), N_fmt(YINSP_status_fmt)
|
2012-12-04 11:30:00 +05:30
|
|
|
|
, Insp_sel->name
|
top: add a flexible 'Inspect' capability
This commit introduces an extremely powerful, flexible
brand new capability. Now, users can pause the normal
iterative display and inspect the contents of any file
or output from any script, command, or even pipelines.
It's invoked via the 'Y' interactive command which, in
turn, is supported with simple user supplied additions
as new entries in the top personal configuration file.
A separate new 'Inspect' window supports scrolling and
searching, similar to the main top display. Except it
extends existing 'L'/'&' (locate/locate-next) commands
so that an out-of-view match automatically adjusts the
horizontal position bringing such data into view. And
it provides for multiple successive same line matches.
Also, the basic 'more/less' navigation keys are active
in this new 'Inspect' window, to ease user transition.
There are no program changes required when entries are
added to or deleted from the rcfile. And there are no
known limits to the complexity of a script, command or
pipeline, other than the unidirectional nature imposed
by the 'popen' function call which top cannot violate.
Since it's impossible to predict exactly what contents
will be generated, top treats all output as raw binary
data. Any control characters display in '^C' notation
while all other unprintable characters show as '<AB>'.
The biggest problem encountered was with the find/next
capability since that strstr guy was really diminished
given the possibility that numerous 'strings' could be
encountered *within* many of top's raw, binary 'rows'.
Oh, and another problem was in maintaining the perfect
left & right text justification of this commit message
along with all of the commit summaries. Some of those
summaries (like this very one) are of course, slightly
shorter, to make room for the 'man document' addition.
Enjoy!
Signed-off-by: Jim Warner <james.warner@comcast.net>
2012-11-25 10:30:05 +05:30
|
|
|
|
, r, l, r, ls
|
|
|
|
|
, c, col + 1, c, col + Screen_cols
|
2012-11-28 11:30:00 +05:30
|
|
|
|
, (unsigned long)Insp_bufrd);
|
top: add a flexible 'Inspect' capability
This commit introduces an extremely powerful, flexible
brand new capability. Now, users can pause the normal
iterative display and inspect the contents of any file
or output from any script, command, or even pipelines.
It's invoked via the 'Y' interactive command which, in
turn, is supported with simple user supplied additions
as new entries in the top personal configuration file.
A separate new 'Inspect' window supports scrolling and
searching, similar to the main top display. Except it
extends existing 'L'/'&' (locate/locate-next) commands
so that an out-of-view match automatically adjusts the
horizontal position bringing such data into view. And
it provides for multiple successive same line matches.
Also, the basic 'more/less' navigation keys are active
in this new 'Inspect' window, to ease user transition.
There are no program changes required when entries are
added to or deleted from the rcfile. And there are no
known limits to the complexity of a script, command or
pipeline, other than the unidirectional nature imposed
by the 'popen' function call which top cannot violate.
Since it's impossible to predict exactly what contents
will be generated, top treats all output as raw binary
data. Any control characters display in '^C' notation
while all other unprintable characters show as '<AB>'.
The biggest problem encountered was with the find/next
capability since that strstr guy was really diminished
given the possibility that numerous 'strings' could be
encountered *within* many of top's raw, binary 'rows'.
Oh, and another problem was in maintaining the perfect
left & right text justification of this commit message
along with all of the commit summaries. Some of those
summaries (like this very one) are of course, slightly
shorter, to make room for the 'man document' addition.
Enjoy!
Signed-off-by: Jim Warner <james.warner@comcast.net>
2012-11-25 10:30:05 +05:30
|
|
|
|
INSP_MKSL(0, buf);
|
|
|
|
|
|
top: extend multi-byte support to 'Inspection' feature
The previous commit implemented multi-byte support for
the basic top user interaction and display provisions.
This commit completes multi-byte support by addressing
that 'Inspect Other Output' feature (the 'Y' command).
Few people probably exploit this very powerful feature
which allows the perusing of any file or piped output.
And even if nobody uses 'Y', someone will stumble over
it on the help screen and try it out. Assuming top was
not built with INSP_OFFDEMO defined, they'll end up on
the screen our translators have faithfully translated.
Without this patch, such a screen would display with a
bunch of 'unprintable' characters which will then show
in the standard (less-like) way as: '^A', '<C3>', etc.
In other words, those poor screens will be a big mess!
[ this program can even display an executable binary ]
[ while at that same time supporting Find/Find Next. ]
[ imagine, a file with no guarantee of real strings! ]
[ just try a Find using less with such binary files. ]
With this commit, the translated 'Y' demo screens will
now be properly shown, providing no invalid multi-byte
characters have been detected. Should that be the case
then they'll be displayed in that less-like way above.
And, if users go on to fully exploit this 'Y' command,
there is a good chance that a file or pipe might yield
output in a utf-8 multi-byte form. Should that be true
such output will thus be handled appropriately by top.
[ in many respects, this change was more challenging ]
[ than the basic support within the previous commit. ]
[ story of my life: least used = most effort needed. ]
Many thanks to our procps-ng translators which enabled
a proper test of these changed 'Y' command provisions:
. Vietnamese: Trần Ngọc Quân
. Polish: Jakub Bogusz
. German: Mario Blättermann
. French: Frédéric Marchal, Stéphane Aulery
[ and my sincerest apologies too, for my negligence! ]
Reference(s):
https://gitlab.com/procps-ng/procps/issues/68
Signed-off-by: Jim Warner <james.warner@comcast.net>
2017-09-27 10:33:33 +05:30
|
|
|
|
mkrow_func = Insp_utf8 ? insp_mkrow_utf8 : insp_mkrow_raw;
|
|
|
|
|
|
top: add a flexible 'Inspect' capability
This commit introduces an extremely powerful, flexible
brand new capability. Now, users can pause the normal
iterative display and inspect the contents of any file
or output from any script, command, or even pipelines.
It's invoked via the 'Y' interactive command which, in
turn, is supported with simple user supplied additions
as new entries in the top personal configuration file.
A separate new 'Inspect' window supports scrolling and
searching, similar to the main top display. Except it
extends existing 'L'/'&' (locate/locate-next) commands
so that an out-of-view match automatically adjusts the
horizontal position bringing such data into view. And
it provides for multiple successive same line matches.
Also, the basic 'more/less' navigation keys are active
in this new 'Inspect' window, to ease user transition.
There are no program changes required when entries are
added to or deleted from the rcfile. And there are no
known limits to the complexity of a script, command or
pipeline, other than the unidirectional nature imposed
by the 'popen' function call which top cannot violate.
Since it's impossible to predict exactly what contents
will be generated, top treats all output as raw binary
data. Any control characters display in '^C' notation
while all other unprintable characters show as '<AB>'.
The biggest problem encountered was with the find/next
capability since that strstr guy was really diminished
given the possibility that numerous 'strings' could be
encountered *within* many of top's raw, binary 'rows'.
Oh, and another problem was in maintaining the perfect
left & right text justification of this commit message
along with all of the commit summaries. Some of those
summaries (like this very one) are of course, slightly
shorter, to make room for the 'man document' addition.
Enjoy!
Signed-off-by: Jim Warner <james.warner@comcast.net>
2012-11-25 10:30:05 +05:30
|
|
|
|
for ( ; max && row < Insp_nl; row++) {
|
|
|
|
|
putp("\n");
|
top: extend multi-byte support to 'Inspection' feature
The previous commit implemented multi-byte support for
the basic top user interaction and display provisions.
This commit completes multi-byte support by addressing
that 'Inspect Other Output' feature (the 'Y' command).
Few people probably exploit this very powerful feature
which allows the perusing of any file or piped output.
And even if nobody uses 'Y', someone will stumble over
it on the help screen and try it out. Assuming top was
not built with INSP_OFFDEMO defined, they'll end up on
the screen our translators have faithfully translated.
Without this patch, such a screen would display with a
bunch of 'unprintable' characters which will then show
in the standard (less-like) way as: '^A', '<C3>', etc.
In other words, those poor screens will be a big mess!
[ this program can even display an executable binary ]
[ while at that same time supporting Find/Find Next. ]
[ imagine, a file with no guarantee of real strings! ]
[ just try a Find using less with such binary files. ]
With this commit, the translated 'Y' demo screens will
now be properly shown, providing no invalid multi-byte
characters have been detected. Should that be the case
then they'll be displayed in that less-like way above.
And, if users go on to fully exploit this 'Y' command,
there is a good chance that a file or pipe might yield
output in a utf-8 multi-byte form. Should that be true
such output will thus be handled appropriately by top.
[ in many respects, this change was more challenging ]
[ than the basic support within the previous commit. ]
[ story of my life: least used = most effort needed. ]
Many thanks to our procps-ng translators which enabled
a proper test of these changed 'Y' command provisions:
. Vietnamese: Trần Ngọc Quân
. Polish: Jakub Bogusz
. German: Mario Blättermann
. French: Frédéric Marchal, Stéphane Aulery
[ and my sincerest apologies too, for my negligence! ]
Reference(s):
https://gitlab.com/procps-ng/procps/issues/68
Signed-off-by: Jim Warner <james.warner@comcast.net>
2017-09-27 10:33:33 +05:30
|
|
|
|
mkrow_func(col, row);
|
top: add a flexible 'Inspect' capability
This commit introduces an extremely powerful, flexible
brand new capability. Now, users can pause the normal
iterative display and inspect the contents of any file
or output from any script, command, or even pipelines.
It's invoked via the 'Y' interactive command which, in
turn, is supported with simple user supplied additions
as new entries in the top personal configuration file.
A separate new 'Inspect' window supports scrolling and
searching, similar to the main top display. Except it
extends existing 'L'/'&' (locate/locate-next) commands
so that an out-of-view match automatically adjusts the
horizontal position bringing such data into view. And
it provides for multiple successive same line matches.
Also, the basic 'more/less' navigation keys are active
in this new 'Inspect' window, to ease user transition.
There are no program changes required when entries are
added to or deleted from the rcfile. And there are no
known limits to the complexity of a script, command or
pipeline, other than the unidirectional nature imposed
by the 'popen' function call which top cannot violate.
Since it's impossible to predict exactly what contents
will be generated, top treats all output as raw binary
data. Any control characters display in '^C' notation
while all other unprintable characters show as '<AB>'.
The biggest problem encountered was with the find/next
capability since that strstr guy was really diminished
given the possibility that numerous 'strings' could be
encountered *within* many of top's raw, binary 'rows'.
Oh, and another problem was in maintaining the perfect
left & right text justification of this commit message
along with all of the commit summaries. Some of those
summaries (like this very one) are of course, slightly
shorter, to make room for the 'man document' addition.
Enjoy!
Signed-off-by: Jim Warner <james.warner@comcast.net>
2012-11-25 10:30:05 +05:30
|
|
|
|
--max;
|
|
|
|
|
}
|
2013-02-07 11:30:00 +05:30
|
|
|
|
|
2012-12-03 11:30:00 +05:30
|
|
|
|
if (max)
|
|
|
|
|
putp(Cap_nl_clreos);
|
|
|
|
|
} // end: insp_show_pgs
|
top: add a flexible 'Inspect' capability
This commit introduces an extremely powerful, flexible
brand new capability. Now, users can pause the normal
iterative display and inspect the contents of any file
or output from any script, command, or even pipelines.
It's invoked via the 'Y' interactive command which, in
turn, is supported with simple user supplied additions
as new entries in the top personal configuration file.
A separate new 'Inspect' window supports scrolling and
searching, similar to the main top display. Except it
extends existing 'L'/'&' (locate/locate-next) commands
so that an out-of-view match automatically adjusts the
horizontal position bringing such data into view. And
it provides for multiple successive same line matches.
Also, the basic 'more/less' navigation keys are active
in this new 'Inspect' window, to ease user transition.
There are no program changes required when entries are
added to or deleted from the rcfile. And there are no
known limits to the complexity of a script, command or
pipeline, other than the unidirectional nature imposed
by the 'popen' function call which top cannot violate.
Since it's impossible to predict exactly what contents
will be generated, top treats all output as raw binary
data. Any control characters display in '^C' notation
while all other unprintable characters show as '<AB>'.
The biggest problem encountered was with the find/next
capability since that strstr guy was really diminished
given the possibility that numerous 'strings' could be
encountered *within* many of top's raw, binary 'rows'.
Oh, and another problem was in maintaining the perfect
left & right text justification of this commit message
along with all of the commit summaries. Some of those
summaries (like this very one) are of course, slightly
shorter, to make room for the 'man document' addition.
Enjoy!
Signed-off-by: Jim Warner <james.warner@comcast.net>
2012-11-25 10:30:05 +05:30
|
|
|
|
|
|
|
|
|
|
|
|
|
|
/*
|
|
|
|
|
* This guy is responsible for displaying the Insp_buf contents and
|
|
|
|
|
* managing all scrolling/locate requests until the user gives up. */
|
2018-07-04 10:30:00 +05:30
|
|
|
|
static int insp_view_choice (proc_t *p) {
|
top: add a flexible 'Inspect' capability
This commit introduces an extremely powerful, flexible
brand new capability. Now, users can pause the normal
iterative display and inspect the contents of any file
or output from any script, command, or even pipelines.
It's invoked via the 'Y' interactive command which, in
turn, is supported with simple user supplied additions
as new entries in the top personal configuration file.
A separate new 'Inspect' window supports scrolling and
searching, similar to the main top display. Except it
extends existing 'L'/'&' (locate/locate-next) commands
so that an out-of-view match automatically adjusts the
horizontal position bringing such data into view. And
it provides for multiple successive same line matches.
Also, the basic 'more/less' navigation keys are active
in this new 'Inspect' window, to ease user transition.
There are no program changes required when entries are
added to or deleted from the rcfile. And there are no
known limits to the complexity of a script, command or
pipeline, other than the unidirectional nature imposed
by the 'popen' function call which top cannot violate.
Since it's impossible to predict exactly what contents
will be generated, top treats all output as raw binary
data. Any control characters display in '^C' notation
while all other unprintable characters show as '<AB>'.
The biggest problem encountered was with the find/next
capability since that strstr guy was really diminished
given the possibility that numerous 'strings' could be
encountered *within* many of top's raw, binary 'rows'.
Oh, and another problem was in maintaining the perfect
left & right text justification of this commit message
along with all of the commit summaries. Some of those
summaries (like this very one) are of course, slightly
shorter, to make room for the 'man document' addition.
Enjoy!
Signed-off-by: Jim Warner <james.warner@comcast.net>
2012-11-25 10:30:05 +05:30
|
|
|
|
#ifdef INSP_SLIDE_1
|
|
|
|
|
#define hzAMT 1
|
|
|
|
|
#else
|
|
|
|
|
#define hzAMT 8
|
|
|
|
|
#endif
|
|
|
|
|
#define maxLN (Screen_rows - (Msg_row +1))
|
2015-07-27 10:30:00 +05:30
|
|
|
|
#define makHD(b1,b2) { \
|
2018-07-04 10:30:00 +05:30
|
|
|
|
snprintf(b1, sizeof(b1), "%d", p->tid); \
|
|
|
|
|
snprintf(b2, sizeof(b2), "%s", p->cmd); }
|
2012-12-04 11:30:00 +05:30
|
|
|
|
#define makFS(dst) { if (Insp_sel->flen < 22) \
|
|
|
|
|
snprintf(dst, sizeof(dst), "%s", Insp_sel->fstr); \
|
|
|
|
|
else snprintf(dst, sizeof(dst), "%.19s...", Insp_sel->fstr); }
|
2018-01-26 11:30:00 +05:30
|
|
|
|
char buf[LRGBUFSIZ];
|
2013-01-16 11:30:00 +05:30
|
|
|
|
int key, curlin = 0, curcol = 0;
|
top: add a flexible 'Inspect' capability
This commit introduces an extremely powerful, flexible
brand new capability. Now, users can pause the normal
iterative display and inspect the contents of any file
or output from any script, command, or even pipelines.
It's invoked via the 'Y' interactive command which, in
turn, is supported with simple user supplied additions
as new entries in the top personal configuration file.
A separate new 'Inspect' window supports scrolling and
searching, similar to the main top display. Except it
extends existing 'L'/'&' (locate/locate-next) commands
so that an out-of-view match automatically adjusts the
horizontal position bringing such data into view. And
it provides for multiple successive same line matches.
Also, the basic 'more/less' navigation keys are active
in this new 'Inspect' window, to ease user transition.
There are no program changes required when entries are
added to or deleted from the rcfile. And there are no
known limits to the complexity of a script, command or
pipeline, other than the unidirectional nature imposed
by the 'popen' function call which top cannot violate.
Since it's impossible to predict exactly what contents
will be generated, top treats all output as raw binary
data. Any control characters display in '^C' notation
while all other unprintable characters show as '<AB>'.
The biggest problem encountered was with the find/next
capability since that strstr guy was really diminished
given the possibility that numerous 'strings' could be
encountered *within* many of top's raw, binary 'rows'.
Oh, and another problem was in maintaining the perfect
left & right text justification of this commit message
along with all of the commit summaries. Some of those
summaries (like this very one) are of course, slightly
shorter, to make room for the 'man document' addition.
Enjoy!
Signed-off-by: Jim Warner <james.warner@comcast.net>
2012-11-25 10:30:05 +05:30
|
|
|
|
|
2013-01-16 11:30:00 +05:30
|
|
|
|
signify_that:
|
|
|
|
|
putp(Cap_clr_scr);
|
|
|
|
|
adj_geometry();
|
|
|
|
|
|
|
|
|
|
for (;;) {
|
2018-05-19 10:30:00 +05:30
|
|
|
|
char pid[6], cmd[64];
|
2012-12-04 11:30:00 +05:30
|
|
|
|
|
top: add a flexible 'Inspect' capability
This commit introduces an extremely powerful, flexible
brand new capability. Now, users can pause the normal
iterative display and inspect the contents of any file
or output from any script, command, or even pipelines.
It's invoked via the 'Y' interactive command which, in
turn, is supported with simple user supplied additions
as new entries in the top personal configuration file.
A separate new 'Inspect' window supports scrolling and
searching, similar to the main top display. Except it
extends existing 'L'/'&' (locate/locate-next) commands
so that an out-of-view match automatically adjusts the
horizontal position bringing such data into view. And
it provides for multiple successive same line matches.
Also, the basic 'more/less' navigation keys are active
in this new 'Inspect' window, to ease user transition.
There are no program changes required when entries are
added to or deleted from the rcfile. And there are no
known limits to the complexity of a script, command or
pipeline, other than the unidirectional nature imposed
by the 'popen' function call which top cannot violate.
Since it's impossible to predict exactly what contents
will be generated, top treats all output as raw binary
data. Any control characters display in '^C' notation
while all other unprintable characters show as '<AB>'.
The biggest problem encountered was with the find/next
capability since that strstr guy was really diminished
given the possibility that numerous 'strings' could be
encountered *within* many of top's raw, binary 'rows'.
Oh, and another problem was in maintaining the perfect
left & right text justification of this commit message
along with all of the commit summaries. Some of those
summaries (like this very one) are of course, slightly
shorter, to make room for the 'man document' addition.
Enjoy!
Signed-off-by: Jim Warner <james.warner@comcast.net>
2012-11-25 10:30:05 +05:30
|
|
|
|
if (curcol < 0) curcol = 0;
|
|
|
|
|
if (curlin >= Insp_nl) curlin = Insp_nl -1;
|
|
|
|
|
if (curlin < 0) curlin = 0;
|
|
|
|
|
|
2012-12-04 11:30:00 +05:30
|
|
|
|
makFS(buf)
|
2015-07-27 10:30:00 +05:30
|
|
|
|
makHD(pid,cmd)
|
2013-01-29 11:30:00 +05:30
|
|
|
|
putp(Cap_home);
|
2015-02-01 11:30:00 +05:30
|
|
|
|
show_special(1, fmtmk(N_unq(YINSP_hdview_fmt)
|
2015-07-27 10:30:00 +05:30
|
|
|
|
, pid, cmd, (Insp_sel->fstr[0]) ? buf : " N/A ")); // nls_maybe
|
2012-12-03 11:30:00 +05:30
|
|
|
|
insp_show_pgs(curcol, curlin, maxLN);
|
2013-01-16 11:30:00 +05:30
|
|
|
|
fflush(stdout);
|
2012-12-01 11:30:00 +05:30
|
|
|
|
/* fflush(stdin) didn't do the trick, so we'll just dip a little deeper
|
|
|
|
|
lest repeated <Enter> keys produce immediate re-selection in caller */
|
|
|
|
|
tcflush(STDIN_FILENO, TCIFLUSH);
|
top: add a flexible 'Inspect' capability
This commit introduces an extremely powerful, flexible
brand new capability. Now, users can pause the normal
iterative display and inspect the contents of any file
or output from any script, command, or even pipelines.
It's invoked via the 'Y' interactive command which, in
turn, is supported with simple user supplied additions
as new entries in the top personal configuration file.
A separate new 'Inspect' window supports scrolling and
searching, similar to the main top display. Except it
extends existing 'L'/'&' (locate/locate-next) commands
so that an out-of-view match automatically adjusts the
horizontal position bringing such data into view. And
it provides for multiple successive same line matches.
Also, the basic 'more/less' navigation keys are active
in this new 'Inspect' window, to ease user transition.
There are no program changes required when entries are
added to or deleted from the rcfile. And there are no
known limits to the complexity of a script, command or
pipeline, other than the unidirectional nature imposed
by the 'popen' function call which top cannot violate.
Since it's impossible to predict exactly what contents
will be generated, top treats all output as raw binary
data. Any control characters display in '^C' notation
while all other unprintable characters show as '<AB>'.
The biggest problem encountered was with the find/next
capability since that strstr guy was really diminished
given the possibility that numerous 'strings' could be
encountered *within* many of top's raw, binary 'rows'.
Oh, and another problem was in maintaining the perfect
left & right text justification of this commit message
along with all of the commit summaries. Some of those
summaries (like this very one) are of course, slightly
shorter, to make room for the 'man document' addition.
Enjoy!
Signed-off-by: Jim Warner <james.warner@comcast.net>
2012-11-25 10:30:05 +05:30
|
|
|
|
|
2013-06-30 10:30:00 +05:30
|
|
|
|
if (Frames_signal) goto signify_that;
|
2013-02-15 11:30:00 +05:30
|
|
|
|
key = iokey(1);
|
2013-01-16 11:30:00 +05:30
|
|
|
|
if (key < 1) goto signify_that;
|
|
|
|
|
|
2013-01-11 11:30:00 +05:30
|
|
|
|
switch (key) {
|
2013-01-16 11:30:00 +05:30
|
|
|
|
case kbd_ENTER: // must force new iokey()
|
2013-01-16 11:30:00 +05:30
|
|
|
|
key = INT_MAX; // fall through !
|
2013-01-11 11:30:00 +05:30
|
|
|
|
case kbd_ESC:
|
|
|
|
|
case 'q':
|
top: add a flexible 'Inspect' capability
This commit introduces an extremely powerful, flexible
brand new capability. Now, users can pause the normal
iterative display and inspect the contents of any file
or output from any script, command, or even pipelines.
It's invoked via the 'Y' interactive command which, in
turn, is supported with simple user supplied additions
as new entries in the top personal configuration file.
A separate new 'Inspect' window supports scrolling and
searching, similar to the main top display. Except it
extends existing 'L'/'&' (locate/locate-next) commands
so that an out-of-view match automatically adjusts the
horizontal position bringing such data into view. And
it provides for multiple successive same line matches.
Also, the basic 'more/less' navigation keys are active
in this new 'Inspect' window, to ease user transition.
There are no program changes required when entries are
added to or deleted from the rcfile. And there are no
known limits to the complexity of a script, command or
pipeline, other than the unidirectional nature imposed
by the 'popen' function call which top cannot violate.
Since it's impossible to predict exactly what contents
will be generated, top treats all output as raw binary
data. Any control characters display in '^C' notation
while all other unprintable characters show as '<AB>'.
The biggest problem encountered was with the find/next
capability since that strstr guy was really diminished
given the possibility that numerous 'strings' could be
encountered *within* many of top's raw, binary 'rows'.
Oh, and another problem was in maintaining the perfect
left & right text justification of this commit message
along with all of the commit summaries. Some of those
summaries (like this very one) are of course, slightly
shorter, to make room for the 'man document' addition.
Enjoy!
Signed-off-by: Jim Warner <james.warner@comcast.net>
2012-11-25 10:30:05 +05:30
|
|
|
|
putp(Cap_clr_scr);
|
|
|
|
|
return key;
|
|
|
|
|
case kbd_LEFT:
|
|
|
|
|
curcol -= hzAMT;
|
|
|
|
|
break;
|
|
|
|
|
case kbd_RIGHT:
|
|
|
|
|
curcol += hzAMT;
|
|
|
|
|
break;
|
|
|
|
|
case kbd_UP:
|
|
|
|
|
--curlin;
|
|
|
|
|
break;
|
|
|
|
|
case kbd_DOWN:
|
|
|
|
|
++curlin;
|
|
|
|
|
break;
|
2013-01-11 11:30:00 +05:30
|
|
|
|
case kbd_PGUP:
|
|
|
|
|
case 'b':
|
top: add a flexible 'Inspect' capability
This commit introduces an extremely powerful, flexible
brand new capability. Now, users can pause the normal
iterative display and inspect the contents of any file
or output from any script, command, or even pipelines.
It's invoked via the 'Y' interactive command which, in
turn, is supported with simple user supplied additions
as new entries in the top personal configuration file.
A separate new 'Inspect' window supports scrolling and
searching, similar to the main top display. Except it
extends existing 'L'/'&' (locate/locate-next) commands
so that an out-of-view match automatically adjusts the
horizontal position bringing such data into view. And
it provides for multiple successive same line matches.
Also, the basic 'more/less' navigation keys are active
in this new 'Inspect' window, to ease user transition.
There are no program changes required when entries are
added to or deleted from the rcfile. And there are no
known limits to the complexity of a script, command or
pipeline, other than the unidirectional nature imposed
by the 'popen' function call which top cannot violate.
Since it's impossible to predict exactly what contents
will be generated, top treats all output as raw binary
data. Any control characters display in '^C' notation
while all other unprintable characters show as '<AB>'.
The biggest problem encountered was with the find/next
capability since that strstr guy was really diminished
given the possibility that numerous 'strings' could be
encountered *within* many of top's raw, binary 'rows'.
Oh, and another problem was in maintaining the perfect
left & right text justification of this commit message
along with all of the commit summaries. Some of those
summaries (like this very one) are of course, slightly
shorter, to make room for the 'man document' addition.
Enjoy!
Signed-off-by: Jim Warner <james.warner@comcast.net>
2012-11-25 10:30:05 +05:30
|
|
|
|
curlin -= maxLN -1; // keep 1 line for reference
|
|
|
|
|
break;
|
2013-01-11 11:30:00 +05:30
|
|
|
|
case kbd_PGDN:
|
|
|
|
|
case kbd_SPACE:
|
top: add a flexible 'Inspect' capability
This commit introduces an extremely powerful, flexible
brand new capability. Now, users can pause the normal
iterative display and inspect the contents of any file
or output from any script, command, or even pipelines.
It's invoked via the 'Y' interactive command which, in
turn, is supported with simple user supplied additions
as new entries in the top personal configuration file.
A separate new 'Inspect' window supports scrolling and
searching, similar to the main top display. Except it
extends existing 'L'/'&' (locate/locate-next) commands
so that an out-of-view match automatically adjusts the
horizontal position bringing such data into view. And
it provides for multiple successive same line matches.
Also, the basic 'more/less' navigation keys are active
in this new 'Inspect' window, to ease user transition.
There are no program changes required when entries are
added to or deleted from the rcfile. And there are no
known limits to the complexity of a script, command or
pipeline, other than the unidirectional nature imposed
by the 'popen' function call which top cannot violate.
Since it's impossible to predict exactly what contents
will be generated, top treats all output as raw binary
data. Any control characters display in '^C' notation
while all other unprintable characters show as '<AB>'.
The biggest problem encountered was with the find/next
capability since that strstr guy was really diminished
given the possibility that numerous 'strings' could be
encountered *within* many of top's raw, binary 'rows'.
Oh, and another problem was in maintaining the perfect
left & right text justification of this commit message
along with all of the commit summaries. Some of those
summaries (like this very one) are of course, slightly
shorter, to make room for the 'man document' addition.
Enjoy!
Signed-off-by: Jim Warner <james.warner@comcast.net>
2012-11-25 10:30:05 +05:30
|
|
|
|
curlin += maxLN -1; // ditto
|
|
|
|
|
break;
|
2013-01-11 11:30:00 +05:30
|
|
|
|
case kbd_HOME:
|
|
|
|
|
case 'g':
|
top: add a flexible 'Inspect' capability
This commit introduces an extremely powerful, flexible
brand new capability. Now, users can pause the normal
iterative display and inspect the contents of any file
or output from any script, command, or even pipelines.
It's invoked via the 'Y' interactive command which, in
turn, is supported with simple user supplied additions
as new entries in the top personal configuration file.
A separate new 'Inspect' window supports scrolling and
searching, similar to the main top display. Except it
extends existing 'L'/'&' (locate/locate-next) commands
so that an out-of-view match automatically adjusts the
horizontal position bringing such data into view. And
it provides for multiple successive same line matches.
Also, the basic 'more/less' navigation keys are active
in this new 'Inspect' window, to ease user transition.
There are no program changes required when entries are
added to or deleted from the rcfile. And there are no
known limits to the complexity of a script, command or
pipeline, other than the unidirectional nature imposed
by the 'popen' function call which top cannot violate.
Since it's impossible to predict exactly what contents
will be generated, top treats all output as raw binary
data. Any control characters display in '^C' notation
while all other unprintable characters show as '<AB>'.
The biggest problem encountered was with the find/next
capability since that strstr guy was really diminished
given the possibility that numerous 'strings' could be
encountered *within* many of top's raw, binary 'rows'.
Oh, and another problem was in maintaining the perfect
left & right text justification of this commit message
along with all of the commit summaries. Some of those
summaries (like this very one) are of course, slightly
shorter, to make room for the 'man document' addition.
Enjoy!
Signed-off-by: Jim Warner <james.warner@comcast.net>
2012-11-25 10:30:05 +05:30
|
|
|
|
curcol = curlin = 0;
|
|
|
|
|
break;
|
2013-01-11 11:30:00 +05:30
|
|
|
|
case kbd_END:
|
|
|
|
|
case 'G':
|
top: add a flexible 'Inspect' capability
This commit introduces an extremely powerful, flexible
brand new capability. Now, users can pause the normal
iterative display and inspect the contents of any file
or output from any script, command, or even pipelines.
It's invoked via the 'Y' interactive command which, in
turn, is supported with simple user supplied additions
as new entries in the top personal configuration file.
A separate new 'Inspect' window supports scrolling and
searching, similar to the main top display. Except it
extends existing 'L'/'&' (locate/locate-next) commands
so that an out-of-view match automatically adjusts the
horizontal position bringing such data into view. And
it provides for multiple successive same line matches.
Also, the basic 'more/less' navigation keys are active
in this new 'Inspect' window, to ease user transition.
There are no program changes required when entries are
added to or deleted from the rcfile. And there are no
known limits to the complexity of a script, command or
pipeline, other than the unidirectional nature imposed
by the 'popen' function call which top cannot violate.
Since it's impossible to predict exactly what contents
will be generated, top treats all output as raw binary
data. Any control characters display in '^C' notation
while all other unprintable characters show as '<AB>'.
The biggest problem encountered was with the find/next
capability since that strstr guy was really diminished
given the possibility that numerous 'strings' could be
encountered *within* many of top's raw, binary 'rows'.
Oh, and another problem was in maintaining the perfect
left & right text justification of this commit message
along with all of the commit summaries. Some of those
summaries (like this very one) are of course, slightly
shorter, to make room for the 'man document' addition.
Enjoy!
Signed-off-by: Jim Warner <james.warner@comcast.net>
2012-11-25 10:30:05 +05:30
|
|
|
|
curcol = 0;
|
|
|
|
|
curlin = Insp_nl - maxLN;
|
|
|
|
|
break;
|
2013-01-11 11:30:00 +05:30
|
|
|
|
case 'L':
|
|
|
|
|
case '&':
|
|
|
|
|
case '/':
|
|
|
|
|
case 'n':
|
top: extend multi-byte support to 'Inspection' feature
The previous commit implemented multi-byte support for
the basic top user interaction and display provisions.
This commit completes multi-byte support by addressing
that 'Inspect Other Output' feature (the 'Y' command).
Few people probably exploit this very powerful feature
which allows the perusing of any file or piped output.
And even if nobody uses 'Y', someone will stumble over
it on the help screen and try it out. Assuming top was
not built with INSP_OFFDEMO defined, they'll end up on
the screen our translators have faithfully translated.
Without this patch, such a screen would display with a
bunch of 'unprintable' characters which will then show
in the standard (less-like) way as: '^A', '<C3>', etc.
In other words, those poor screens will be a big mess!
[ this program can even display an executable binary ]
[ while at that same time supporting Find/Find Next. ]
[ imagine, a file with no guarantee of real strings! ]
[ just try a Find using less with such binary files. ]
With this commit, the translated 'Y' demo screens will
now be properly shown, providing no invalid multi-byte
characters have been detected. Should that be the case
then they'll be displayed in that less-like way above.
And, if users go on to fully exploit this 'Y' command,
there is a good chance that a file or pipe might yield
output in a utf-8 multi-byte form. Should that be true
such output will thus be handled appropriately by top.
[ in many respects, this change was more challenging ]
[ than the basic support within the previous commit. ]
[ story of my life: least used = most effort needed. ]
Many thanks to our procps-ng translators which enabled
a proper test of these changed 'Y' command provisions:
. Vietnamese: Trần Ngọc Quân
. Polish: Jakub Bogusz
. German: Mario Blättermann
. French: Frédéric Marchal, Stéphane Aulery
[ and my sincerest apologies too, for my negligence! ]
Reference(s):
https://gitlab.com/procps-ng/procps/issues/68
Signed-off-by: Jim Warner <james.warner@comcast.net>
2017-09-27 10:33:33 +05:30
|
|
|
|
if (!Insp_utf8)
|
|
|
|
|
insp_find_str(key, &curcol, &curlin);
|
|
|
|
|
else {
|
|
|
|
|
int tmpcol = utf8_proper_col(Insp_p[curlin], curcol, 1);
|
|
|
|
|
insp_find_str(key, &tmpcol, &curlin);
|
|
|
|
|
curcol = utf8_proper_col(Insp_p[curlin], tmpcol, 0);
|
|
|
|
|
}
|
2013-07-05 10:30:00 +05:30
|
|
|
|
// must re-hide cursor in case a prompt for a string makes it huge
|
2013-02-07 11:30:00 +05:30
|
|
|
|
putp((Cursor_state = Cap_curs_hide));
|
top: add a flexible 'Inspect' capability
This commit introduces an extremely powerful, flexible
brand new capability. Now, users can pause the normal
iterative display and inspect the contents of any file
or output from any script, command, or even pipelines.
It's invoked via the 'Y' interactive command which, in
turn, is supported with simple user supplied additions
as new entries in the top personal configuration file.
A separate new 'Inspect' window supports scrolling and
searching, similar to the main top display. Except it
extends existing 'L'/'&' (locate/locate-next) commands
so that an out-of-view match automatically adjusts the
horizontal position bringing such data into view. And
it provides for multiple successive same line matches.
Also, the basic 'more/less' navigation keys are active
in this new 'Inspect' window, to ease user transition.
There are no program changes required when entries are
added to or deleted from the rcfile. And there are no
known limits to the complexity of a script, command or
pipeline, other than the unidirectional nature imposed
by the 'popen' function call which top cannot violate.
Since it's impossible to predict exactly what contents
will be generated, top treats all output as raw binary
data. Any control characters display in '^C' notation
while all other unprintable characters show as '<AB>'.
The biggest problem encountered was with the find/next
capability since that strstr guy was really diminished
given the possibility that numerous 'strings' could be
encountered *within* many of top's raw, binary 'rows'.
Oh, and another problem was in maintaining the perfect
left & right text justification of this commit message
along with all of the commit summaries. Some of those
summaries (like this very one) are of course, slightly
shorter, to make room for the 'man document' addition.
Enjoy!
Signed-off-by: Jim Warner <james.warner@comcast.net>
2012-11-25 10:30:05 +05:30
|
|
|
|
break;
|
|
|
|
|
case '=':
|
2012-12-06 11:30:00 +05:30
|
|
|
|
snprintf(buf, sizeof(buf), "%s: %s", Insp_sel->type, Insp_sel->fmts);
|
2012-12-04 11:30:00 +05:30
|
|
|
|
INSP_MKSL(1, buf); // show an extended SL
|
2013-02-15 11:30:00 +05:30
|
|
|
|
if (iokey(1) < 1)
|
2013-01-16 11:30:00 +05:30
|
|
|
|
goto signify_that;
|
top: add a flexible 'Inspect' capability
This commit introduces an extremely powerful, flexible
brand new capability. Now, users can pause the normal
iterative display and inspect the contents of any file
or output from any script, command, or even pipelines.
It's invoked via the 'Y' interactive command which, in
turn, is supported with simple user supplied additions
as new entries in the top personal configuration file.
A separate new 'Inspect' window supports scrolling and
searching, similar to the main top display. Except it
extends existing 'L'/'&' (locate/locate-next) commands
so that an out-of-view match automatically adjusts the
horizontal position bringing such data into view. And
it provides for multiple successive same line matches.
Also, the basic 'more/less' navigation keys are active
in this new 'Inspect' window, to ease user transition.
There are no program changes required when entries are
added to or deleted from the rcfile. And there are no
known limits to the complexity of a script, command or
pipeline, other than the unidirectional nature imposed
by the 'popen' function call which top cannot violate.
Since it's impossible to predict exactly what contents
will be generated, top treats all output as raw binary
data. Any control characters display in '^C' notation
while all other unprintable characters show as '<AB>'.
The biggest problem encountered was with the find/next
capability since that strstr guy was really diminished
given the possibility that numerous 'strings' could be
encountered *within* many of top's raw, binary 'rows'.
Oh, and another problem was in maintaining the perfect
left & right text justification of this commit message
along with all of the commit summaries. Some of those
summaries (like this very one) are of course, slightly
shorter, to make room for the 'man document' addition.
Enjoy!
Signed-off-by: Jim Warner <james.warner@comcast.net>
2012-11-25 10:30:05 +05:30
|
|
|
|
break;
|
|
|
|
|
default: // keep gcc happy
|
|
|
|
|
break;
|
|
|
|
|
}
|
|
|
|
|
}
|
2012-12-03 11:30:00 +05:30
|
|
|
|
#undef hzAMT
|
top: add a flexible 'Inspect' capability
This commit introduces an extremely powerful, flexible
brand new capability. Now, users can pause the normal
iterative display and inspect the contents of any file
or output from any script, command, or even pipelines.
It's invoked via the 'Y' interactive command which, in
turn, is supported with simple user supplied additions
as new entries in the top personal configuration file.
A separate new 'Inspect' window supports scrolling and
searching, similar to the main top display. Except it
extends existing 'L'/'&' (locate/locate-next) commands
so that an out-of-view match automatically adjusts the
horizontal position bringing such data into view. And
it provides for multiple successive same line matches.
Also, the basic 'more/less' navigation keys are active
in this new 'Inspect' window, to ease user transition.
There are no program changes required when entries are
added to or deleted from the rcfile. And there are no
known limits to the complexity of a script, command or
pipeline, other than the unidirectional nature imposed
by the 'popen' function call which top cannot violate.
Since it's impossible to predict exactly what contents
will be generated, top treats all output as raw binary
data. Any control characters display in '^C' notation
while all other unprintable characters show as '<AB>'.
The biggest problem encountered was with the find/next
capability since that strstr guy was really diminished
given the possibility that numerous 'strings' could be
encountered *within* many of top's raw, binary 'rows'.
Oh, and another problem was in maintaining the perfect
left & right text justification of this commit message
along with all of the commit summaries. Some of those
summaries (like this very one) are of course, slightly
shorter, to make room for the 'man document' addition.
Enjoy!
Signed-off-by: Jim Warner <james.warner@comcast.net>
2012-11-25 10:30:05 +05:30
|
|
|
|
#undef maxLN
|
2012-12-04 11:30:00 +05:30
|
|
|
|
#undef makHD
|
|
|
|
|
#undef makFS
|
2012-12-03 11:30:00 +05:30
|
|
|
|
} // end: insp_view_choice
|
top: add a flexible 'Inspect' capability
This commit introduces an extremely powerful, flexible
brand new capability. Now, users can pause the normal
iterative display and inspect the contents of any file
or output from any script, command, or even pipelines.
It's invoked via the 'Y' interactive command which, in
turn, is supported with simple user supplied additions
as new entries in the top personal configuration file.
A separate new 'Inspect' window supports scrolling and
searching, similar to the main top display. Except it
extends existing 'L'/'&' (locate/locate-next) commands
so that an out-of-view match automatically adjusts the
horizontal position bringing such data into view. And
it provides for multiple successive same line matches.
Also, the basic 'more/less' navigation keys are active
in this new 'Inspect' window, to ease user transition.
There are no program changes required when entries are
added to or deleted from the rcfile. And there are no
known limits to the complexity of a script, command or
pipeline, other than the unidirectional nature imposed
by the 'popen' function call which top cannot violate.
Since it's impossible to predict exactly what contents
will be generated, top treats all output as raw binary
data. Any control characters display in '^C' notation
while all other unprintable characters show as '<AB>'.
The biggest problem encountered was with the find/next
capability since that strstr guy was really diminished
given the possibility that numerous 'strings' could be
encountered *within* many of top's raw, binary 'rows'.
Oh, and another problem was in maintaining the perfect
left & right text justification of this commit message
along with all of the commit summaries. Some of those
summaries (like this very one) are of course, slightly
shorter, to make room for the 'man document' addition.
Enjoy!
Signed-off-by: Jim Warner <james.warner@comcast.net>
2012-11-25 10:30:05 +05:30
|
|
|
|
|
|
|
|
|
|
|
|
|
|
/*
|
|
|
|
|
* This is the main Inspect routine, responsible for:
|
|
|
|
|
* 1) validating the passed pid (required, but not always used)
|
|
|
|
|
* 2) presenting/establishing the target selection
|
|
|
|
|
* 3) arranging to fill Insp_buf (via the Inspect.tab[?].func)
|
2012-12-03 11:30:00 +05:30
|
|
|
|
* 4) invoking insp_view_choice for viewing/scrolling/searching
|
top: add a flexible 'Inspect' capability
This commit introduces an extremely powerful, flexible
brand new capability. Now, users can pause the normal
iterative display and inspect the contents of any file
or output from any script, command, or even pipelines.
It's invoked via the 'Y' interactive command which, in
turn, is supported with simple user supplied additions
as new entries in the top personal configuration file.
A separate new 'Inspect' window supports scrolling and
searching, similar to the main top display. Except it
extends existing 'L'/'&' (locate/locate-next) commands
so that an out-of-view match automatically adjusts the
horizontal position bringing such data into view. And
it provides for multiple successive same line matches.
Also, the basic 'more/less' navigation keys are active
in this new 'Inspect' window, to ease user transition.
There are no program changes required when entries are
added to or deleted from the rcfile. And there are no
known limits to the complexity of a script, command or
pipeline, other than the unidirectional nature imposed
by the 'popen' function call which top cannot violate.
Since it's impossible to predict exactly what contents
will be generated, top treats all output as raw binary
data. Any control characters display in '^C' notation
while all other unprintable characters show as '<AB>'.
The biggest problem encountered was with the find/next
capability since that strstr guy was really diminished
given the possibility that numerous 'strings' could be
encountered *within* many of top's raw, binary 'rows'.
Oh, and another problem was in maintaining the perfect
left & right text justification of this commit message
along with all of the commit summaries. Some of those
summaries (like this very one) are of course, slightly
shorter, to make room for the 'man document' addition.
Enjoy!
Signed-off-by: Jim Warner <james.warner@comcast.net>
2012-11-25 10:30:05 +05:30
|
|
|
|
* 5) cleaning up the dynamically acquired memory afterwards */
|
|
|
|
|
static void inspection_utility (int pid) {
|
|
|
|
|
#define mkSEL(dst) { for (i = 0; i < Inspect.total; i++) Inspect.tab[i].caps = "~1"; \
|
|
|
|
|
Inspect.tab[sel].caps = "~4"; dst[0] = '\0'; \
|
|
|
|
|
for (i = 0; i < Inspect.total; i++) { char _s[SMLBUFSIZ]; \
|
|
|
|
|
snprintf(_s, sizeof(_s), " %s %s", Inspect.tab[i].name, Inspect.tab[i].caps); \
|
2018-05-24 10:30:00 +05:30
|
|
|
|
strncat(dst, _s, (sizeof(dst) - 1) - strlen(dst)); } }
|
|
|
|
|
char sels[SCREENMAX];
|
top: add a flexible 'Inspect' capability
This commit introduces an extremely powerful, flexible
brand new capability. Now, users can pause the normal
iterative display and inspect the contents of any file
or output from any script, command, or even pipelines.
It's invoked via the 'Y' interactive command which, in
turn, is supported with simple user supplied additions
as new entries in the top personal configuration file.
A separate new 'Inspect' window supports scrolling and
searching, similar to the main top display. Except it
extends existing 'L'/'&' (locate/locate-next) commands
so that an out-of-view match automatically adjusts the
horizontal position bringing such data into view. And
it provides for multiple successive same line matches.
Also, the basic 'more/less' navigation keys are active
in this new 'Inspect' window, to ease user transition.
There are no program changes required when entries are
added to or deleted from the rcfile. And there are no
known limits to the complexity of a script, command or
pipeline, other than the unidirectional nature imposed
by the 'popen' function call which top cannot violate.
Since it's impossible to predict exactly what contents
will be generated, top treats all output as raw binary
data. Any control characters display in '^C' notation
while all other unprintable characters show as '<AB>'.
The biggest problem encountered was with the find/next
capability since that strstr guy was really diminished
given the possibility that numerous 'strings' could be
encountered *within* many of top's raw, binary 'rows'.
Oh, and another problem was in maintaining the perfect
left & right text justification of this commit message
along with all of the commit summaries. Some of those
summaries (like this very one) are of course, slightly
shorter, to make room for the 'man document' addition.
Enjoy!
Signed-off-by: Jim Warner <james.warner@comcast.net>
2012-11-25 10:30:05 +05:30
|
|
|
|
static int sel;
|
|
|
|
|
int i, key;
|
|
|
|
|
proc_t *p;
|
|
|
|
|
|
|
|
|
|
for (i = 0, p = NULL; i < Frame_maxtask; i++)
|
|
|
|
|
if (pid == Curwin->ppt[i]->tid) {
|
|
|
|
|
p = Curwin->ppt[i];
|
|
|
|
|
break;
|
|
|
|
|
}
|
|
|
|
|
if (!p) {
|
|
|
|
|
show_msg(fmtmk(N_fmt(YINSP_pidbad_fmt), pid));
|
|
|
|
|
return;
|
|
|
|
|
}
|
2013-01-29 11:30:00 +05:30
|
|
|
|
// must re-hide cursor since the prompt for a pid made it huge
|
|
|
|
|
putp((Cursor_state = Cap_curs_hide));
|
2013-01-16 11:30:00 +05:30
|
|
|
|
signify_that:
|
top: add a flexible 'Inspect' capability
This commit introduces an extremely powerful, flexible
brand new capability. Now, users can pause the normal
iterative display and inspect the contents of any file
or output from any script, command, or even pipelines.
It's invoked via the 'Y' interactive command which, in
turn, is supported with simple user supplied additions
as new entries in the top personal configuration file.
A separate new 'Inspect' window supports scrolling and
searching, similar to the main top display. Except it
extends existing 'L'/'&' (locate/locate-next) commands
so that an out-of-view match automatically adjusts the
horizontal position bringing such data into view. And
it provides for multiple successive same line matches.
Also, the basic 'more/less' navigation keys are active
in this new 'Inspect' window, to ease user transition.
There are no program changes required when entries are
added to or deleted from the rcfile. And there are no
known limits to the complexity of a script, command or
pipeline, other than the unidirectional nature imposed
by the 'popen' function call which top cannot violate.
Since it's impossible to predict exactly what contents
will be generated, top treats all output as raw binary
data. Any control characters display in '^C' notation
while all other unprintable characters show as '<AB>'.
The biggest problem encountered was with the find/next
capability since that strstr guy was really diminished
given the possibility that numerous 'strings' could be
encountered *within* many of top's raw, binary 'rows'.
Oh, and another problem was in maintaining the perfect
left & right text justification of this commit message
along with all of the commit summaries. Some of those
summaries (like this very one) are of course, slightly
shorter, to make room for the 'man document' addition.
Enjoy!
Signed-off-by: Jim Warner <james.warner@comcast.net>
2012-11-25 10:30:05 +05:30
|
|
|
|
putp(Cap_clr_scr);
|
2013-01-16 11:30:00 +05:30
|
|
|
|
adj_geometry();
|
top: add a flexible 'Inspect' capability
This commit introduces an extremely powerful, flexible
brand new capability. Now, users can pause the normal
iterative display and inspect the contents of any file
or output from any script, command, or even pipelines.
It's invoked via the 'Y' interactive command which, in
turn, is supported with simple user supplied additions
as new entries in the top personal configuration file.
A separate new 'Inspect' window supports scrolling and
searching, similar to the main top display. Except it
extends existing 'L'/'&' (locate/locate-next) commands
so that an out-of-view match automatically adjusts the
horizontal position bringing such data into view. And
it provides for multiple successive same line matches.
Also, the basic 'more/less' navigation keys are active
in this new 'Inspect' window, to ease user transition.
There are no program changes required when entries are
added to or deleted from the rcfile. And there are no
known limits to the complexity of a script, command or
pipeline, other than the unidirectional nature imposed
by the 'popen' function call which top cannot violate.
Since it's impossible to predict exactly what contents
will be generated, top treats all output as raw binary
data. Any control characters display in '^C' notation
while all other unprintable characters show as '<AB>'.
The biggest problem encountered was with the find/next
capability since that strstr guy was really diminished
given the possibility that numerous 'strings' could be
encountered *within* many of top's raw, binary 'rows'.
Oh, and another problem was in maintaining the perfect
left & right text justification of this commit message
along with all of the commit summaries. Some of those
summaries (like this very one) are of course, slightly
shorter, to make room for the 'man document' addition.
Enjoy!
Signed-off-by: Jim Warner <james.warner@comcast.net>
2012-11-25 10:30:05 +05:30
|
|
|
|
|
2013-01-16 11:30:00 +05:30
|
|
|
|
key = INT_MAX;
|
top: add a flexible 'Inspect' capability
This commit introduces an extremely powerful, flexible
brand new capability. Now, users can pause the normal
iterative display and inspect the contents of any file
or output from any script, command, or even pipelines.
It's invoked via the 'Y' interactive command which, in
turn, is supported with simple user supplied additions
as new entries in the top personal configuration file.
A separate new 'Inspect' window supports scrolling and
searching, similar to the main top display. Except it
extends existing 'L'/'&' (locate/locate-next) commands
so that an out-of-view match automatically adjusts the
horizontal position bringing such data into view. And
it provides for multiple successive same line matches.
Also, the basic 'more/less' navigation keys are active
in this new 'Inspect' window, to ease user transition.
There are no program changes required when entries are
added to or deleted from the rcfile. And there are no
known limits to the complexity of a script, command or
pipeline, other than the unidirectional nature imposed
by the 'popen' function call which top cannot violate.
Since it's impossible to predict exactly what contents
will be generated, top treats all output as raw binary
data. Any control characters display in '^C' notation
while all other unprintable characters show as '<AB>'.
The biggest problem encountered was with the find/next
capability since that strstr guy was really diminished
given the possibility that numerous 'strings' could be
encountered *within* many of top's raw, binary 'rows'.
Oh, and another problem was in maintaining the perfect
left & right text justification of this commit message
along with all of the commit summaries. Some of those
summaries (like this very one) are of course, slightly
shorter, to make room for the 'man document' addition.
Enjoy!
Signed-off-by: Jim Warner <james.warner@comcast.net>
2012-11-25 10:30:05 +05:30
|
|
|
|
do {
|
|
|
|
|
mkSEL(sels);
|
|
|
|
|
putp(Cap_home);
|
2015-02-01 11:30:00 +05:30
|
|
|
|
show_special(1, fmtmk(N_unq(YINSP_hdsels_fmt)
|
2015-07-27 10:30:00 +05:30
|
|
|
|
, pid, p->cmd, sels));
|
top: add a flexible 'Inspect' capability
This commit introduces an extremely powerful, flexible
brand new capability. Now, users can pause the normal
iterative display and inspect the contents of any file
or output from any script, command, or even pipelines.
It's invoked via the 'Y' interactive command which, in
turn, is supported with simple user supplied additions
as new entries in the top personal configuration file.
A separate new 'Inspect' window supports scrolling and
searching, similar to the main top display. Except it
extends existing 'L'/'&' (locate/locate-next) commands
so that an out-of-view match automatically adjusts the
horizontal position bringing such data into view. And
it provides for multiple successive same line matches.
Also, the basic 'more/less' navigation keys are active
in this new 'Inspect' window, to ease user transition.
There are no program changes required when entries are
added to or deleted from the rcfile. And there are no
known limits to the complexity of a script, command or
pipeline, other than the unidirectional nature imposed
by the 'popen' function call which top cannot violate.
Since it's impossible to predict exactly what contents
will be generated, top treats all output as raw binary
data. Any control characters display in '^C' notation
while all other unprintable characters show as '<AB>'.
The biggest problem encountered was with the find/next
capability since that strstr guy was really diminished
given the possibility that numerous 'strings' could be
encountered *within* many of top's raw, binary 'rows'.
Oh, and another problem was in maintaining the perfect
left & right text justification of this commit message
along with all of the commit summaries. Some of those
summaries (like this very one) are of course, slightly
shorter, to make room for the 'man document' addition.
Enjoy!
Signed-off-by: Jim Warner <james.warner@comcast.net>
2012-11-25 10:30:05 +05:30
|
|
|
|
INSP_MKSL(0, " ");
|
|
|
|
|
|
2013-06-30 10:30:00 +05:30
|
|
|
|
if (Frames_signal) goto signify_that;
|
2013-02-15 11:30:00 +05:30
|
|
|
|
if (key == INT_MAX) key = iokey(1);
|
2013-01-16 11:30:00 +05:30
|
|
|
|
if (key < 1) goto signify_that;
|
|
|
|
|
|
top: add a flexible 'Inspect' capability
This commit introduces an extremely powerful, flexible
brand new capability. Now, users can pause the normal
iterative display and inspect the contents of any file
or output from any script, command, or even pipelines.
It's invoked via the 'Y' interactive command which, in
turn, is supported with simple user supplied additions
as new entries in the top personal configuration file.
A separate new 'Inspect' window supports scrolling and
searching, similar to the main top display. Except it
extends existing 'L'/'&' (locate/locate-next) commands
so that an out-of-view match automatically adjusts the
horizontal position bringing such data into view. And
it provides for multiple successive same line matches.
Also, the basic 'more/less' navigation keys are active
in this new 'Inspect' window, to ease user transition.
There are no program changes required when entries are
added to or deleted from the rcfile. And there are no
known limits to the complexity of a script, command or
pipeline, other than the unidirectional nature imposed
by the 'popen' function call which top cannot violate.
Since it's impossible to predict exactly what contents
will be generated, top treats all output as raw binary
data. Any control characters display in '^C' notation
while all other unprintable characters show as '<AB>'.
The biggest problem encountered was with the find/next
capability since that strstr guy was really diminished
given the possibility that numerous 'strings' could be
encountered *within* many of top's raw, binary 'rows'.
Oh, and another problem was in maintaining the perfect
left & right text justification of this commit message
along with all of the commit summaries. Some of those
summaries (like this very one) are of course, slightly
shorter, to make room for the 'man document' addition.
Enjoy!
Signed-off-by: Jim Warner <james.warner@comcast.net>
2012-11-25 10:30:05 +05:30
|
|
|
|
switch (key) {
|
|
|
|
|
case 'q':
|
|
|
|
|
case kbd_ESC:
|
|
|
|
|
break;
|
|
|
|
|
case kbd_END:
|
|
|
|
|
sel = 0; // fall through !
|
|
|
|
|
case kbd_LEFT:
|
|
|
|
|
if (--sel < 0) sel = Inspect.total -1;
|
2013-01-16 11:30:00 +05:30
|
|
|
|
key = INT_MAX;
|
top: add a flexible 'Inspect' capability
This commit introduces an extremely powerful, flexible
brand new capability. Now, users can pause the normal
iterative display and inspect the contents of any file
or output from any script, command, or even pipelines.
It's invoked via the 'Y' interactive command which, in
turn, is supported with simple user supplied additions
as new entries in the top personal configuration file.
A separate new 'Inspect' window supports scrolling and
searching, similar to the main top display. Except it
extends existing 'L'/'&' (locate/locate-next) commands
so that an out-of-view match automatically adjusts the
horizontal position bringing such data into view. And
it provides for multiple successive same line matches.
Also, the basic 'more/less' navigation keys are active
in this new 'Inspect' window, to ease user transition.
There are no program changes required when entries are
added to or deleted from the rcfile. And there are no
known limits to the complexity of a script, command or
pipeline, other than the unidirectional nature imposed
by the 'popen' function call which top cannot violate.
Since it's impossible to predict exactly what contents
will be generated, top treats all output as raw binary
data. Any control characters display in '^C' notation
while all other unprintable characters show as '<AB>'.
The biggest problem encountered was with the find/next
capability since that strstr guy was really diminished
given the possibility that numerous 'strings' could be
encountered *within* many of top's raw, binary 'rows'.
Oh, and another problem was in maintaining the perfect
left & right text justification of this commit message
along with all of the commit summaries. Some of those
summaries (like this very one) are of course, slightly
shorter, to make room for the 'man document' addition.
Enjoy!
Signed-off-by: Jim Warner <james.warner@comcast.net>
2012-11-25 10:30:05 +05:30
|
|
|
|
break;
|
|
|
|
|
case kbd_HOME:
|
|
|
|
|
sel = Inspect.total; // fall through !
|
|
|
|
|
case kbd_RIGHT:
|
|
|
|
|
if (++sel >= Inspect.total) sel = 0;
|
2013-01-16 11:30:00 +05:30
|
|
|
|
key = INT_MAX;
|
top: add a flexible 'Inspect' capability
This commit introduces an extremely powerful, flexible
brand new capability. Now, users can pause the normal
iterative display and inspect the contents of any file
or output from any script, command, or even pipelines.
It's invoked via the 'Y' interactive command which, in
turn, is supported with simple user supplied additions
as new entries in the top personal configuration file.
A separate new 'Inspect' window supports scrolling and
searching, similar to the main top display. Except it
extends existing 'L'/'&' (locate/locate-next) commands
so that an out-of-view match automatically adjusts the
horizontal position bringing such data into view. And
it provides for multiple successive same line matches.
Also, the basic 'more/less' navigation keys are active
in this new 'Inspect' window, to ease user transition.
There are no program changes required when entries are
added to or deleted from the rcfile. And there are no
known limits to the complexity of a script, command or
pipeline, other than the unidirectional nature imposed
by the 'popen' function call which top cannot violate.
Since it's impossible to predict exactly what contents
will be generated, top treats all output as raw binary
data. Any control characters display in '^C' notation
while all other unprintable characters show as '<AB>'.
The biggest problem encountered was with the find/next
capability since that strstr guy was really diminished
given the possibility that numerous 'strings' could be
encountered *within* many of top's raw, binary 'rows'.
Oh, and another problem was in maintaining the perfect
left & right text justification of this commit message
along with all of the commit summaries. Some of those
summaries (like this very one) are of course, slightly
shorter, to make room for the 'man document' addition.
Enjoy!
Signed-off-by: Jim Warner <james.warner@comcast.net>
2012-11-25 10:30:05 +05:30
|
|
|
|
break;
|
|
|
|
|
case kbd_ENTER:
|
2018-07-25 10:30:00 +05:30
|
|
|
|
INSP_BUSY(!strcmp("file", Inspect.tab[sel].type)
|
|
|
|
|
? YINSP_waitin_txt : YINSP_workin_txt);
|
2012-12-04 11:30:00 +05:30
|
|
|
|
Insp_sel = &Inspect.tab[sel];
|
top: add a flexible 'Inspect' capability
This commit introduces an extremely powerful, flexible
brand new capability. Now, users can pause the normal
iterative display and inspect the contents of any file
or output from any script, command, or even pipelines.
It's invoked via the 'Y' interactive command which, in
turn, is supported with simple user supplied additions
as new entries in the top personal configuration file.
A separate new 'Inspect' window supports scrolling and
searching, similar to the main top display. Except it
extends existing 'L'/'&' (locate/locate-next) commands
so that an out-of-view match automatically adjusts the
horizontal position bringing such data into view. And
it provides for multiple successive same line matches.
Also, the basic 'more/less' navigation keys are active
in this new 'Inspect' window, to ease user transition.
There are no program changes required when entries are
added to or deleted from the rcfile. And there are no
known limits to the complexity of a script, command or
pipeline, other than the unidirectional nature imposed
by the 'popen' function call which top cannot violate.
Since it's impossible to predict exactly what contents
will be generated, top treats all output as raw binary
data. Any control characters display in '^C' notation
while all other unprintable characters show as '<AB>'.
The biggest problem encountered was with the find/next
capability since that strstr guy was really diminished
given the possibility that numerous 'strings' could be
encountered *within* many of top's raw, binary 'rows'.
Oh, and another problem was in maintaining the perfect
left & right text justification of this commit message
along with all of the commit summaries. Some of those
summaries (like this very one) are of course, slightly
shorter, to make room for the 'man document' addition.
Enjoy!
Signed-off-by: Jim Warner <james.warner@comcast.net>
2012-11-25 10:30:05 +05:30
|
|
|
|
Inspect.tab[sel].func(Inspect.tab[sel].fmts, pid);
|
top: extend multi-byte support to 'Inspection' feature
The previous commit implemented multi-byte support for
the basic top user interaction and display provisions.
This commit completes multi-byte support by addressing
that 'Inspect Other Output' feature (the 'Y' command).
Few people probably exploit this very powerful feature
which allows the perusing of any file or piped output.
And even if nobody uses 'Y', someone will stumble over
it on the help screen and try it out. Assuming top was
not built with INSP_OFFDEMO defined, they'll end up on
the screen our translators have faithfully translated.
Without this patch, such a screen would display with a
bunch of 'unprintable' characters which will then show
in the standard (less-like) way as: '^A', '<C3>', etc.
In other words, those poor screens will be a big mess!
[ this program can even display an executable binary ]
[ while at that same time supporting Find/Find Next. ]
[ imagine, a file with no guarantee of real strings! ]
[ just try a Find using less with such binary files. ]
With this commit, the translated 'Y' demo screens will
now be properly shown, providing no invalid multi-byte
characters have been detected. Should that be the case
then they'll be displayed in that less-like way above.
And, if users go on to fully exploit this 'Y' command,
there is a good chance that a file or pipe might yield
output in a utf-8 multi-byte form. Should that be true
such output will thus be handled appropriately by top.
[ in many respects, this change was more challenging ]
[ than the basic support within the previous commit. ]
[ story of my life: least used = most effort needed. ]
Many thanks to our procps-ng translators which enabled
a proper test of these changed 'Y' command provisions:
. Vietnamese: Trần Ngọc Quân
. Polish: Jakub Bogusz
. German: Mario Blättermann
. French: Frédéric Marchal, Stéphane Aulery
[ and my sincerest apologies too, for my negligence! ]
Reference(s):
https://gitlab.com/procps-ng/procps/issues/68
Signed-off-by: Jim Warner <james.warner@comcast.net>
2017-09-27 10:33:33 +05:30
|
|
|
|
Insp_utf8 = utf8_delta(Insp_buf);
|
2012-12-04 11:30:00 +05:30
|
|
|
|
key = insp_view_choice(p);
|
top: add a flexible 'Inspect' capability
This commit introduces an extremely powerful, flexible
brand new capability. Now, users can pause the normal
iterative display and inspect the contents of any file
or output from any script, command, or even pipelines.
It's invoked via the 'Y' interactive command which, in
turn, is supported with simple user supplied additions
as new entries in the top personal configuration file.
A separate new 'Inspect' window supports scrolling and
searching, similar to the main top display. Except it
extends existing 'L'/'&' (locate/locate-next) commands
so that an out-of-view match automatically adjusts the
horizontal position bringing such data into view. And
it provides for multiple successive same line matches.
Also, the basic 'more/less' navigation keys are active
in this new 'Inspect' window, to ease user transition.
There are no program changes required when entries are
added to or deleted from the rcfile. And there are no
known limits to the complexity of a script, command or
pipeline, other than the unidirectional nature imposed
by the 'popen' function call which top cannot violate.
Since it's impossible to predict exactly what contents
will be generated, top treats all output as raw binary
data. Any control characters display in '^C' notation
while all other unprintable characters show as '<AB>'.
The biggest problem encountered was with the find/next
capability since that strstr guy was really diminished
given the possibility that numerous 'strings' could be
encountered *within* many of top's raw, binary 'rows'.
Oh, and another problem was in maintaining the perfect
left & right text justification of this commit message
along with all of the commit summaries. Some of those
summaries (like this very one) are of course, slightly
shorter, to make room for the 'man document' addition.
Enjoy!
Signed-off-by: Jim Warner <james.warner@comcast.net>
2012-11-25 10:30:05 +05:30
|
|
|
|
free(Insp_buf);
|
|
|
|
|
free(Insp_p);
|
|
|
|
|
break;
|
2013-01-16 11:30:00 +05:30
|
|
|
|
default:
|
|
|
|
|
goto signify_that;
|
top: add a flexible 'Inspect' capability
This commit introduces an extremely powerful, flexible
brand new capability. Now, users can pause the normal
iterative display and inspect the contents of any file
or output from any script, command, or even pipelines.
It's invoked via the 'Y' interactive command which, in
turn, is supported with simple user supplied additions
as new entries in the top personal configuration file.
A separate new 'Inspect' window supports scrolling and
searching, similar to the main top display. Except it
extends existing 'L'/'&' (locate/locate-next) commands
so that an out-of-view match automatically adjusts the
horizontal position bringing such data into view. And
it provides for multiple successive same line matches.
Also, the basic 'more/less' navigation keys are active
in this new 'Inspect' window, to ease user transition.
There are no program changes required when entries are
added to or deleted from the rcfile. And there are no
known limits to the complexity of a script, command or
pipeline, other than the unidirectional nature imposed
by the 'popen' function call which top cannot violate.
Since it's impossible to predict exactly what contents
will be generated, top treats all output as raw binary
data. Any control characters display in '^C' notation
while all other unprintable characters show as '<AB>'.
The biggest problem encountered was with the find/next
capability since that strstr guy was really diminished
given the possibility that numerous 'strings' could be
encountered *within* many of top's raw, binary 'rows'.
Oh, and another problem was in maintaining the perfect
left & right text justification of this commit message
along with all of the commit summaries. Some of those
summaries (like this very one) are of course, slightly
shorter, to make room for the 'man document' addition.
Enjoy!
Signed-off-by: Jim Warner <james.warner@comcast.net>
2012-11-25 10:30:05 +05:30
|
|
|
|
}
|
2013-01-16 11:30:00 +05:30
|
|
|
|
} while (key != 'q' && key != kbd_ESC);
|
top: add a flexible 'Inspect' capability
This commit introduces an extremely powerful, flexible
brand new capability. Now, users can pause the normal
iterative display and inspect the contents of any file
or output from any script, command, or even pipelines.
It's invoked via the 'Y' interactive command which, in
turn, is supported with simple user supplied additions
as new entries in the top personal configuration file.
A separate new 'Inspect' window supports scrolling and
searching, similar to the main top display. Except it
extends existing 'L'/'&' (locate/locate-next) commands
so that an out-of-view match automatically adjusts the
horizontal position bringing such data into view. And
it provides for multiple successive same line matches.
Also, the basic 'more/less' navigation keys are active
in this new 'Inspect' window, to ease user transition.
There are no program changes required when entries are
added to or deleted from the rcfile. And there are no
known limits to the complexity of a script, command or
pipeline, other than the unidirectional nature imposed
by the 'popen' function call which top cannot violate.
Since it's impossible to predict exactly what contents
will be generated, top treats all output as raw binary
data. Any control characters display in '^C' notation
while all other unprintable characters show as '<AB>'.
The biggest problem encountered was with the find/next
capability since that strstr guy was really diminished
given the possibility that numerous 'strings' could be
encountered *within* many of top's raw, binary 'rows'.
Oh, and another problem was in maintaining the perfect
left & right text justification of this commit message
along with all of the commit summaries. Some of those
summaries (like this very one) are of course, slightly
shorter, to make room for the 'man document' addition.
Enjoy!
Signed-off-by: Jim Warner <james.warner@comcast.net>
2012-11-25 10:30:05 +05:30
|
|
|
|
|
|
|
|
|
#undef mkSEL
|
|
|
|
|
} // end: inspection_utility
|
|
|
|
|
#undef INSP_MKSL
|
|
|
|
|
#undef INSP_RLEN
|
|
|
|
|
#undef INSP_BUSY
|
|
|
|
|
|
2018-06-17 10:30:00 +05:30
|
|
|
|
/*###### Other Filtering ###############################################*/
|
|
|
|
|
|
|
|
|
|
/*
|
|
|
|
|
* This sructure is hung from a WIN_t when other filtering is active */
|
|
|
|
|
struct osel_s {
|
|
|
|
|
struct osel_s *nxt; // the next criteria or NULL.
|
|
|
|
|
int (*rel)(const char *, const char *); // relational strings compare
|
|
|
|
|
char *(*sel)(const char *, const char *); // for selection str compares
|
|
|
|
|
char *raw; // raw user input (dup check)
|
|
|
|
|
char *val; // value included or excluded
|
|
|
|
|
int ops; // filter delimiter/operation
|
|
|
|
|
int inc; // include == 1, exclude == 0
|
|
|
|
|
int enu; // field (procflag) to filter
|
2018-06-17 10:30:00 +05:30
|
|
|
|
int typ; // typ used to set: rel & sel
|
2018-06-17 10:30:00 +05:30
|
|
|
|
};
|
|
|
|
|
|
2018-06-17 10:30:00 +05:30
|
|
|
|
/*
|
|
|
|
|
* A function to parse, validate and build a single 'other filter' */
|
2018-06-17 10:30:00 +05:30
|
|
|
|
static const char *osel_add (WIN_t *q, int ch, char *glob, int push) {
|
2018-06-17 10:30:00 +05:30
|
|
|
|
int (*rel)(const char *, const char *);
|
|
|
|
|
char *(*sel)(const char *, const char *);
|
|
|
|
|
char raw[MEDBUFSIZ], ops, *pval;
|
|
|
|
|
struct osel_s *osel;
|
|
|
|
|
int inc, enu;
|
|
|
|
|
|
|
|
|
|
if (ch == 'o') {
|
|
|
|
|
rel = strcasecmp;
|
|
|
|
|
sel = strcasestr;
|
|
|
|
|
} else {
|
|
|
|
|
rel = strcmp;
|
|
|
|
|
sel = strstr;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if (!snprintf(raw, sizeof(raw), "%s", glob))
|
|
|
|
|
return NULL;
|
2018-06-17 10:30:00 +05:30
|
|
|
|
for (osel = q->osel_1st; osel; ) {
|
2018-06-17 10:30:00 +05:30
|
|
|
|
if (!strcmp(osel->raw, raw)) // #1: is criteria duplicate?
|
|
|
|
|
return N_txt(OSEL_errdups_txt);
|
|
|
|
|
osel = osel->nxt;
|
|
|
|
|
}
|
|
|
|
|
if (*glob != '!') inc = 1; // #2: is it include/exclude?
|
|
|
|
|
else { ++glob; inc = 0; }
|
|
|
|
|
|
|
|
|
|
if (!(pval = strpbrk(glob, "<=>"))) // #3: do we see a delimiter?
|
|
|
|
|
return fmtmk(N_fmt(OSEL_errdelm_fmt)
|
|
|
|
|
, inc ? N_txt(WORD_include_txt) : N_txt(WORD_exclude_txt));
|
|
|
|
|
ops = *(pval);
|
|
|
|
|
*(pval++) = '\0';
|
|
|
|
|
|
|
|
|
|
for (enu = 0; enu < EU_MAXPFLGS; enu++) // #4: is this a valid field?
|
|
|
|
|
if (!STRCMP(N_col(enu), glob)) break;
|
|
|
|
|
if (enu == EU_MAXPFLGS)
|
|
|
|
|
return fmtmk(N_fmt(XTRA_badflds_fmt), glob);
|
|
|
|
|
|
|
|
|
|
if (!(*pval)) // #5: did we get some value?
|
|
|
|
|
return fmtmk(N_fmt(OSEL_errvalu_fmt)
|
|
|
|
|
, inc ? N_txt(WORD_include_txt) : N_txt(WORD_exclude_txt));
|
|
|
|
|
|
|
|
|
|
osel = alloc_c(sizeof(struct osel_s));
|
2018-06-17 10:30:00 +05:30
|
|
|
|
osel->typ = ch;
|
2018-06-17 10:30:00 +05:30
|
|
|
|
osel->inc = inc;
|
|
|
|
|
osel->enu = enu;
|
|
|
|
|
osel->ops = ops;
|
|
|
|
|
if (ops == '=') osel->val = alloc_s(pval);
|
|
|
|
|
else osel->val = alloc_s(justify_pad(pval, Fieldstab[enu].width, Fieldstab[enu].align));
|
|
|
|
|
osel->rel = rel;
|
|
|
|
|
osel->sel = sel;
|
|
|
|
|
osel->raw = alloc_s(raw);
|
|
|
|
|
|
2018-06-17 10:30:00 +05:30
|
|
|
|
if (push) {
|
|
|
|
|
// a LIFO queue was used when we're interactive
|
|
|
|
|
osel->nxt = q->osel_1st;
|
|
|
|
|
q->osel_1st = osel;
|
|
|
|
|
} else {
|
|
|
|
|
// a FIFO queue must be employed for the rcfile
|
|
|
|
|
if (!q->osel_1st)
|
|
|
|
|
q->osel_1st = osel;
|
|
|
|
|
else {
|
|
|
|
|
struct osel_s *prev, *walk = q->osel_1st;
|
|
|
|
|
do {
|
|
|
|
|
prev = walk;
|
|
|
|
|
walk = walk->nxt;
|
|
|
|
|
} while (walk);
|
|
|
|
|
prev->nxt = osel;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
q->osel_tot += 1;
|
2018-06-17 10:30:00 +05:30
|
|
|
|
|
|
|
|
|
return NULL;
|
|
|
|
|
} // end: osel_add
|
|
|
|
|
|
2018-06-17 10:30:00 +05:30
|
|
|
|
|
|
|
|
|
/*
|
|
|
|
|
* A function to turn off entire other filtering in the given window */
|
|
|
|
|
static void osel_clear (WIN_t *q) {
|
|
|
|
|
struct osel_s *osel = q->osel_1st;
|
|
|
|
|
|
|
|
|
|
while (osel) {
|
|
|
|
|
struct osel_s *nxt = osel->nxt;
|
|
|
|
|
free(osel->val);
|
|
|
|
|
free(osel->raw);
|
|
|
|
|
free(osel);
|
|
|
|
|
osel = nxt;
|
|
|
|
|
}
|
|
|
|
|
q->osel_tot = 0;
|
|
|
|
|
q->osel_1st = NULL;
|
|
|
|
|
#ifndef USE_X_COLHDR
|
2018-06-17 10:30:00 +05:30
|
|
|
|
OFFw(q, NOHISEL_xxx);
|
2018-06-17 10:30:00 +05:30
|
|
|
|
#endif
|
|
|
|
|
} // end: osel_clear
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
/*
|
|
|
|
|
* Determine if there are matching values or relationships among the
|
|
|
|
|
* other criteria in this passed window -- it's called from only one
|
|
|
|
|
* place, and likely inlined even without the directive */
|
|
|
|
|
static inline int osel_matched (const WIN_t *q, FLG_t enu, const char *str) {
|
|
|
|
|
struct osel_s *osel = q->osel_1st;
|
|
|
|
|
|
|
|
|
|
while (osel) {
|
|
|
|
|
if (osel->enu == enu) {
|
|
|
|
|
int r;
|
|
|
|
|
switch (osel->ops) {
|
|
|
|
|
case '<': // '<' needs the r < 0 unless
|
|
|
|
|
r = osel->rel(str, osel->val); // '!' which needs an inverse
|
|
|
|
|
if ((r >= 0 && osel->inc) || (r < 0 && !osel->inc)) return 0;
|
|
|
|
|
break;
|
|
|
|
|
case '>': // '>' needs the r > 0 unless
|
|
|
|
|
r = osel->rel(str, osel->val); // '!' which needs an inverse
|
|
|
|
|
if ((r <= 0 && osel->inc) || (r > 0 && !osel->inc)) return 0;
|
|
|
|
|
break;
|
|
|
|
|
default:
|
|
|
|
|
{ char *p = osel->sel(str, osel->val);
|
|
|
|
|
if ((!p && osel->inc) || (p && !osel->inc)) return 0;
|
|
|
|
|
}
|
|
|
|
|
break;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
osel = osel->nxt;
|
|
|
|
|
}
|
|
|
|
|
return 1;
|
|
|
|
|
} // end: osel_matched
|
|
|
|
|
|
2002-12-05 04:18:30 +05:30
|
|
|
|
/*###### Startup routines ##############################################*/
|
|
|
|
|
|
2011-03-31 16:45:12 +05:30
|
|
|
|
/*
|
2011-07-14 16:46:02 +05:30
|
|
|
|
* No matter what *they* say, we handle the really really BIG and
|
2011-03-31 16:45:12 +05:30
|
|
|
|
* IMPORTANT stuff upon which all those lessor functions depend! */
|
|
|
|
|
static void before (char *me) {
|
2011-09-12 17:48:23 +05:30
|
|
|
|
struct sigaction sa;
|
2012-06-30 10:30:55 +05:30
|
|
|
|
proc_t p;
|
2002-11-30 21:26:53 +05:30
|
|
|
|
int i;
|
2018-08-14 10:30:00 +05:30
|
|
|
|
#ifndef PRETEND2_5_X
|
2015-06-19 16:30:46 +05:30
|
|
|
|
int linux_version_code = procps_linux_version();
|
2018-08-14 10:30:00 +05:30
|
|
|
|
#else
|
|
|
|
|
int linux_version_code = LINUX_VERSION(2,5,43);
|
|
|
|
|
#endif
|
2002-12-05 04:18:30 +05:30
|
|
|
|
|
2012-06-30 10:30:55 +05:30
|
|
|
|
atexit(close_stdout);
|
|
|
|
|
|
2012-04-25 09:38:02 +05:30
|
|
|
|
// is /proc mounted?
|
|
|
|
|
look_up_our_self(&p);
|
|
|
|
|
|
2011-10-12 00:32:59 +05:30
|
|
|
|
// setup our program name
|
2002-12-05 04:18:30 +05:30
|
|
|
|
Myname = strrchr(me, '/');
|
|
|
|
|
if (Myname) ++Myname; else Myname = me;
|
|
|
|
|
|
2011-10-12 00:32:59 +05:30
|
|
|
|
// accommodate nls/gettext potential translations
|
2011-11-06 05:04:50 +05:30
|
|
|
|
initialize_nls();
|
2011-10-12 00:32:59 +05:30
|
|
|
|
|
2017-11-14 10:30:00 +05:30
|
|
|
|
// override default library memory alloc error handler
|
|
|
|
|
xalloc_err_handler = xalloc_our_handler;
|
|
|
|
|
|
2011-10-12 00:32:59 +05:30
|
|
|
|
// establish cpu particulars
|
top: improve logic surrounding 'smp_num_cpus' variable
I thank Guido Jäkel for raising the issue cited in the
merge request referenced below. While restoring 1 line
of code would produce the desired results, it does not
address the root cause of that problem he experienced.
The variable 'smp_num_cpus' was set by libprocps via a
sysconf(_SC_NPROCESSORS_ONLN) call. It was supposed to
represent total number of processors currently online.
It also served as the position in the Cpu_tics[] array
where the /proc/stat line #1 (cpu summary) was stored.
The variable 'Cpu_faux_tot' was valued by top based on
total individual cpus parsed from the /proc/stat file.
It serves as a fence post for Cpu_tics[] array access.
The problem Guido experienced results from a disparity
between those 2 variables, plus one instance where the
wrong variable was used in the summary_show() routine.
. Here is the real culprit, the actual incorrect code:
. summary_hlp(&Cpu_tics[Cpu_faux_tot], N_txt(WORD_a...
Which always should have been represented in this way:
. summary_hlp(&Cpu_tics[smp_num_cpus], N_txt(WORD_a...
------------------------------------------------------
The above 'disparity' might arise in any system when a
cpu is taken offline since there's a 3 second delay in
cpu and memory refreshes in an effort to reduce costs.
Usually this particular condition will be short lived.
However, there is a more persistent problem under lxc.
If a host cpu is taken offline and then brought online
again, within the container sysconf returns the proper
number of online processors. But, /proc/stat does not!
Sadly, I've yet to find a way to coax a container into
refreshing its /proc/stat, short of reboting the host.
[ might that represent a potential bug in lxc logic? ]
Reference(s):
https://gitlab.com/procps-ng/procps/merge_requests/82
Signed-off-by: Jim Warner <james.warner@comcast.net>
With-thanks-to: Guido Jäkel <G.Jaekel@DNB.DE>
2019-01-11 11:30:00 +05:30
|
|
|
|
cpuinfo();
|
2020-05-24 10:30:00 +05:30
|
|
|
|
#ifdef PRETEND48CPU
|
2020-05-30 10:30:00 +05:30
|
|
|
|
Cpu_true_tot = smp_num_cpus;
|
2020-05-24 10:30:00 +05:30
|
|
|
|
smp_num_cpus = 48;
|
2011-03-31 16:45:12 +05:30
|
|
|
|
#endif
|
2011-10-12 00:32:59 +05:30
|
|
|
|
Cpu_States_fmts = N_unq(STATE_lin2x4_fmt);
|
2011-03-31 16:45:12 +05:30
|
|
|
|
if (linux_version_code > LINUX_VERSION(2, 5, 41))
|
2011-10-12 00:32:59 +05:30
|
|
|
|
Cpu_States_fmts = N_unq(STATE_lin2x5_fmt);
|
2011-03-31 16:45:12 +05:30
|
|
|
|
if (linux_version_code >= LINUX_VERSION(2, 6, 0))
|
2011-10-12 00:32:59 +05:30
|
|
|
|
Cpu_States_fmts = N_unq(STATE_lin2x6_fmt);
|
2011-03-31 16:45:12 +05:30
|
|
|
|
if (linux_version_code >= LINUX_VERSION(2, 6, 11))
|
2011-10-12 00:32:59 +05:30
|
|
|
|
Cpu_States_fmts = N_unq(STATE_lin2x7_fmt);
|
2002-12-05 08:47:32 +05:30
|
|
|
|
|
2011-10-12 00:32:59 +05:30
|
|
|
|
// get virtual page stuff
|
2014-07-17 22:42:12 +05:30
|
|
|
|
i = page_bytes; // from sysinfo.c, at lib init
|
2011-03-31 16:45:12 +05:30
|
|
|
|
while(i > 1024) { i >>= 1; Pg2K_shft++; }
|
2002-12-05 07:17:36 +05:30
|
|
|
|
|
2011-03-31 16:45:12 +05:30
|
|
|
|
#ifndef OFF_HST_HASH
|
|
|
|
|
// prep for HST_t's put/get hashing optimizations
|
|
|
|
|
for (i = 0; i < HHASH_SIZ; i++) HHash_nul[i] = -1;
|
|
|
|
|
memcpy(HHash_one, HHash_nul, sizeof(HHash_nul));
|
|
|
|
|
memcpy(HHash_two, HHash_nul, sizeof(HHash_nul));
|
|
|
|
|
#endif
|
2011-09-12 17:48:23 +05:30
|
|
|
|
|
2017-05-13 10:33:00 +05:30
|
|
|
|
numa_init();
|
|
|
|
|
Numa_node_tot = numa_max_node() + 1;
|
2013-04-08 12:30:00 +05:30
|
|
|
|
|
2011-12-07 03:54:04 +05:30
|
|
|
|
#ifndef SIGRTMAX // not available on hurd, maybe others too
|
|
|
|
|
#define SIGRTMAX 32
|
|
|
|
|
#endif
|
2011-09-12 17:48:23 +05:30
|
|
|
|
// lastly, establish a robust signals environment
|
1970-01-01 05:30:00 +05:30
|
|
|
|
memset(&sa, 0, sizeof(sa));
|
2011-09-12 17:48:23 +05:30
|
|
|
|
sigemptyset(&sa.sa_mask);
|
2013-11-07 11:30:00 +05:30
|
|
|
|
// with user position preserved through SIGWINCH, we must avoid SA_RESTART
|
2013-01-16 11:30:00 +05:30
|
|
|
|
sa.sa_flags = 0;
|
2011-10-26 17:01:48 +05:30
|
|
|
|
for (i = SIGRTMAX; i; i--) {
|
2011-09-12 17:48:23 +05:30
|
|
|
|
switch (i) {
|
|
|
|
|
case SIGALRM: case SIGHUP: case SIGINT:
|
|
|
|
|
case SIGPIPE: case SIGQUIT: case SIGTERM:
|
2012-12-12 11:30:00 +05:30
|
|
|
|
case SIGUSR1: case SIGUSR2:
|
2011-09-12 17:48:23 +05:30
|
|
|
|
sa.sa_handler = sig_endpgm;
|
|
|
|
|
break;
|
|
|
|
|
case SIGTSTP: case SIGTTIN: case SIGTTOU:
|
|
|
|
|
sa.sa_handler = sig_paused;
|
|
|
|
|
break;
|
|
|
|
|
case SIGCONT: case SIGWINCH:
|
|
|
|
|
sa.sa_handler = sig_resize;
|
|
|
|
|
break;
|
|
|
|
|
default:
|
|
|
|
|
sa.sa_handler = sig_abexit;
|
|
|
|
|
break;
|
2014-06-24 10:30:00 +05:30
|
|
|
|
case SIGKILL: case SIGSTOP:
|
|
|
|
|
// because uncatchable, fall through
|
top: add a flexible 'Inspect' capability
This commit introduces an extremely powerful, flexible
brand new capability. Now, users can pause the normal
iterative display and inspect the contents of any file
or output from any script, command, or even pipelines.
It's invoked via the 'Y' interactive command which, in
turn, is supported with simple user supplied additions
as new entries in the top personal configuration file.
A separate new 'Inspect' window supports scrolling and
searching, similar to the main top display. Except it
extends existing 'L'/'&' (locate/locate-next) commands
so that an out-of-view match automatically adjusts the
horizontal position bringing such data into view. And
it provides for multiple successive same line matches.
Also, the basic 'more/less' navigation keys are active
in this new 'Inspect' window, to ease user transition.
There are no program changes required when entries are
added to or deleted from the rcfile. And there are no
known limits to the complexity of a script, command or
pipeline, other than the unidirectional nature imposed
by the 'popen' function call which top cannot violate.
Since it's impossible to predict exactly what contents
will be generated, top treats all output as raw binary
data. Any control characters display in '^C' notation
while all other unprintable characters show as '<AB>'.
The biggest problem encountered was with the find/next
capability since that strstr guy was really diminished
given the possibility that numerous 'strings' could be
encountered *within* many of top's raw, binary 'rows'.
Oh, and another problem was in maintaining the perfect
left & right text justification of this commit message
along with all of the commit summaries. Some of those
summaries (like this very one) are of course, slightly
shorter, to make room for the 'man document' addition.
Enjoy!
Signed-off-by: Jim Warner <james.warner@comcast.net>
2012-11-25 10:30:05 +05:30
|
|
|
|
case SIGCHLD: // we can't catch this
|
|
|
|
|
continue; // when opening a pipe
|
2011-09-12 17:48:23 +05:30
|
|
|
|
}
|
|
|
|
|
sigaction(i, &sa, NULL);
|
|
|
|
|
}
|
2011-03-31 16:45:12 +05:30
|
|
|
|
} // end: before
|
2002-12-05 07:17:36 +05:30
|
|
|
|
|
2002-12-06 12:23:29 +05:30
|
|
|
|
|
top: honor the restrictive, crufty old top rcfile
At one time, new top silently defaulted when an rcfile
was found to be incompatible. This is exactly what
the old top did. However, after some discussion it
was decided top should alert the user and thereby
save the system administrator some headaches.
Now, some are upset over the fatal error, proving you
can't please everybody. But in all fairness, given
the difficulty of customizing old top, any reluctance
to delete an old saved rcfile is understandable.
To ease transition to this new top, old style rcfiles
will now be honored and converted to the new format.
And if not disabled at ./configure time via CFLAGS,
a user will be warned when an old style rcfile is
about to be overwritten using the 'W' command.
Lastly, the config validation logic was enhanced to
help ensure both types of rcfile haven't been edited
manually and possibly made unuseable.
Reported-By: sergio <mailbox@sergio.spb.ru>
Bug-Debian: http://bugs.debian.org/651213
Reported-By: martin f krafft <madduck@debian.org>
Bug-Debian: http://bugs.debian.org/651863
Signed-off-by: Jim Warner <james.warner@comcast.net>
2012-03-01 11:29:59 +05:30
|
|
|
|
/*
|
2018-06-17 10:30:00 +05:30
|
|
|
|
* A configs_file *Helper* function responsible for converting
|
2012-03-03 00:04:56 +05:30
|
|
|
|
* a single window's old rc stuff into a new style rcfile entry */
|
top: honor the restrictive, crufty old top rcfile
At one time, new top silently defaulted when an rcfile
was found to be incompatible. This is exactly what
the old top did. However, after some discussion it
was decided top should alert the user and thereby
save the system administrator some headaches.
Now, some are upset over the fatal error, proving you
can't please everybody. But in all fairness, given
the difficulty of customizing old top, any reluctance
to delete an old saved rcfile is understandable.
To ease transition to this new top, old style rcfiles
will now be honored and converted to the new format.
And if not disabled at ./configure time via CFLAGS,
a user will be warned when an old style rcfile is
about to be overwritten using the 'W' command.
Lastly, the config validation logic was enhanced to
help ensure both types of rcfile haven't been edited
manually and possibly made unuseable.
Reported-By: sergio <mailbox@sergio.spb.ru>
Bug-Debian: http://bugs.debian.org/651213
Reported-By: martin f krafft <madduck@debian.org>
Bug-Debian: http://bugs.debian.org/651863
Signed-off-by: Jim Warner <james.warner@comcast.net>
2012-03-01 11:29:59 +05:30
|
|
|
|
static int config_cvt (WIN_t *q) {
|
2012-03-03 00:04:56 +05:30
|
|
|
|
static struct {
|
top: honor the restrictive, crufty old top rcfile
At one time, new top silently defaulted when an rcfile
was found to be incompatible. This is exactly what
the old top did. However, after some discussion it
was decided top should alert the user and thereby
save the system administrator some headaches.
Now, some are upset over the fatal error, proving you
can't please everybody. But in all fairness, given
the difficulty of customizing old top, any reluctance
to delete an old saved rcfile is understandable.
To ease transition to this new top, old style rcfiles
will now be honored and converted to the new format.
And if not disabled at ./configure time via CFLAGS,
a user will be warned when an old style rcfile is
about to be overwritten using the 'W' command.
Lastly, the config validation logic was enhanced to
help ensure both types of rcfile haven't been edited
manually and possibly made unuseable.
Reported-By: sergio <mailbox@sergio.spb.ru>
Bug-Debian: http://bugs.debian.org/651213
Reported-By: martin f krafft <madduck@debian.org>
Bug-Debian: http://bugs.debian.org/651863
Signed-off-by: Jim Warner <james.warner@comcast.net>
2012-03-01 11:29:59 +05:30
|
|
|
|
int old, new;
|
|
|
|
|
} flags_tab[] = {
|
2012-03-03 00:04:56 +05:30
|
|
|
|
#define old_View_NOBOLD 0x000001
|
|
|
|
|
#define old_VISIBLE_tsk 0x000008
|
|
|
|
|
#define old_Qsrt_NORMAL 0x000010
|
|
|
|
|
#define old_Show_HICOLS 0x000200
|
|
|
|
|
#define old_Show_THREAD 0x010000
|
top: honor the restrictive, crufty old top rcfile
At one time, new top silently defaulted when an rcfile
was found to be incompatible. This is exactly what
the old top did. However, after some discussion it
was decided top should alert the user and thereby
save the system administrator some headaches.
Now, some are upset over the fatal error, proving you
can't please everybody. But in all fairness, given
the difficulty of customizing old top, any reluctance
to delete an old saved rcfile is understandable.
To ease transition to this new top, old style rcfiles
will now be honored and converted to the new format.
And if not disabled at ./configure time via CFLAGS,
a user will be warned when an old style rcfile is
about to be overwritten using the 'W' command.
Lastly, the config validation logic was enhanced to
help ensure both types of rcfile haven't been edited
manually and possibly made unuseable.
Reported-By: sergio <mailbox@sergio.spb.ru>
Bug-Debian: http://bugs.debian.org/651213
Reported-By: martin f krafft <madduck@debian.org>
Bug-Debian: http://bugs.debian.org/651863
Signed-off-by: Jim Warner <james.warner@comcast.net>
2012-03-01 11:29:59 +05:30
|
|
|
|
{ old_View_NOBOLD, View_NOBOLD },
|
|
|
|
|
{ old_VISIBLE_tsk, Show_TASKON },
|
|
|
|
|
{ old_Qsrt_NORMAL, Qsrt_NORMAL },
|
|
|
|
|
{ old_Show_HICOLS, Show_HICOLS },
|
|
|
|
|
{ old_Show_THREAD, 0 }
|
2012-03-03 00:04:56 +05:30
|
|
|
|
#undef old_View_NOBOLD
|
|
|
|
|
#undef old_VISIBLE_tsk
|
|
|
|
|
#undef old_Qsrt_NORMAL
|
|
|
|
|
#undef old_Show_HICOLS
|
|
|
|
|
#undef old_Show_THREAD
|
top: honor the restrictive, crufty old top rcfile
At one time, new top silently defaulted when an rcfile
was found to be incompatible. This is exactly what
the old top did. However, after some discussion it
was decided top should alert the user and thereby
save the system administrator some headaches.
Now, some are upset over the fatal error, proving you
can't please everybody. But in all fairness, given
the difficulty of customizing old top, any reluctance
to delete an old saved rcfile is understandable.
To ease transition to this new top, old style rcfiles
will now be honored and converted to the new format.
And if not disabled at ./configure time via CFLAGS,
a user will be warned when an old style rcfile is
about to be overwritten using the 'W' command.
Lastly, the config validation logic was enhanced to
help ensure both types of rcfile haven't been edited
manually and possibly made unuseable.
Reported-By: sergio <mailbox@sergio.spb.ru>
Bug-Debian: http://bugs.debian.org/651213
Reported-By: martin f krafft <madduck@debian.org>
Bug-Debian: http://bugs.debian.org/651863
Signed-off-by: Jim Warner <james.warner@comcast.net>
2012-03-01 11:29:59 +05:30
|
|
|
|
};
|
2012-03-03 00:04:56 +05:30
|
|
|
|
static const char fields_src[] = CVT_FIELDS;
|
|
|
|
|
char fields_dst[PFLAGSSIZ], *p1, *p2;
|
|
|
|
|
int i, j, x;
|
top: honor the restrictive, crufty old top rcfile
At one time, new top silently defaulted when an rcfile
was found to be incompatible. This is exactly what
the old top did. However, after some discussion it
was decided top should alert the user and thereby
save the system administrator some headaches.
Now, some are upset over the fatal error, proving you
can't please everybody. But in all fairness, given
the difficulty of customizing old top, any reluctance
to delete an old saved rcfile is understandable.
To ease transition to this new top, old style rcfiles
will now be honored and converted to the new format.
And if not disabled at ./configure time via CFLAGS,
a user will be warned when an old style rcfile is
about to be overwritten using the 'W' command.
Lastly, the config validation logic was enhanced to
help ensure both types of rcfile haven't been edited
manually and possibly made unuseable.
Reported-By: sergio <mailbox@sergio.spb.ru>
Bug-Debian: http://bugs.debian.org/651213
Reported-By: martin f krafft <madduck@debian.org>
Bug-Debian: http://bugs.debian.org/651863
Signed-off-by: Jim Warner <james.warner@comcast.net>
2012-03-01 11:29:59 +05:30
|
|
|
|
|
|
|
|
|
// first we'll touch up this window's winflags...
|
|
|
|
|
x = q->rc.winflags;
|
|
|
|
|
q->rc.winflags = 0;
|
|
|
|
|
for (i = 0; i < MAXTBL(flags_tab); i++) {
|
|
|
|
|
if (x & flags_tab[i].old) {
|
|
|
|
|
x &= ~flags_tab[i].old;
|
|
|
|
|
q->rc.winflags |= flags_tab[i].new;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
q->rc.winflags |= x;
|
|
|
|
|
|
2012-03-03 00:04:56 +05:30
|
|
|
|
// now let's convert old top's more limited fields...
|
|
|
|
|
j = strlen(q->rc.fieldscur);
|
|
|
|
|
if (j > CVT_FLDMAX)
|
|
|
|
|
return 1;
|
|
|
|
|
strcpy(fields_dst, fields_src);
|
|
|
|
|
/* all other fields represent the 'on' state with a capitalized version
|
|
|
|
|
of a particular qwerty key. for the 2 additional suse out-of-memory
|
2012-03-08 11:30:00 +05:30
|
|
|
|
fields it makes perfect sense to do the exact opposite, doesn't it?
|
2012-03-03 00:04:56 +05:30
|
|
|
|
in any case, we must turn them 'off' temporarily... */
|
|
|
|
|
if ((p1 = strchr(q->rc.fieldscur, '['))) *p1 = '{';
|
|
|
|
|
if ((p2 = strchr(q->rc.fieldscur, '\\'))) *p2 = '|';
|
|
|
|
|
for (i = 0; i < j; i++) {
|
top: honor the restrictive, crufty old top rcfile
At one time, new top silently defaulted when an rcfile
was found to be incompatible. This is exactly what
the old top did. However, after some discussion it
was decided top should alert the user and thereby
save the system administrator some headaches.
Now, some are upset over the fatal error, proving you
can't please everybody. But in all fairness, given
the difficulty of customizing old top, any reluctance
to delete an old saved rcfile is understandable.
To ease transition to this new top, old style rcfiles
will now be honored and converted to the new format.
And if not disabled at ./configure time via CFLAGS,
a user will be warned when an old style rcfile is
about to be overwritten using the 'W' command.
Lastly, the config validation logic was enhanced to
help ensure both types of rcfile haven't been edited
manually and possibly made unuseable.
Reported-By: sergio <mailbox@sergio.spb.ru>
Bug-Debian: http://bugs.debian.org/651213
Reported-By: martin f krafft <madduck@debian.org>
Bug-Debian: http://bugs.debian.org/651863
Signed-off-by: Jim Warner <james.warner@comcast.net>
2012-03-01 11:29:59 +05:30
|
|
|
|
int c = q->rc.fieldscur[i];
|
2012-03-03 00:04:56 +05:30
|
|
|
|
x = tolower(c) - 'a';
|
|
|
|
|
if (x < 0 || x >= CVT_FLDMAX)
|
|
|
|
|
return 1;
|
|
|
|
|
fields_dst[i] = fields_src[x];
|
top: honor the restrictive, crufty old top rcfile
At one time, new top silently defaulted when an rcfile
was found to be incompatible. This is exactly what
the old top did. However, after some discussion it
was decided top should alert the user and thereby
save the system administrator some headaches.
Now, some are upset over the fatal error, proving you
can't please everybody. But in all fairness, given
the difficulty of customizing old top, any reluctance
to delete an old saved rcfile is understandable.
To ease transition to this new top, old style rcfiles
will now be honored and converted to the new format.
And if not disabled at ./configure time via CFLAGS,
a user will be warned when an old style rcfile is
about to be overwritten using the 'W' command.
Lastly, the config validation logic was enhanced to
help ensure both types of rcfile haven't been edited
manually and possibly made unuseable.
Reported-By: sergio <mailbox@sergio.spb.ru>
Bug-Debian: http://bugs.debian.org/651213
Reported-By: martin f krafft <madduck@debian.org>
Bug-Debian: http://bugs.debian.org/651863
Signed-off-by: Jim Warner <james.warner@comcast.net>
2012-03-01 11:29:59 +05:30
|
|
|
|
if (isupper(c))
|
2012-03-03 00:04:56 +05:30
|
|
|
|
FLDon(fields_dst[i]);
|
top: honor the restrictive, crufty old top rcfile
At one time, new top silently defaulted when an rcfile
was found to be incompatible. This is exactly what
the old top did. However, after some discussion it
was decided top should alert the user and thereby
save the system administrator some headaches.
Now, some are upset over the fatal error, proving you
can't please everybody. But in all fairness, given
the difficulty of customizing old top, any reluctance
to delete an old saved rcfile is understandable.
To ease transition to this new top, old style rcfiles
will now be honored and converted to the new format.
And if not disabled at ./configure time via CFLAGS,
a user will be warned when an old style rcfile is
about to be overwritten using the 'W' command.
Lastly, the config validation logic was enhanced to
help ensure both types of rcfile haven't been edited
manually and possibly made unuseable.
Reported-By: sergio <mailbox@sergio.spb.ru>
Bug-Debian: http://bugs.debian.org/651213
Reported-By: martin f krafft <madduck@debian.org>
Bug-Debian: http://bugs.debian.org/651863
Signed-off-by: Jim Warner <james.warner@comcast.net>
2012-03-01 11:29:59 +05:30
|
|
|
|
}
|
2012-03-03 00:04:56 +05:30
|
|
|
|
// if we turned any suse only fields off, turn 'em back on OUR way...
|
|
|
|
|
if (p1) FLDon(fields_dst[p1 - q->rc.fieldscur]);
|
|
|
|
|
if (p2) FLDon(fields_dst[p2 - q->rc.fieldscur]);
|
|
|
|
|
strcpy(q->rc.fieldscur, fields_dst);
|
top: honor the restrictive, crufty old top rcfile
At one time, new top silently defaulted when an rcfile
was found to be incompatible. This is exactly what
the old top did. However, after some discussion it
was decided top should alert the user and thereby
save the system administrator some headaches.
Now, some are upset over the fatal error, proving you
can't please everybody. But in all fairness, given
the difficulty of customizing old top, any reluctance
to delete an old saved rcfile is understandable.
To ease transition to this new top, old style rcfiles
will now be honored and converted to the new format.
And if not disabled at ./configure time via CFLAGS,
a user will be warned when an old style rcfile is
about to be overwritten using the 'W' command.
Lastly, the config validation logic was enhanced to
help ensure both types of rcfile haven't been edited
manually and possibly made unuseable.
Reported-By: sergio <mailbox@sergio.spb.ru>
Bug-Debian: http://bugs.debian.org/651213
Reported-By: martin f krafft <madduck@debian.org>
Bug-Debian: http://bugs.debian.org/651863
Signed-off-by: Jim Warner <james.warner@comcast.net>
2012-03-01 11:29:59 +05:30
|
|
|
|
|
|
|
|
|
// lastly, we must adjust the old sort field enum...
|
|
|
|
|
x = q->rc.sortindx;
|
2012-03-03 00:04:56 +05:30
|
|
|
|
q->rc.sortindx = fields_src[x] - FLD_OFFSET;
|
2018-05-18 10:30:00 +05:30
|
|
|
|
if (q->rc.sortindx < 0 || q->rc.sortindx >= EU_MAXPFLGS)
|
|
|
|
|
return 1;
|
top: honor the restrictive, crufty old top rcfile
At one time, new top silently defaulted when an rcfile
was found to be incompatible. This is exactly what
the old top did. However, after some discussion it
was decided top should alert the user and thereby
save the system administrator some headaches.
Now, some are upset over the fatal error, proving you
can't please everybody. But in all fairness, given
the difficulty of customizing old top, any reluctance
to delete an old saved rcfile is understandable.
To ease transition to this new top, old style rcfiles
will now be honored and converted to the new format.
And if not disabled at ./configure time via CFLAGS,
a user will be warned when an old style rcfile is
about to be overwritten using the 'W' command.
Lastly, the config validation logic was enhanced to
help ensure both types of rcfile haven't been edited
manually and possibly made unuseable.
Reported-By: sergio <mailbox@sergio.spb.ru>
Bug-Debian: http://bugs.debian.org/651213
Reported-By: martin f krafft <madduck@debian.org>
Bug-Debian: http://bugs.debian.org/651863
Signed-off-by: Jim Warner <james.warner@comcast.net>
2012-03-01 11:29:59 +05:30
|
|
|
|
|
2012-03-03 00:04:56 +05:30
|
|
|
|
return 0;
|
top: honor the restrictive, crufty old top rcfile
At one time, new top silently defaulted when an rcfile
was found to be incompatible. This is exactly what
the old top did. However, after some discussion it
was decided top should alert the user and thereby
save the system administrator some headaches.
Now, some are upset over the fatal error, proving you
can't please everybody. But in all fairness, given
the difficulty of customizing old top, any reluctance
to delete an old saved rcfile is understandable.
To ease transition to this new top, old style rcfiles
will now be honored and converted to the new format.
And if not disabled at ./configure time via CFLAGS,
a user will be warned when an old style rcfile is
about to be overwritten using the 'W' command.
Lastly, the config validation logic was enhanced to
help ensure both types of rcfile haven't been edited
manually and possibly made unuseable.
Reported-By: sergio <mailbox@sergio.spb.ru>
Bug-Debian: http://bugs.debian.org/651213
Reported-By: martin f krafft <madduck@debian.org>
Bug-Debian: http://bugs.debian.org/651863
Signed-off-by: Jim Warner <james.warner@comcast.net>
2012-03-01 11:29:59 +05:30
|
|
|
|
} // end: config_cvt
|
|
|
|
|
|
|
|
|
|
|
2018-06-17 10:30:00 +05:30
|
|
|
|
/*
|
|
|
|
|
* A configs_file *Helper* function responsible for reading
|
|
|
|
|
* and validating a configuration file's 'Inspection' entries */
|
|
|
|
|
static int config_insp (FILE *fp, char *buf, size_t size) {
|
|
|
|
|
int i;
|
|
|
|
|
|
2018-06-17 10:30:00 +05:30
|
|
|
|
// we'll start off with a 'potential' blank or empty line
|
2018-06-17 10:30:00 +05:30
|
|
|
|
// ( only realized if we end up with Inspect.total > 0 )
|
2018-06-17 10:30:00 +05:30
|
|
|
|
if (!buf[0] || buf[0] != '\n') Inspect.raw = alloc_s("\n");
|
|
|
|
|
else Inspect.raw = alloc_c(1);
|
|
|
|
|
|
|
|
|
|
for (i = 0;;) {
|
2018-06-17 10:30:00 +05:30
|
|
|
|
#define iT(element) Inspect.tab[i].element
|
2018-06-17 10:30:00 +05:30
|
|
|
|
#define nxtLINE { buf[0] = '\0'; continue; }
|
2018-06-17 10:30:00 +05:30
|
|
|
|
size_t lraw = strlen(Inspect.raw) +1;
|
|
|
|
|
int n, x;
|
2018-07-21 10:30:00 +05:30
|
|
|
|
char *s1, *s2, *s3;
|
2018-06-17 10:30:00 +05:30
|
|
|
|
|
|
|
|
|
if (i < 0 || (size_t)i >= INT_MAX / sizeof(struct I_ent)) break;
|
|
|
|
|
if (lraw >= INT_MAX - size) break;
|
|
|
|
|
|
2018-06-17 10:30:00 +05:30
|
|
|
|
if (!buf[0] && !fgets(buf, size, fp)) break;
|
2018-06-17 10:30:00 +05:30
|
|
|
|
lraw += strlen(buf) +1;
|
|
|
|
|
Inspect.raw = alloc_r(Inspect.raw, lraw);
|
|
|
|
|
strcat(Inspect.raw, buf);
|
|
|
|
|
|
2018-06-17 10:30:00 +05:30
|
|
|
|
if (buf[0] == '#' || buf[0] == '\n') nxtLINE;
|
2018-06-17 10:30:00 +05:30
|
|
|
|
Inspect.tab = alloc_r(Inspect.tab, sizeof(struct I_ent) * (i + 1));
|
|
|
|
|
|
|
|
|
|
// part of this is used in a show_special() call, so let's sanitize it
|
|
|
|
|
for (n = 0, x = strlen(buf); n < x; n++) {
|
|
|
|
|
if ((buf[n] != '\t' && buf[n] != '\n')
|
|
|
|
|
&& (buf[n] < ' ')) {
|
|
|
|
|
buf[n] = '.';
|
|
|
|
|
Rc_questions = 1;
|
|
|
|
|
}
|
|
|
|
|
}
|
2018-07-21 10:30:00 +05:30
|
|
|
|
if (!(s1 = strtok(buf, "\t\n"))) { Rc_questions = 1; nxtLINE; }
|
|
|
|
|
if (!(s2 = strtok(NULL, "\t\n"))) { Rc_questions = 1; nxtLINE; }
|
|
|
|
|
if (!(s3 = strtok(NULL, "\t\n"))) { Rc_questions = 1; nxtLINE; }
|
2018-06-17 10:30:00 +05:30
|
|
|
|
|
|
|
|
|
switch (toupper(buf[0])) {
|
|
|
|
|
case 'F':
|
|
|
|
|
iT(func) = insp_do_file;
|
|
|
|
|
break;
|
|
|
|
|
case 'P':
|
|
|
|
|
iT(func) = insp_do_pipe;
|
|
|
|
|
break;
|
|
|
|
|
default:
|
|
|
|
|
Rc_questions = 1;
|
2018-06-17 10:30:00 +05:30
|
|
|
|
nxtLINE;
|
2018-06-17 10:30:00 +05:30
|
|
|
|
}
|
2018-07-21 10:30:00 +05:30
|
|
|
|
iT(type) = alloc_s(s1);
|
|
|
|
|
iT(name) = alloc_s(s2);
|
|
|
|
|
iT(fmts) = alloc_s(s3);
|
2018-06-17 10:30:00 +05:30
|
|
|
|
iT(farg) = (strstr(iT(fmts), "%d")) ? 1 : 0;
|
|
|
|
|
iT(fstr) = alloc_c(FNDBUFSIZ);
|
|
|
|
|
iT(flen) = 0;
|
|
|
|
|
|
2018-06-17 10:30:00 +05:30
|
|
|
|
buf[0] = '\0';
|
2018-06-17 10:30:00 +05:30
|
|
|
|
++i;
|
|
|
|
|
#undef iT
|
2018-06-17 10:30:00 +05:30
|
|
|
|
#undef nxtLINE
|
2018-06-17 10:30:00 +05:30
|
|
|
|
} // end: for ('inspect' entries)
|
|
|
|
|
|
|
|
|
|
Inspect.total = i;
|
|
|
|
|
#ifndef INSP_OFFDEMO
|
|
|
|
|
if (!Inspect.total) {
|
|
|
|
|
#define mkS(n) N_txt(YINSP_demo ## n ## _txt)
|
|
|
|
|
const char *sels[] = { mkS(01), mkS(02), mkS(03) };
|
|
|
|
|
Inspect.total = Inspect.demo = MAXTBL(sels);
|
|
|
|
|
Inspect.tab = alloc_c(sizeof(struct I_ent) * Inspect.total);
|
|
|
|
|
for (i = 0; i < Inspect.total; i++) {
|
|
|
|
|
Inspect.tab[i].type = alloc_s(N_txt(YINSP_deqtyp_txt));
|
|
|
|
|
Inspect.tab[i].name = alloc_s(sels[i]);
|
|
|
|
|
Inspect.tab[i].func = insp_do_demo;
|
|
|
|
|
Inspect.tab[i].fmts = alloc_s(N_txt(YINSP_deqfmt_txt));
|
|
|
|
|
Inspect.tab[i].fstr = alloc_c(FNDBUFSIZ);
|
|
|
|
|
}
|
|
|
|
|
#undef mkS
|
|
|
|
|
}
|
|
|
|
|
#endif
|
|
|
|
|
return 0;
|
|
|
|
|
} // end: config_insp
|
|
|
|
|
|
|
|
|
|
|
2018-06-17 10:30:00 +05:30
|
|
|
|
/*
|
|
|
|
|
* A configs_file *Helper* function responsible for reading
|
|
|
|
|
* and validating a configuration file's 'Other Filter' entries */
|
|
|
|
|
static int config_osel (FILE *fp, char *buf, size_t size) {
|
|
|
|
|
int i, ch, tot, wno, begun;
|
|
|
|
|
char *p;
|
|
|
|
|
|
|
|
|
|
for (begun = 0;;) {
|
|
|
|
|
if (!fgets(buf, size, fp)) return 0;
|
|
|
|
|
if (buf[0] == '\n') continue;
|
|
|
|
|
// whoa, must be an 'inspect' entry
|
|
|
|
|
if (!begun && !strstr(buf, Osel_delim_1_txt))
|
|
|
|
|
return 0;
|
2019-02-01 11:30:00 +05:30
|
|
|
|
// ok, we're now beginning
|
2018-06-17 10:30:00 +05:30
|
|
|
|
if (!begun && strstr(buf, Osel_delim_1_txt)) {
|
|
|
|
|
begun = 1;
|
|
|
|
|
continue;
|
|
|
|
|
}
|
|
|
|
|
// this marks the end of our stuff
|
|
|
|
|
if (begun && strstr(buf, Osel_delim_2_txt))
|
|
|
|
|
break;
|
|
|
|
|
|
|
|
|
|
if (2 != sscanf(buf, Osel_window_fmts, &wno, &tot))
|
|
|
|
|
goto end_oops;
|
2020-05-27 10:30:00 +05:30
|
|
|
|
if (wno < 0 || wno >= GROUPSMAX) goto end_oops;
|
|
|
|
|
if (tot < 0) goto end_oops;
|
2018-06-17 10:30:00 +05:30
|
|
|
|
|
|
|
|
|
for (i = 0; i < tot; i++) {
|
|
|
|
|
if (!fgets(buf, size, fp)) return 1;
|
|
|
|
|
if (1 > sscanf(buf, Osel_filterI_fmt, &ch)) goto end_oops;
|
|
|
|
|
if ((p = strchr(buf, '\n'))) *p = '\0';
|
|
|
|
|
if (!(p = strstr(buf, OSEL_FILTER))) goto end_oops;
|
|
|
|
|
p += sizeof(OSEL_FILTER) - 1;
|
|
|
|
|
if (osel_add(&Winstk[wno], ch, p, 0)) goto end_oops;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
// let's prime that buf for the next guy...
|
|
|
|
|
fgets(buf, size, fp);
|
|
|
|
|
return 0;
|
|
|
|
|
|
|
|
|
|
end_oops:
|
|
|
|
|
Rc_questions = 1;
|
|
|
|
|
return 1;
|
|
|
|
|
} // end: config_osel
|
|
|
|
|
|
|
|
|
|
|
2011-03-31 16:45:12 +05:30
|
|
|
|
/*
|
2018-05-18 10:30:00 +05:30
|
|
|
|
* A configs_reads *Helper* function responsible for processing
|
top: allow more flexible approach for startup defaults
Those references below offer more detail regarding the
default startup changes beginning with version 3.3.10.
It is important to remember that all such changes were
supposed to impact only new users or users who had not
saved the personal config file (via that 'W' command).
However, I introduced a bug wherein the rcfile was not
fully honored. This gave the changes a bad reputation.
That bug was corrected in release 3.3.11 but the issue
of default startup options keeps resurfacing. And it's
clear there's no consensus on what should be included.
Our --disable-modern-top configure option is of little
help since it remains an all-or-nothing approach. What
we need is an answer offering unlimited customization.
So, this commit will provide distribution packagers or
system administrators with a much more flexible way to
set their own preferred startup default configuration.
A new rcfile is being introduced: '/etc/topdefaultrc',
whose format/content is the same as a personal rcfile.
Thus once a 'proper' enterprise configuration has been
established and saved via 'W', it can be copied to the
/etc/ directory. Thereafter, startup in the absence of
a saved rcfile will use that configuration as default.
Now if a distribution packager or system administrator
wishes to expose their users to some of top's advanced
capabilities they can do so gradually. Perhaps setting
up graph mode for summary area task and memory display
while retaining the %CPU sort could be tried. Or maybe
showing colors, but better customized for a particular
terminal emulator. Such possibilities are now endless.
[ in exploiting this new capability, i hope that the ]
[ other windows (alt display mode) aren't overlooked ]
Reference(s):
. Sep, 2014 - Not fully honoring rcfile bug discussed
https://www.freelists.org/post/procps/top-saved-rcfile-bug
. Oct, 2014 - Attempt to defend new startup defaults
https://bugzilla.redhat.com/show_bug.cgi?id=1153049
. Jul, 2015 - Forest vs. %CPU views discussion
https://gitlab.com/procps-ng/procps/issues/6
. Oct, 2017 - Question the use of --disable-modern-top
https://bugzilla.redhat.com/show_bug.cgi?id=1499410
. Oct, 2017 - Forest vs. %CPU views discussion again
https://www.freelists.org/post/procps/Forest-mode-by-default-in-top-seems-a-bit-strange
. Dec, 2017 - Rehash of 3.3.10 startup defaults change
https://gitlab.com/procps-ng/procps/issues/78
Signed-off-by: Jim Warner <james.warner@comcast.net>
2017-12-17 11:30:00 +05:30
|
|
|
|
* a configuration file (personal or system-wide default) */
|
2018-06-17 10:30:00 +05:30
|
|
|
|
static const char *configs_file (FILE *fp, const char *name, float *delay) {
|
top: allow more flexible approach for startup defaults
Those references below offer more detail regarding the
default startup changes beginning with version 3.3.10.
It is important to remember that all such changes were
supposed to impact only new users or users who had not
saved the personal config file (via that 'W' command).
However, I introduced a bug wherein the rcfile was not
fully honored. This gave the changes a bad reputation.
That bug was corrected in release 3.3.11 but the issue
of default startup options keeps resurfacing. And it's
clear there's no consensus on what should be included.
Our --disable-modern-top configure option is of little
help since it remains an all-or-nothing approach. What
we need is an answer offering unlimited customization.
So, this commit will provide distribution packagers or
system administrators with a much more flexible way to
set their own preferred startup default configuration.
A new rcfile is being introduced: '/etc/topdefaultrc',
whose format/content is the same as a personal rcfile.
Thus once a 'proper' enterprise configuration has been
established and saved via 'W', it can be copied to the
/etc/ directory. Thereafter, startup in the absence of
a saved rcfile will use that configuration as default.
Now if a distribution packager or system administrator
wishes to expose their users to some of top's advanced
capabilities they can do so gradually. Perhaps setting
up graph mode for summary area task and memory display
while retaining the %CPU sort could be tried. Or maybe
showing colors, but better customized for a particular
terminal emulator. Such possibilities are now endless.
[ in exploiting this new capability, i hope that the ]
[ other windows (alt display mode) aren't overlooked ]
Reference(s):
. Sep, 2014 - Not fully honoring rcfile bug discussed
https://www.freelists.org/post/procps/top-saved-rcfile-bug
. Oct, 2014 - Attempt to defend new startup defaults
https://bugzilla.redhat.com/show_bug.cgi?id=1153049
. Jul, 2015 - Forest vs. %CPU views discussion
https://gitlab.com/procps-ng/procps/issues/6
. Oct, 2017 - Question the use of --disable-modern-top
https://bugzilla.redhat.com/show_bug.cgi?id=1499410
. Oct, 2017 - Forest vs. %CPU views discussion again
https://www.freelists.org/post/procps/Forest-mode-by-default-in-top-seems-a-bit-strange
. Dec, 2017 - Rehash of 3.3.10 startup defaults change
https://gitlab.com/procps-ng/procps/issues/78
Signed-off-by: Jim Warner <james.warner@comcast.net>
2017-12-17 11:30:00 +05:30
|
|
|
|
char fbuf[LRGBUFSIZ];
|
|
|
|
|
int i, tmp_whole, tmp_fract;
|
|
|
|
|
const char *p = NULL;
|
|
|
|
|
|
|
|
|
|
p = fmtmk(N_fmt(RC_bad_files_fmt), name);
|
2018-05-18 10:30:00 +05:30
|
|
|
|
(void)fgets(fbuf, sizeof(fbuf), fp); // ignore eyecatcher
|
top: allow more flexible approach for startup defaults
Those references below offer more detail regarding the
default startup changes beginning with version 3.3.10.
It is important to remember that all such changes were
supposed to impact only new users or users who had not
saved the personal config file (via that 'W' command).
However, I introduced a bug wherein the rcfile was not
fully honored. This gave the changes a bad reputation.
That bug was corrected in release 3.3.11 but the issue
of default startup options keeps resurfacing. And it's
clear there's no consensus on what should be included.
Our --disable-modern-top configure option is of little
help since it remains an all-or-nothing approach. What
we need is an answer offering unlimited customization.
So, this commit will provide distribution packagers or
system administrators with a much more flexible way to
set their own preferred startup default configuration.
A new rcfile is being introduced: '/etc/topdefaultrc',
whose format/content is the same as a personal rcfile.
Thus once a 'proper' enterprise configuration has been
established and saved via 'W', it can be copied to the
/etc/ directory. Thereafter, startup in the absence of
a saved rcfile will use that configuration as default.
Now if a distribution packager or system administrator
wishes to expose their users to some of top's advanced
capabilities they can do so gradually. Perhaps setting
up graph mode for summary area task and memory display
while retaining the %CPU sort could be tried. Or maybe
showing colors, but better customized for a particular
terminal emulator. Such possibilities are now endless.
[ in exploiting this new capability, i hope that the ]
[ other windows (alt display mode) aren't overlooked ]
Reference(s):
. Sep, 2014 - Not fully honoring rcfile bug discussed
https://www.freelists.org/post/procps/top-saved-rcfile-bug
. Oct, 2014 - Attempt to defend new startup defaults
https://bugzilla.redhat.com/show_bug.cgi?id=1153049
. Jul, 2015 - Forest vs. %CPU views discussion
https://gitlab.com/procps-ng/procps/issues/6
. Oct, 2017 - Question the use of --disable-modern-top
https://bugzilla.redhat.com/show_bug.cgi?id=1499410
. Oct, 2017 - Forest vs. %CPU views discussion again
https://www.freelists.org/post/procps/Forest-mode-by-default-in-top-seems-a-bit-strange
. Dec, 2017 - Rehash of 3.3.10 startup defaults change
https://gitlab.com/procps-ng/procps/issues/78
Signed-off-by: Jim Warner <james.warner@comcast.net>
2017-12-17 11:30:00 +05:30
|
|
|
|
if (6 != fscanf(fp
|
|
|
|
|
, "Id:%c, Mode_altscr=%d, Mode_irixps=%d, Delay_time=%d.%d, Curwin=%d\n"
|
|
|
|
|
, &Rc.id, &Rc.mode_altscr, &Rc.mode_irixps, &tmp_whole, &tmp_fract, &i)) {
|
|
|
|
|
return p;
|
|
|
|
|
}
|
|
|
|
|
if (Rc.id < 'a' || Rc.id > RCF_VERSION_ID)
|
|
|
|
|
return p;
|
2018-05-18 10:30:00 +05:30
|
|
|
|
if (Rc.mode_altscr < 0 || Rc.mode_altscr > 1)
|
|
|
|
|
return p;
|
|
|
|
|
if (Rc.mode_irixps < 0 || Rc.mode_irixps > 1)
|
|
|
|
|
return p;
|
|
|
|
|
if (tmp_whole < 0)
|
|
|
|
|
return p;
|
top: allow more flexible approach for startup defaults
Those references below offer more detail regarding the
default startup changes beginning with version 3.3.10.
It is important to remember that all such changes were
supposed to impact only new users or users who had not
saved the personal config file (via that 'W' command).
However, I introduced a bug wherein the rcfile was not
fully honored. This gave the changes a bad reputation.
That bug was corrected in release 3.3.11 but the issue
of default startup options keeps resurfacing. And it's
clear there's no consensus on what should be included.
Our --disable-modern-top configure option is of little
help since it remains an all-or-nothing approach. What
we need is an answer offering unlimited customization.
So, this commit will provide distribution packagers or
system administrators with a much more flexible way to
set their own preferred startup default configuration.
A new rcfile is being introduced: '/etc/topdefaultrc',
whose format/content is the same as a personal rcfile.
Thus once a 'proper' enterprise configuration has been
established and saved via 'W', it can be copied to the
/etc/ directory. Thereafter, startup in the absence of
a saved rcfile will use that configuration as default.
Now if a distribution packager or system administrator
wishes to expose their users to some of top's advanced
capabilities they can do so gradually. Perhaps setting
up graph mode for summary area task and memory display
while retaining the %CPU sort could be tried. Or maybe
showing colors, but better customized for a particular
terminal emulator. Such possibilities are now endless.
[ in exploiting this new capability, i hope that the ]
[ other windows (alt display mode) aren't overlooked ]
Reference(s):
. Sep, 2014 - Not fully honoring rcfile bug discussed
https://www.freelists.org/post/procps/top-saved-rcfile-bug
. Oct, 2014 - Attempt to defend new startup defaults
https://bugzilla.redhat.com/show_bug.cgi?id=1153049
. Jul, 2015 - Forest vs. %CPU views discussion
https://gitlab.com/procps-ng/procps/issues/6
. Oct, 2017 - Question the use of --disable-modern-top
https://bugzilla.redhat.com/show_bug.cgi?id=1499410
. Oct, 2017 - Forest vs. %CPU views discussion again
https://www.freelists.org/post/procps/Forest-mode-by-default-in-top-seems-a-bit-strange
. Dec, 2017 - Rehash of 3.3.10 startup defaults change
https://gitlab.com/procps-ng/procps/issues/78
Signed-off-by: Jim Warner <james.warner@comcast.net>
2017-12-17 11:30:00 +05:30
|
|
|
|
// you saw that, right? (fscanf stickin' it to 'i')
|
1970-01-01 05:30:00 +05:30
|
|
|
|
if (i < 0 || i >= GROUPSMAX)
|
|
|
|
|
return p;
|
top: allow more flexible approach for startup defaults
Those references below offer more detail regarding the
default startup changes beginning with version 3.3.10.
It is important to remember that all such changes were
supposed to impact only new users or users who had not
saved the personal config file (via that 'W' command).
However, I introduced a bug wherein the rcfile was not
fully honored. This gave the changes a bad reputation.
That bug was corrected in release 3.3.11 but the issue
of default startup options keeps resurfacing. And it's
clear there's no consensus on what should be included.
Our --disable-modern-top configure option is of little
help since it remains an all-or-nothing approach. What
we need is an answer offering unlimited customization.
So, this commit will provide distribution packagers or
system administrators with a much more flexible way to
set their own preferred startup default configuration.
A new rcfile is being introduced: '/etc/topdefaultrc',
whose format/content is the same as a personal rcfile.
Thus once a 'proper' enterprise configuration has been
established and saved via 'W', it can be copied to the
/etc/ directory. Thereafter, startup in the absence of
a saved rcfile will use that configuration as default.
Now if a distribution packager or system administrator
wishes to expose their users to some of top's advanced
capabilities they can do so gradually. Perhaps setting
up graph mode for summary area task and memory display
while retaining the %CPU sort could be tried. Or maybe
showing colors, but better customized for a particular
terminal emulator. Such possibilities are now endless.
[ in exploiting this new capability, i hope that the ]
[ other windows (alt display mode) aren't overlooked ]
Reference(s):
. Sep, 2014 - Not fully honoring rcfile bug discussed
https://www.freelists.org/post/procps/top-saved-rcfile-bug
. Oct, 2014 - Attempt to defend new startup defaults
https://bugzilla.redhat.com/show_bug.cgi?id=1153049
. Jul, 2015 - Forest vs. %CPU views discussion
https://gitlab.com/procps-ng/procps/issues/6
. Oct, 2017 - Question the use of --disable-modern-top
https://bugzilla.redhat.com/show_bug.cgi?id=1499410
. Oct, 2017 - Forest vs. %CPU views discussion again
https://www.freelists.org/post/procps/Forest-mode-by-default-in-top-seems-a-bit-strange
. Dec, 2017 - Rehash of 3.3.10 startup defaults change
https://gitlab.com/procps-ng/procps/issues/78
Signed-off-by: Jim Warner <james.warner@comcast.net>
2017-12-17 11:30:00 +05:30
|
|
|
|
Curwin = &Winstk[i];
|
|
|
|
|
// this may be ugly, but it keeps us locale independent...
|
|
|
|
|
*delay = (float)tmp_whole + (float)tmp_fract / 1000;
|
|
|
|
|
|
|
|
|
|
for (i = 0 ; i < GROUPSMAX; i++) {
|
2018-05-18 10:30:00 +05:30
|
|
|
|
int n, x;
|
top: allow more flexible approach for startup defaults
Those references below offer more detail regarding the
default startup changes beginning with version 3.3.10.
It is important to remember that all such changes were
supposed to impact only new users or users who had not
saved the personal config file (via that 'W' command).
However, I introduced a bug wherein the rcfile was not
fully honored. This gave the changes a bad reputation.
That bug was corrected in release 3.3.11 but the issue
of default startup options keeps resurfacing. And it's
clear there's no consensus on what should be included.
Our --disable-modern-top configure option is of little
help since it remains an all-or-nothing approach. What
we need is an answer offering unlimited customization.
So, this commit will provide distribution packagers or
system administrators with a much more flexible way to
set their own preferred startup default configuration.
A new rcfile is being introduced: '/etc/topdefaultrc',
whose format/content is the same as a personal rcfile.
Thus once a 'proper' enterprise configuration has been
established and saved via 'W', it can be copied to the
/etc/ directory. Thereafter, startup in the absence of
a saved rcfile will use that configuration as default.
Now if a distribution packager or system administrator
wishes to expose their users to some of top's advanced
capabilities they can do so gradually. Perhaps setting
up graph mode for summary area task and memory display
while retaining the %CPU sort could be tried. Or maybe
showing colors, but better customized for a particular
terminal emulator. Such possibilities are now endless.
[ in exploiting this new capability, i hope that the ]
[ other windows (alt display mode) aren't overlooked ]
Reference(s):
. Sep, 2014 - Not fully honoring rcfile bug discussed
https://www.freelists.org/post/procps/top-saved-rcfile-bug
. Oct, 2014 - Attempt to defend new startup defaults
https://bugzilla.redhat.com/show_bug.cgi?id=1153049
. Jul, 2015 - Forest vs. %CPU views discussion
https://gitlab.com/procps-ng/procps/issues/6
. Oct, 2017 - Question the use of --disable-modern-top
https://bugzilla.redhat.com/show_bug.cgi?id=1499410
. Oct, 2017 - Forest vs. %CPU views discussion again
https://www.freelists.org/post/procps/Forest-mode-by-default-in-top-seems-a-bit-strange
. Dec, 2017 - Rehash of 3.3.10 startup defaults change
https://gitlab.com/procps-ng/procps/issues/78
Signed-off-by: Jim Warner <james.warner@comcast.net>
2017-12-17 11:30:00 +05:30
|
|
|
|
WIN_t *w = &Winstk[i];
|
|
|
|
|
p = fmtmk(N_fmt(RC_bad_entry_fmt), i+1, name);
|
|
|
|
|
|
|
|
|
|
// note: "fieldscur=%__s" on next line should equal (PFLAGSSIZ -1) !
|
|
|
|
|
if (2 != fscanf(fp, "%3s\tfieldscur=%99s\n"
|
|
|
|
|
, w->rc.winname, w->rc.fieldscur))
|
|
|
|
|
return p;
|
|
|
|
|
#if PFLAGSSIZ != 100
|
2018-05-18 10:30:00 +05:30
|
|
|
|
// too bad fscanf is not as flexible with his format string as snprintf
|
|
|
|
|
#error Hey, fix the above fscanf 'PFLAGSSIZ' dependency !
|
top: allow more flexible approach for startup defaults
Those references below offer more detail regarding the
default startup changes beginning with version 3.3.10.
It is important to remember that all such changes were
supposed to impact only new users or users who had not
saved the personal config file (via that 'W' command).
However, I introduced a bug wherein the rcfile was not
fully honored. This gave the changes a bad reputation.
That bug was corrected in release 3.3.11 but the issue
of default startup options keeps resurfacing. And it's
clear there's no consensus on what should be included.
Our --disable-modern-top configure option is of little
help since it remains an all-or-nothing approach. What
we need is an answer offering unlimited customization.
So, this commit will provide distribution packagers or
system administrators with a much more flexible way to
set their own preferred startup default configuration.
A new rcfile is being introduced: '/etc/topdefaultrc',
whose format/content is the same as a personal rcfile.
Thus once a 'proper' enterprise configuration has been
established and saved via 'W', it can be copied to the
/etc/ directory. Thereafter, startup in the absence of
a saved rcfile will use that configuration as default.
Now if a distribution packager or system administrator
wishes to expose their users to some of top's advanced
capabilities they can do so gradually. Perhaps setting
up graph mode for summary area task and memory display
while retaining the %CPU sort could be tried. Or maybe
showing colors, but better customized for a particular
terminal emulator. Such possibilities are now endless.
[ in exploiting this new capability, i hope that the ]
[ other windows (alt display mode) aren't overlooked ]
Reference(s):
. Sep, 2014 - Not fully honoring rcfile bug discussed
https://www.freelists.org/post/procps/top-saved-rcfile-bug
. Oct, 2014 - Attempt to defend new startup defaults
https://bugzilla.redhat.com/show_bug.cgi?id=1153049
. Jul, 2015 - Forest vs. %CPU views discussion
https://gitlab.com/procps-ng/procps/issues/6
. Oct, 2017 - Question the use of --disable-modern-top
https://bugzilla.redhat.com/show_bug.cgi?id=1499410
. Oct, 2017 - Forest vs. %CPU views discussion again
https://www.freelists.org/post/procps/Forest-mode-by-default-in-top-seems-a-bit-strange
. Dec, 2017 - Rehash of 3.3.10 startup defaults change
https://gitlab.com/procps-ng/procps/issues/78
Signed-off-by: Jim Warner <james.warner@comcast.net>
2017-12-17 11:30:00 +05:30
|
|
|
|
#endif
|
|
|
|
|
// be tolerant of missing release 3.3.10 graph modes additions
|
2020-05-29 10:30:00 +05:30
|
|
|
|
if (3 > fscanf(fp, "\twinflags=%d, sortindx=%d, maxtasks=%d, graph_cpus=%d, graph_mems=%d"
|
|
|
|
|
", double_up=%d, combine_cpus=%d\n"
|
|
|
|
|
, &w->rc.winflags, &w->rc.sortindx, &w->rc.maxtasks, &w->rc.graph_cpus, &w->rc.graph_mems
|
|
|
|
|
, &w->rc.double_up, &w->rc.combine_cpus))
|
top: allow more flexible approach for startup defaults
Those references below offer more detail regarding the
default startup changes beginning with version 3.3.10.
It is important to remember that all such changes were
supposed to impact only new users or users who had not
saved the personal config file (via that 'W' command).
However, I introduced a bug wherein the rcfile was not
fully honored. This gave the changes a bad reputation.
That bug was corrected in release 3.3.11 but the issue
of default startup options keeps resurfacing. And it's
clear there's no consensus on what should be included.
Our --disable-modern-top configure option is of little
help since it remains an all-or-nothing approach. What
we need is an answer offering unlimited customization.
So, this commit will provide distribution packagers or
system administrators with a much more flexible way to
set their own preferred startup default configuration.
A new rcfile is being introduced: '/etc/topdefaultrc',
whose format/content is the same as a personal rcfile.
Thus once a 'proper' enterprise configuration has been
established and saved via 'W', it can be copied to the
/etc/ directory. Thereafter, startup in the absence of
a saved rcfile will use that configuration as default.
Now if a distribution packager or system administrator
wishes to expose their users to some of top's advanced
capabilities they can do so gradually. Perhaps setting
up graph mode for summary area task and memory display
while retaining the %CPU sort could be tried. Or maybe
showing colors, but better customized for a particular
terminal emulator. Such possibilities are now endless.
[ in exploiting this new capability, i hope that the ]
[ other windows (alt display mode) aren't overlooked ]
Reference(s):
. Sep, 2014 - Not fully honoring rcfile bug discussed
https://www.freelists.org/post/procps/top-saved-rcfile-bug
. Oct, 2014 - Attempt to defend new startup defaults
https://bugzilla.redhat.com/show_bug.cgi?id=1153049
. Jul, 2015 - Forest vs. %CPU views discussion
https://gitlab.com/procps-ng/procps/issues/6
. Oct, 2017 - Question the use of --disable-modern-top
https://bugzilla.redhat.com/show_bug.cgi?id=1499410
. Oct, 2017 - Forest vs. %CPU views discussion again
https://www.freelists.org/post/procps/Forest-mode-by-default-in-top-seems-a-bit-strange
. Dec, 2017 - Rehash of 3.3.10 startup defaults change
https://gitlab.com/procps-ng/procps/issues/78
Signed-off-by: Jim Warner <james.warner@comcast.net>
2017-12-17 11:30:00 +05:30
|
|
|
|
return p;
|
2018-05-18 10:30:00 +05:30
|
|
|
|
if (w->rc.sortindx < 0 || w->rc.sortindx >= EU_MAXPFLGS)
|
|
|
|
|
return p;
|
2018-05-18 10:30:00 +05:30
|
|
|
|
if (w->rc.maxtasks < 0)
|
|
|
|
|
return p;
|
2018-05-18 10:30:00 +05:30
|
|
|
|
if (w->rc.graph_cpus < 0 || w->rc.graph_cpus > 2)
|
|
|
|
|
return p;
|
|
|
|
|
if (w->rc.graph_mems < 0 || w->rc.graph_mems > 2)
|
|
|
|
|
return p;
|
2020-05-29 10:30:00 +05:30
|
|
|
|
if (w->rc.double_up < 0 || w->rc.double_up > 1)
|
|
|
|
|
return p;
|
|
|
|
|
// can't check upper bounds until smp_num_cpus known
|
|
|
|
|
if (w->rc.combine_cpus < 0)
|
|
|
|
|
return p;
|
2018-05-18 10:30:00 +05:30
|
|
|
|
|
top: allow more flexible approach for startup defaults
Those references below offer more detail regarding the
default startup changes beginning with version 3.3.10.
It is important to remember that all such changes were
supposed to impact only new users or users who had not
saved the personal config file (via that 'W' command).
However, I introduced a bug wherein the rcfile was not
fully honored. This gave the changes a bad reputation.
That bug was corrected in release 3.3.11 but the issue
of default startup options keeps resurfacing. And it's
clear there's no consensus on what should be included.
Our --disable-modern-top configure option is of little
help since it remains an all-or-nothing approach. What
we need is an answer offering unlimited customization.
So, this commit will provide distribution packagers or
system administrators with a much more flexible way to
set their own preferred startup default configuration.
A new rcfile is being introduced: '/etc/topdefaultrc',
whose format/content is the same as a personal rcfile.
Thus once a 'proper' enterprise configuration has been
established and saved via 'W', it can be copied to the
/etc/ directory. Thereafter, startup in the absence of
a saved rcfile will use that configuration as default.
Now if a distribution packager or system administrator
wishes to expose their users to some of top's advanced
capabilities they can do so gradually. Perhaps setting
up graph mode for summary area task and memory display
while retaining the %CPU sort could be tried. Or maybe
showing colors, but better customized for a particular
terminal emulator. Such possibilities are now endless.
[ in exploiting this new capability, i hope that the ]
[ other windows (alt display mode) aren't overlooked ]
Reference(s):
. Sep, 2014 - Not fully honoring rcfile bug discussed
https://www.freelists.org/post/procps/top-saved-rcfile-bug
. Oct, 2014 - Attempt to defend new startup defaults
https://bugzilla.redhat.com/show_bug.cgi?id=1153049
. Jul, 2015 - Forest vs. %CPU views discussion
https://gitlab.com/procps-ng/procps/issues/6
. Oct, 2017 - Question the use of --disable-modern-top
https://bugzilla.redhat.com/show_bug.cgi?id=1499410
. Oct, 2017 - Forest vs. %CPU views discussion again
https://www.freelists.org/post/procps/Forest-mode-by-default-in-top-seems-a-bit-strange
. Dec, 2017 - Rehash of 3.3.10 startup defaults change
https://gitlab.com/procps-ng/procps/issues/78
Signed-off-by: Jim Warner <james.warner@comcast.net>
2017-12-17 11:30:00 +05:30
|
|
|
|
if (4 != fscanf(fp, "\tsummclr=%d, msgsclr=%d, headclr=%d, taskclr=%d\n"
|
2018-05-23 10:30:00 +05:30
|
|
|
|
, &w->rc.summclr, &w->rc.msgsclr, &w->rc.headclr, &w->rc.taskclr))
|
top: allow more flexible approach for startup defaults
Those references below offer more detail regarding the
default startup changes beginning with version 3.3.10.
It is important to remember that all such changes were
supposed to impact only new users or users who had not
saved the personal config file (via that 'W' command).
However, I introduced a bug wherein the rcfile was not
fully honored. This gave the changes a bad reputation.
That bug was corrected in release 3.3.11 but the issue
of default startup options keeps resurfacing. And it's
clear there's no consensus on what should be included.
Our --disable-modern-top configure option is of little
help since it remains an all-or-nothing approach. What
we need is an answer offering unlimited customization.
So, this commit will provide distribution packagers or
system administrators with a much more flexible way to
set their own preferred startup default configuration.
A new rcfile is being introduced: '/etc/topdefaultrc',
whose format/content is the same as a personal rcfile.
Thus once a 'proper' enterprise configuration has been
established and saved via 'W', it can be copied to the
/etc/ directory. Thereafter, startup in the absence of
a saved rcfile will use that configuration as default.
Now if a distribution packager or system administrator
wishes to expose their users to some of top's advanced
capabilities they can do so gradually. Perhaps setting
up graph mode for summary area task and memory display
while retaining the %CPU sort could be tried. Or maybe
showing colors, but better customized for a particular
terminal emulator. Such possibilities are now endless.
[ in exploiting this new capability, i hope that the ]
[ other windows (alt display mode) aren't overlooked ]
Reference(s):
. Sep, 2014 - Not fully honoring rcfile bug discussed
https://www.freelists.org/post/procps/top-saved-rcfile-bug
. Oct, 2014 - Attempt to defend new startup defaults
https://bugzilla.redhat.com/show_bug.cgi?id=1153049
. Jul, 2015 - Forest vs. %CPU views discussion
https://gitlab.com/procps-ng/procps/issues/6
. Oct, 2017 - Question the use of --disable-modern-top
https://bugzilla.redhat.com/show_bug.cgi?id=1499410
. Oct, 2017 - Forest vs. %CPU views discussion again
https://www.freelists.org/post/procps/Forest-mode-by-default-in-top-seems-a-bit-strange
. Dec, 2017 - Rehash of 3.3.10 startup defaults change
https://gitlab.com/procps-ng/procps/issues/78
Signed-off-by: Jim Warner <james.warner@comcast.net>
2017-12-17 11:30:00 +05:30
|
|
|
|
return p;
|
2018-06-04 10:30:00 +05:30
|
|
|
|
// would prefer to use 'max_colors', but it isn't available yet...
|
|
|
|
|
if (w->rc.summclr < 0 || w->rc.summclr > 255) return p;
|
|
|
|
|
if (w->rc.msgsclr < 0 || w->rc.msgsclr > 255) return p;
|
|
|
|
|
if (w->rc.headclr < 0 || w->rc.headclr > 255) return p;
|
|
|
|
|
if (w->rc.taskclr < 0 || w->rc.taskclr > 255) return p;
|
top: allow more flexible approach for startup defaults
Those references below offer more detail regarding the
default startup changes beginning with version 3.3.10.
It is important to remember that all such changes were
supposed to impact only new users or users who had not
saved the personal config file (via that 'W' command).
However, I introduced a bug wherein the rcfile was not
fully honored. This gave the changes a bad reputation.
That bug was corrected in release 3.3.11 but the issue
of default startup options keeps resurfacing. And it's
clear there's no consensus on what should be included.
Our --disable-modern-top configure option is of little
help since it remains an all-or-nothing approach. What
we need is an answer offering unlimited customization.
So, this commit will provide distribution packagers or
system administrators with a much more flexible way to
set their own preferred startup default configuration.
A new rcfile is being introduced: '/etc/topdefaultrc',
whose format/content is the same as a personal rcfile.
Thus once a 'proper' enterprise configuration has been
established and saved via 'W', it can be copied to the
/etc/ directory. Thereafter, startup in the absence of
a saved rcfile will use that configuration as default.
Now if a distribution packager or system administrator
wishes to expose their users to some of top's advanced
capabilities they can do so gradually. Perhaps setting
up graph mode for summary area task and memory display
while retaining the %CPU sort could be tried. Or maybe
showing colors, but better customized for a particular
terminal emulator. Such possibilities are now endless.
[ in exploiting this new capability, i hope that the ]
[ other windows (alt display mode) aren't overlooked ]
Reference(s):
. Sep, 2014 - Not fully honoring rcfile bug discussed
https://www.freelists.org/post/procps/top-saved-rcfile-bug
. Oct, 2014 - Attempt to defend new startup defaults
https://bugzilla.redhat.com/show_bug.cgi?id=1153049
. Jul, 2015 - Forest vs. %CPU views discussion
https://gitlab.com/procps-ng/procps/issues/6
. Oct, 2017 - Question the use of --disable-modern-top
https://bugzilla.redhat.com/show_bug.cgi?id=1499410
. Oct, 2017 - Forest vs. %CPU views discussion again
https://www.freelists.org/post/procps/Forest-mode-by-default-in-top-seems-a-bit-strange
. Dec, 2017 - Rehash of 3.3.10 startup defaults change
https://gitlab.com/procps-ng/procps/issues/78
Signed-off-by: Jim Warner <james.warner@comcast.net>
2017-12-17 11:30:00 +05:30
|
|
|
|
|
|
|
|
|
switch (Rc.id) {
|
|
|
|
|
case 'a': // 3.2.8 (former procps)
|
|
|
|
|
if (config_cvt(w))
|
|
|
|
|
return p;
|
2020-05-27 10:30:00 +05:30
|
|
|
|
// fall through
|
top: allow more flexible approach for startup defaults
Those references below offer more detail regarding the
default startup changes beginning with version 3.3.10.
It is important to remember that all such changes were
supposed to impact only new users or users who had not
saved the personal config file (via that 'W' command).
However, I introduced a bug wherein the rcfile was not
fully honored. This gave the changes a bad reputation.
That bug was corrected in release 3.3.11 but the issue
of default startup options keeps resurfacing. And it's
clear there's no consensus on what should be included.
Our --disable-modern-top configure option is of little
help since it remains an all-or-nothing approach. What
we need is an answer offering unlimited customization.
So, this commit will provide distribution packagers or
system administrators with a much more flexible way to
set their own preferred startup default configuration.
A new rcfile is being introduced: '/etc/topdefaultrc',
whose format/content is the same as a personal rcfile.
Thus once a 'proper' enterprise configuration has been
established and saved via 'W', it can be copied to the
/etc/ directory. Thereafter, startup in the absence of
a saved rcfile will use that configuration as default.
Now if a distribution packager or system administrator
wishes to expose their users to some of top's advanced
capabilities they can do so gradually. Perhaps setting
up graph mode for summary area task and memory display
while retaining the %CPU sort could be tried. Or maybe
showing colors, but better customized for a particular
terminal emulator. Such possibilities are now endless.
[ in exploiting this new capability, i hope that the ]
[ other windows (alt display mode) aren't overlooked ]
Reference(s):
. Sep, 2014 - Not fully honoring rcfile bug discussed
https://www.freelists.org/post/procps/top-saved-rcfile-bug
. Oct, 2014 - Attempt to defend new startup defaults
https://bugzilla.redhat.com/show_bug.cgi?id=1153049
. Jul, 2015 - Forest vs. %CPU views discussion
https://gitlab.com/procps-ng/procps/issues/6
. Oct, 2017 - Question the use of --disable-modern-top
https://bugzilla.redhat.com/show_bug.cgi?id=1499410
. Oct, 2017 - Forest vs. %CPU views discussion again
https://www.freelists.org/post/procps/Forest-mode-by-default-in-top-seems-a-bit-strange
. Dec, 2017 - Rehash of 3.3.10 startup defaults change
https://gitlab.com/procps-ng/procps/issues/78
Signed-off-by: Jim Warner <james.warner@comcast.net>
2017-12-17 11:30:00 +05:30
|
|
|
|
case 'f': // 3.3.0 thru 3.3.3 (ng)
|
|
|
|
|
SETw(w, Show_JRNUMS);
|
2020-05-27 10:30:00 +05:30
|
|
|
|
// fall through
|
top: allow more flexible approach for startup defaults
Those references below offer more detail regarding the
default startup changes beginning with version 3.3.10.
It is important to remember that all such changes were
supposed to impact only new users or users who had not
saved the personal config file (via that 'W' command).
However, I introduced a bug wherein the rcfile was not
fully honored. This gave the changes a bad reputation.
That bug was corrected in release 3.3.11 but the issue
of default startup options keeps resurfacing. And it's
clear there's no consensus on what should be included.
Our --disable-modern-top configure option is of little
help since it remains an all-or-nothing approach. What
we need is an answer offering unlimited customization.
So, this commit will provide distribution packagers or
system administrators with a much more flexible way to
set their own preferred startup default configuration.
A new rcfile is being introduced: '/etc/topdefaultrc',
whose format/content is the same as a personal rcfile.
Thus once a 'proper' enterprise configuration has been
established and saved via 'W', it can be copied to the
/etc/ directory. Thereafter, startup in the absence of
a saved rcfile will use that configuration as default.
Now if a distribution packager or system administrator
wishes to expose their users to some of top's advanced
capabilities they can do so gradually. Perhaps setting
up graph mode for summary area task and memory display
while retaining the %CPU sort could be tried. Or maybe
showing colors, but better customized for a particular
terminal emulator. Such possibilities are now endless.
[ in exploiting this new capability, i hope that the ]
[ other windows (alt display mode) aren't overlooked ]
Reference(s):
. Sep, 2014 - Not fully honoring rcfile bug discussed
https://www.freelists.org/post/procps/top-saved-rcfile-bug
. Oct, 2014 - Attempt to defend new startup defaults
https://bugzilla.redhat.com/show_bug.cgi?id=1153049
. Jul, 2015 - Forest vs. %CPU views discussion
https://gitlab.com/procps-ng/procps/issues/6
. Oct, 2017 - Question the use of --disable-modern-top
https://bugzilla.redhat.com/show_bug.cgi?id=1499410
. Oct, 2017 - Forest vs. %CPU views discussion again
https://www.freelists.org/post/procps/Forest-mode-by-default-in-top-seems-a-bit-strange
. Dec, 2017 - Rehash of 3.3.10 startup defaults change
https://gitlab.com/procps-ng/procps/issues/78
Signed-off-by: Jim Warner <james.warner@comcast.net>
2017-12-17 11:30:00 +05:30
|
|
|
|
case 'g': // from 3.3.4 thru 3.3.8
|
2018-05-18 10:30:00 +05:30
|
|
|
|
scat(w->rc.fieldscur, RCF_PLUS_H);
|
2020-05-27 10:30:00 +05:30
|
|
|
|
// fall through
|
top: allow more flexible approach for startup defaults
Those references below offer more detail regarding the
default startup changes beginning with version 3.3.10.
It is important to remember that all such changes were
supposed to impact only new users or users who had not
saved the personal config file (via that 'W' command).
However, I introduced a bug wherein the rcfile was not
fully honored. This gave the changes a bad reputation.
That bug was corrected in release 3.3.11 but the issue
of default startup options keeps resurfacing. And it's
clear there's no consensus on what should be included.
Our --disable-modern-top configure option is of little
help since it remains an all-or-nothing approach. What
we need is an answer offering unlimited customization.
So, this commit will provide distribution packagers or
system administrators with a much more flexible way to
set their own preferred startup default configuration.
A new rcfile is being introduced: '/etc/topdefaultrc',
whose format/content is the same as a personal rcfile.
Thus once a 'proper' enterprise configuration has been
established and saved via 'W', it can be copied to the
/etc/ directory. Thereafter, startup in the absence of
a saved rcfile will use that configuration as default.
Now if a distribution packager or system administrator
wishes to expose their users to some of top's advanced
capabilities they can do so gradually. Perhaps setting
up graph mode for summary area task and memory display
while retaining the %CPU sort could be tried. Or maybe
showing colors, but better customized for a particular
terminal emulator. Such possibilities are now endless.
[ in exploiting this new capability, i hope that the ]
[ other windows (alt display mode) aren't overlooked ]
Reference(s):
. Sep, 2014 - Not fully honoring rcfile bug discussed
https://www.freelists.org/post/procps/top-saved-rcfile-bug
. Oct, 2014 - Attempt to defend new startup defaults
https://bugzilla.redhat.com/show_bug.cgi?id=1153049
. Jul, 2015 - Forest vs. %CPU views discussion
https://gitlab.com/procps-ng/procps/issues/6
. Oct, 2017 - Question the use of --disable-modern-top
https://bugzilla.redhat.com/show_bug.cgi?id=1499410
. Oct, 2017 - Forest vs. %CPU views discussion again
https://www.freelists.org/post/procps/Forest-mode-by-default-in-top-seems-a-bit-strange
. Dec, 2017 - Rehash of 3.3.10 startup defaults change
https://gitlab.com/procps-ng/procps/issues/78
Signed-off-by: Jim Warner <james.warner@comcast.net>
2017-12-17 11:30:00 +05:30
|
|
|
|
case 'h': // this is release 3.3.9
|
|
|
|
|
w->rc.graph_cpus = w->rc.graph_mems = 0;
|
|
|
|
|
// these next 2 are really global, but best documented here
|
|
|
|
|
Rc.summ_mscale = Rc.task_mscale = SK_Kb;
|
2020-05-27 10:30:00 +05:30
|
|
|
|
// fall through
|
2020-05-29 10:30:00 +05:30
|
|
|
|
case 'i': // from 3.3.10 thru 3.3.16
|
2018-05-18 10:30:00 +05:30
|
|
|
|
scat(w->rc.fieldscur, RCF_PLUS_J);
|
2020-05-27 10:30:00 +05:30
|
|
|
|
// fall through
|
2020-05-29 10:30:00 +05:30
|
|
|
|
case 'j': // current RCF_VERSION_ID
|
top: allow more flexible approach for startup defaults
Those references below offer more detail regarding the
default startup changes beginning with version 3.3.10.
It is important to remember that all such changes were
supposed to impact only new users or users who had not
saved the personal config file (via that 'W' command).
However, I introduced a bug wherein the rcfile was not
fully honored. This gave the changes a bad reputation.
That bug was corrected in release 3.3.11 but the issue
of default startup options keeps resurfacing. And it's
clear there's no consensus on what should be included.
Our --disable-modern-top configure option is of little
help since it remains an all-or-nothing approach. What
we need is an answer offering unlimited customization.
So, this commit will provide distribution packagers or
system administrators with a much more flexible way to
set their own preferred startup default configuration.
A new rcfile is being introduced: '/etc/topdefaultrc',
whose format/content is the same as a personal rcfile.
Thus once a 'proper' enterprise configuration has been
established and saved via 'W', it can be copied to the
/etc/ directory. Thereafter, startup in the absence of
a saved rcfile will use that configuration as default.
Now if a distribution packager or system administrator
wishes to expose their users to some of top's advanced
capabilities they can do so gradually. Perhaps setting
up graph mode for summary area task and memory display
while retaining the %CPU sort could be tried. Or maybe
showing colors, but better customized for a particular
terminal emulator. Such possibilities are now endless.
[ in exploiting this new capability, i hope that the ]
[ other windows (alt display mode) aren't overlooked ]
Reference(s):
. Sep, 2014 - Not fully honoring rcfile bug discussed
https://www.freelists.org/post/procps/top-saved-rcfile-bug
. Oct, 2014 - Attempt to defend new startup defaults
https://bugzilla.redhat.com/show_bug.cgi?id=1153049
. Jul, 2015 - Forest vs. %CPU views discussion
https://gitlab.com/procps-ng/procps/issues/6
. Oct, 2017 - Question the use of --disable-modern-top
https://bugzilla.redhat.com/show_bug.cgi?id=1499410
. Oct, 2017 - Forest vs. %CPU views discussion again
https://www.freelists.org/post/procps/Forest-mode-by-default-in-top-seems-a-bit-strange
. Dec, 2017 - Rehash of 3.3.10 startup defaults change
https://gitlab.com/procps-ng/procps/issues/78
Signed-off-by: Jim Warner <james.warner@comcast.net>
2017-12-17 11:30:00 +05:30
|
|
|
|
default:
|
|
|
|
|
if (strlen(w->rc.fieldscur) != sizeof(DEF_FIELDS) - 1)
|
|
|
|
|
return p;
|
|
|
|
|
for (x = 0; x < EU_MAXPFLGS; ++x)
|
|
|
|
|
if (EU_MAXPFLGS <= FLDget(w, x))
|
|
|
|
|
return p;
|
|
|
|
|
break;
|
|
|
|
|
}
|
top: restore configuration file backward compatibility
The Debian bug referenced below has nothing to do with
locales. In fact, top was made locale independent back
in release 3.3.13 (April, 2018). However, that bug did
reveal some misplaced logic which this patch corrects.
Prompted by the Qualys audit, all rcfile field strings
were checked for potential duplicates which could only
have resulted from some user's manual/malicious edits.
Unfortunately, that code was executed before top had a
chance to enforce the proper/maximum string length (in
the event an extremely old rcfile had just been read).
This created some potential string overrun references.
In top's original 3.3.15 implementation, the potential
overrun extended for 15 characters. That is the number
of field characters added with 3.3.9 (December, 2013).
But, since strchr() was used, no error exit was taken.
In the revised 3.3.16 implementation, the strchr() was
replaced with '&w->rc.fieldscur[n]'. This held overrun
to a single position while producing an error message.
So, this commit just moves that logic to a point where
fieldscur is guaranteed to be longer than EU_MAXPFLGS.
Reference(s):
https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=951335
. revised 3.3.16 validation logic
commit 291d98ee5036567f93d21bc11142b0a7e2ee70ae
. original 3.3.15 validation logic
commit fdb58974e24c025a1f866f324c62f1d8f96234f8
Signed-off-by: Jim Warner <james.warner@comcast.net>
2020-02-15 11:30:00 +05:30
|
|
|
|
// ensure there's been no manual alteration of fieldscur
|
|
|
|
|
for (n = 0 ; n < EU_MAXPFLGS; n++) {
|
|
|
|
|
if (&w->rc.fieldscur[n] != strrchr(w->rc.fieldscur, w->rc.fieldscur[n]))
|
|
|
|
|
return p;
|
|
|
|
|
}
|
top: allow more flexible approach for startup defaults
Those references below offer more detail regarding the
default startup changes beginning with version 3.3.10.
It is important to remember that all such changes were
supposed to impact only new users or users who had not
saved the personal config file (via that 'W' command).
However, I introduced a bug wherein the rcfile was not
fully honored. This gave the changes a bad reputation.
That bug was corrected in release 3.3.11 but the issue
of default startup options keeps resurfacing. And it's
clear there's no consensus on what should be included.
Our --disable-modern-top configure option is of little
help since it remains an all-or-nothing approach. What
we need is an answer offering unlimited customization.
So, this commit will provide distribution packagers or
system administrators with a much more flexible way to
set their own preferred startup default configuration.
A new rcfile is being introduced: '/etc/topdefaultrc',
whose format/content is the same as a personal rcfile.
Thus once a 'proper' enterprise configuration has been
established and saved via 'W', it can be copied to the
/etc/ directory. Thereafter, startup in the absence of
a saved rcfile will use that configuration as default.
Now if a distribution packager or system administrator
wishes to expose their users to some of top's advanced
capabilities they can do so gradually. Perhaps setting
up graph mode for summary area task and memory display
while retaining the %CPU sort could be tried. Or maybe
showing colors, but better customized for a particular
terminal emulator. Such possibilities are now endless.
[ in exploiting this new capability, i hope that the ]
[ other windows (alt display mode) aren't overlooked ]
Reference(s):
. Sep, 2014 - Not fully honoring rcfile bug discussed
https://www.freelists.org/post/procps/top-saved-rcfile-bug
. Oct, 2014 - Attempt to defend new startup defaults
https://bugzilla.redhat.com/show_bug.cgi?id=1153049
. Jul, 2015 - Forest vs. %CPU views discussion
https://gitlab.com/procps-ng/procps/issues/6
. Oct, 2017 - Question the use of --disable-modern-top
https://bugzilla.redhat.com/show_bug.cgi?id=1499410
. Oct, 2017 - Forest vs. %CPU views discussion again
https://www.freelists.org/post/procps/Forest-mode-by-default-in-top-seems-a-bit-strange
. Dec, 2017 - Rehash of 3.3.10 startup defaults change
https://gitlab.com/procps-ng/procps/issues/78
Signed-off-by: Jim Warner <james.warner@comcast.net>
2017-12-17 11:30:00 +05:30
|
|
|
|
#ifndef USE_X_COLHDR
|
|
|
|
|
OFFw(w, NOHIFND_xxx | NOHISEL_xxx);
|
|
|
|
|
#endif
|
|
|
|
|
} // end: for (GROUPSMAX)
|
|
|
|
|
|
|
|
|
|
// any new addition(s) last, for older rcfiles compatibility...
|
2018-05-18 10:30:00 +05:30
|
|
|
|
(void)fscanf(fp, "Fixed_widest=%d, Summ_mscale=%d, Task_mscale=%d, Zero_suppress=%d\n"
|
|
|
|
|
, &Rc.fixed_widest, &Rc.summ_mscale, &Rc.task_mscale, &Rc.zero_suppress);
|
1970-01-01 05:30:00 +05:30
|
|
|
|
if (Rc.fixed_widest < -1 || Rc.fixed_widest > SCREENMAX)
|
|
|
|
|
Rc.fixed_widest = 0;
|
2018-05-18 10:30:00 +05:30
|
|
|
|
if (Rc.summ_mscale < 0 || Rc.summ_mscale > SK_Eb)
|
|
|
|
|
Rc.summ_mscale = 0;
|
|
|
|
|
if (Rc.task_mscale < 0 || Rc.task_mscale > SK_Pb)
|
|
|
|
|
Rc.task_mscale = 0;
|
2018-05-23 10:30:00 +05:30
|
|
|
|
if (Rc.zero_suppress < 0 || Rc.zero_suppress > 1)
|
|
|
|
|
Rc.zero_suppress = 0;
|
top: allow more flexible approach for startup defaults
Those references below offer more detail regarding the
default startup changes beginning with version 3.3.10.
It is important to remember that all such changes were
supposed to impact only new users or users who had not
saved the personal config file (via that 'W' command).
However, I introduced a bug wherein the rcfile was not
fully honored. This gave the changes a bad reputation.
That bug was corrected in release 3.3.11 but the issue
of default startup options keeps resurfacing. And it's
clear there's no consensus on what should be included.
Our --disable-modern-top configure option is of little
help since it remains an all-or-nothing approach. What
we need is an answer offering unlimited customization.
So, this commit will provide distribution packagers or
system administrators with a much more flexible way to
set their own preferred startup default configuration.
A new rcfile is being introduced: '/etc/topdefaultrc',
whose format/content is the same as a personal rcfile.
Thus once a 'proper' enterprise configuration has been
established and saved via 'W', it can be copied to the
/etc/ directory. Thereafter, startup in the absence of
a saved rcfile will use that configuration as default.
Now if a distribution packager or system administrator
wishes to expose their users to some of top's advanced
capabilities they can do so gradually. Perhaps setting
up graph mode for summary area task and memory display
while retaining the %CPU sort could be tried. Or maybe
showing colors, but better customized for a particular
terminal emulator. Such possibilities are now endless.
[ in exploiting this new capability, i hope that the ]
[ other windows (alt display mode) aren't overlooked ]
Reference(s):
. Sep, 2014 - Not fully honoring rcfile bug discussed
https://www.freelists.org/post/procps/top-saved-rcfile-bug
. Oct, 2014 - Attempt to defend new startup defaults
https://bugzilla.redhat.com/show_bug.cgi?id=1153049
. Jul, 2015 - Forest vs. %CPU views discussion
https://gitlab.com/procps-ng/procps/issues/6
. Oct, 2017 - Question the use of --disable-modern-top
https://bugzilla.redhat.com/show_bug.cgi?id=1499410
. Oct, 2017 - Forest vs. %CPU views discussion again
https://www.freelists.org/post/procps/Forest-mode-by-default-in-top-seems-a-bit-strange
. Dec, 2017 - Rehash of 3.3.10 startup defaults change
https://gitlab.com/procps-ng/procps/issues/78
Signed-off-by: Jim Warner <james.warner@comcast.net>
2017-12-17 11:30:00 +05:30
|
|
|
|
|
2020-05-29 10:30:00 +05:30
|
|
|
|
// prepare to warn that older top can no longer read rcfile ...
|
|
|
|
|
if (Rc.id != RCF_VERSION_ID)
|
|
|
|
|
Rc_compatibilty = 1;
|
|
|
|
|
|
2018-06-17 10:30:00 +05:30
|
|
|
|
// lastly, let's process any optional glob(s) ...
|
2018-06-17 10:30:00 +05:30
|
|
|
|
// (darn, must do osel 1st even though alphabetically 2nd)
|
2018-06-17 10:30:00 +05:30
|
|
|
|
fbuf[0] = '\0';
|
2018-06-17 10:30:00 +05:30
|
|
|
|
config_osel(fp, fbuf, sizeof(fbuf));
|
2018-06-17 10:30:00 +05:30
|
|
|
|
config_insp(fp, fbuf, sizeof(fbuf));
|
top: allow more flexible approach for startup defaults
Those references below offer more detail regarding the
default startup changes beginning with version 3.3.10.
It is important to remember that all such changes were
supposed to impact only new users or users who had not
saved the personal config file (via that 'W' command).
However, I introduced a bug wherein the rcfile was not
fully honored. This gave the changes a bad reputation.
That bug was corrected in release 3.3.11 but the issue
of default startup options keeps resurfacing. And it's
clear there's no consensus on what should be included.
Our --disable-modern-top configure option is of little
help since it remains an all-or-nothing approach. What
we need is an answer offering unlimited customization.
So, this commit will provide distribution packagers or
system administrators with a much more flexible way to
set their own preferred startup default configuration.
A new rcfile is being introduced: '/etc/topdefaultrc',
whose format/content is the same as a personal rcfile.
Thus once a 'proper' enterprise configuration has been
established and saved via 'W', it can be copied to the
/etc/ directory. Thereafter, startup in the absence of
a saved rcfile will use that configuration as default.
Now if a distribution packager or system administrator
wishes to expose their users to some of top's advanced
capabilities they can do so gradually. Perhaps setting
up graph mode for summary area task and memory display
while retaining the %CPU sort could be tried. Or maybe
showing colors, but better customized for a particular
terminal emulator. Such possibilities are now endless.
[ in exploiting this new capability, i hope that the ]
[ other windows (alt display mode) aren't overlooked ]
Reference(s):
. Sep, 2014 - Not fully honoring rcfile bug discussed
https://www.freelists.org/post/procps/top-saved-rcfile-bug
. Oct, 2014 - Attempt to defend new startup defaults
https://bugzilla.redhat.com/show_bug.cgi?id=1153049
. Jul, 2015 - Forest vs. %CPU views discussion
https://gitlab.com/procps-ng/procps/issues/6
. Oct, 2017 - Question the use of --disable-modern-top
https://bugzilla.redhat.com/show_bug.cgi?id=1499410
. Oct, 2017 - Forest vs. %CPU views discussion again
https://www.freelists.org/post/procps/Forest-mode-by-default-in-top-seems-a-bit-strange
. Dec, 2017 - Rehash of 3.3.10 startup defaults change
https://gitlab.com/procps-ng/procps/issues/78
Signed-off-by: Jim Warner <james.warner@comcast.net>
2017-12-17 11:30:00 +05:30
|
|
|
|
|
|
|
|
|
return NULL;
|
2018-06-17 10:30:00 +05:30
|
|
|
|
} // end: configs_file
|
top: allow more flexible approach for startup defaults
Those references below offer more detail regarding the
default startup changes beginning with version 3.3.10.
It is important to remember that all such changes were
supposed to impact only new users or users who had not
saved the personal config file (via that 'W' command).
However, I introduced a bug wherein the rcfile was not
fully honored. This gave the changes a bad reputation.
That bug was corrected in release 3.3.11 but the issue
of default startup options keeps resurfacing. And it's
clear there's no consensus on what should be included.
Our --disable-modern-top configure option is of little
help since it remains an all-or-nothing approach. What
we need is an answer offering unlimited customization.
So, this commit will provide distribution packagers or
system administrators with a much more flexible way to
set their own preferred startup default configuration.
A new rcfile is being introduced: '/etc/topdefaultrc',
whose format/content is the same as a personal rcfile.
Thus once a 'proper' enterprise configuration has been
established and saved via 'W', it can be copied to the
/etc/ directory. Thereafter, startup in the absence of
a saved rcfile will use that configuration as default.
Now if a distribution packager or system administrator
wishes to expose their users to some of top's advanced
capabilities they can do so gradually. Perhaps setting
up graph mode for summary area task and memory display
while retaining the %CPU sort could be tried. Or maybe
showing colors, but better customized for a particular
terminal emulator. Such possibilities are now endless.
[ in exploiting this new capability, i hope that the ]
[ other windows (alt display mode) aren't overlooked ]
Reference(s):
. Sep, 2014 - Not fully honoring rcfile bug discussed
https://www.freelists.org/post/procps/top-saved-rcfile-bug
. Oct, 2014 - Attempt to defend new startup defaults
https://bugzilla.redhat.com/show_bug.cgi?id=1153049
. Jul, 2015 - Forest vs. %CPU views discussion
https://gitlab.com/procps-ng/procps/issues/6
. Oct, 2017 - Question the use of --disable-modern-top
https://bugzilla.redhat.com/show_bug.cgi?id=1499410
. Oct, 2017 - Forest vs. %CPU views discussion again
https://www.freelists.org/post/procps/Forest-mode-by-default-in-top-seems-a-bit-strange
. Dec, 2017 - Rehash of 3.3.10 startup defaults change
https://gitlab.com/procps-ng/procps/issues/78
Signed-off-by: Jim Warner <james.warner@comcast.net>
2017-12-17 11:30:00 +05:30
|
|
|
|
|
|
|
|
|
|
2018-05-18 10:30:00 +05:30
|
|
|
|
/*
|
|
|
|
|
* A configs_reads *Helper* function responsible for ensuring the
|
|
|
|
|
* complete path was established, otherwise force the 'W' to fail */
|
|
|
|
|
static int configs_path (const char *const fmts, ...) __attribute__((format(printf,1,2)));
|
|
|
|
|
static int configs_path (const char *const fmts, ...) {
|
top: Do not default to the cwd in configs_read().
If the HOME environment variable is not set, or not absolute, use the
home directory returned by getpwuid(getuid()), if set and absolute
(instead of the cwd "."); otherwise, set p_home to NULL.
To keep the changes to a minimum, we rely on POSIX, which requires that
fopen() fails with ENOENT if the pathname (Rc_name) is an empty string.
This integrates well into the existing code, and makes write_rcfile()
work without a change.
Also, it makes the code in configs_read() easier to follow: only set and
use p_home if safe, and only set Rc_name if safe (in all the other cases
it is the empty string, and the fopen() calls fail). Plus, check for
snprintf() truncation (and if it happens, reset Rc_name to the empty
string).
Important note: top.1 should probably be updated, since it mentions the
fallback to the current working directory.
1970-01-01 05:30:00 +05:30
|
|
|
|
int len;
|
|
|
|
|
va_list ap;
|
2018-05-18 10:30:00 +05:30
|
|
|
|
|
|
|
|
|
va_start(ap, fmts);
|
|
|
|
|
len = vsnprintf(Rc_name, sizeof(Rc_name), fmts, ap);
|
top: Do not default to the cwd in configs_read().
If the HOME environment variable is not set, or not absolute, use the
home directory returned by getpwuid(getuid()), if set and absolute
(instead of the cwd "."); otherwise, set p_home to NULL.
To keep the changes to a minimum, we rely on POSIX, which requires that
fopen() fails with ENOENT if the pathname (Rc_name) is an empty string.
This integrates well into the existing code, and makes write_rcfile()
work without a change.
Also, it makes the code in configs_read() easier to follow: only set and
use p_home if safe, and only set Rc_name if safe (in all the other cases
it is the empty string, and the fopen() calls fail). Plus, check for
snprintf() truncation (and if it happens, reset Rc_name to the empty
string).
Important note: top.1 should probably be updated, since it mentions the
fallback to the current working directory.
1970-01-01 05:30:00 +05:30
|
|
|
|
va_end(ap);
|
|
|
|
|
if (len <= 0 || (size_t)len >= sizeof(Rc_name)) {
|
|
|
|
|
Rc_name[0] = '\0';
|
2018-05-18 10:30:00 +05:30
|
|
|
|
len = 0;
|
top: Do not default to the cwd in configs_read().
If the HOME environment variable is not set, or not absolute, use the
home directory returned by getpwuid(getuid()), if set and absolute
(instead of the cwd "."); otherwise, set p_home to NULL.
To keep the changes to a minimum, we rely on POSIX, which requires that
fopen() fails with ENOENT if the pathname (Rc_name) is an empty string.
This integrates well into the existing code, and makes write_rcfile()
work without a change.
Also, it makes the code in configs_read() easier to follow: only set and
use p_home if safe, and only set Rc_name if safe (in all the other cases
it is the empty string, and the fopen() calls fail). Plus, check for
snprintf() truncation (and if it happens, reset Rc_name to the empty
string).
Important note: top.1 should probably be updated, since it mentions the
fallback to the current working directory.
1970-01-01 05:30:00 +05:30
|
|
|
|
}
|
|
|
|
|
return len;
|
2018-05-18 10:30:00 +05:30
|
|
|
|
} // end: configs_path
|
|
|
|
|
|
top: Do not default to the cwd in configs_read().
If the HOME environment variable is not set, or not absolute, use the
home directory returned by getpwuid(getuid()), if set and absolute
(instead of the cwd "."); otherwise, set p_home to NULL.
To keep the changes to a minimum, we rely on POSIX, which requires that
fopen() fails with ENOENT if the pathname (Rc_name) is an empty string.
This integrates well into the existing code, and makes write_rcfile()
work without a change.
Also, it makes the code in configs_read() easier to follow: only set and
use p_home if safe, and only set Rc_name if safe (in all the other cases
it is the empty string, and the fopen() calls fail). Plus, check for
snprintf() truncation (and if it happens, reset Rc_name to the empty
string).
Important note: top.1 should probably be updated, since it mentions the
fallback to the current working directory.
1970-01-01 05:30:00 +05:30
|
|
|
|
|
top: allow more flexible approach for startup defaults
Those references below offer more detail regarding the
default startup changes beginning with version 3.3.10.
It is important to remember that all such changes were
supposed to impact only new users or users who had not
saved the personal config file (via that 'W' command).
However, I introduced a bug wherein the rcfile was not
fully honored. This gave the changes a bad reputation.
That bug was corrected in release 3.3.11 but the issue
of default startup options keeps resurfacing. And it's
clear there's no consensus on what should be included.
Our --disable-modern-top configure option is of little
help since it remains an all-or-nothing approach. What
we need is an answer offering unlimited customization.
So, this commit will provide distribution packagers or
system administrators with a much more flexible way to
set their own preferred startup default configuration.
A new rcfile is being introduced: '/etc/topdefaultrc',
whose format/content is the same as a personal rcfile.
Thus once a 'proper' enterprise configuration has been
established and saved via 'W', it can be copied to the
/etc/ directory. Thereafter, startup in the absence of
a saved rcfile will use that configuration as default.
Now if a distribution packager or system administrator
wishes to expose their users to some of top's advanced
capabilities they can do so gradually. Perhaps setting
up graph mode for summary area task and memory display
while retaining the %CPU sort could be tried. Or maybe
showing colors, but better customized for a particular
terminal emulator. Such possibilities are now endless.
[ in exploiting this new capability, i hope that the ]
[ other windows (alt display mode) aren't overlooked ]
Reference(s):
. Sep, 2014 - Not fully honoring rcfile bug discussed
https://www.freelists.org/post/procps/top-saved-rcfile-bug
. Oct, 2014 - Attempt to defend new startup defaults
https://bugzilla.redhat.com/show_bug.cgi?id=1153049
. Jul, 2015 - Forest vs. %CPU views discussion
https://gitlab.com/procps-ng/procps/issues/6
. Oct, 2017 - Question the use of --disable-modern-top
https://bugzilla.redhat.com/show_bug.cgi?id=1499410
. Oct, 2017 - Forest vs. %CPU views discussion again
https://www.freelists.org/post/procps/Forest-mode-by-default-in-top-seems-a-bit-strange
. Dec, 2017 - Rehash of 3.3.10 startup defaults change
https://gitlab.com/procps-ng/procps/issues/78
Signed-off-by: Jim Warner <james.warner@comcast.net>
2017-12-17 11:30:00 +05:30
|
|
|
|
/*
|
|
|
|
|
* Try reading up to 3 rcfiles
|
|
|
|
|
* 1. 'SYS_RCRESTRICT' contains two lines consisting of the secure
|
|
|
|
|
* mode switch and an update interval. Its presence limits what
|
|
|
|
|
* ordinary users are allowed to do.
|
|
|
|
|
* 2. 'Rc_name' contains multiple lines - 3 global + 3 per window.
|
|
|
|
|
* line 1 : an eyecatcher and creating program/alias name
|
|
|
|
|
* line 2 : an id, Mode_altcsr, Mode_irixps, Delay_time, Curwin.
|
|
|
|
|
* For each of the 4 windows:
|
|
|
|
|
* line a: contains w->winname, fieldscur
|
2020-05-29 10:30:00 +05:30
|
|
|
|
* line b: contains w->winflags, sortindx, maxtasks, etc
|
top: allow more flexible approach for startup defaults
Those references below offer more detail regarding the
default startup changes beginning with version 3.3.10.
It is important to remember that all such changes were
supposed to impact only new users or users who had not
saved the personal config file (via that 'W' command).
However, I introduced a bug wherein the rcfile was not
fully honored. This gave the changes a bad reputation.
That bug was corrected in release 3.3.11 but the issue
of default startup options keeps resurfacing. And it's
clear there's no consensus on what should be included.
Our --disable-modern-top configure option is of little
help since it remains an all-or-nothing approach. What
we need is an answer offering unlimited customization.
So, this commit will provide distribution packagers or
system administrators with a much more flexible way to
set their own preferred startup default configuration.
A new rcfile is being introduced: '/etc/topdefaultrc',
whose format/content is the same as a personal rcfile.
Thus once a 'proper' enterprise configuration has been
established and saved via 'W', it can be copied to the
/etc/ directory. Thereafter, startup in the absence of
a saved rcfile will use that configuration as default.
Now if a distribution packager or system administrator
wishes to expose their users to some of top's advanced
capabilities they can do so gradually. Perhaps setting
up graph mode for summary area task and memory display
while retaining the %CPU sort could be tried. Or maybe
showing colors, but better customized for a particular
terminal emulator. Such possibilities are now endless.
[ in exploiting this new capability, i hope that the ]
[ other windows (alt display mode) aren't overlooked ]
Reference(s):
. Sep, 2014 - Not fully honoring rcfile bug discussed
https://www.freelists.org/post/procps/top-saved-rcfile-bug
. Oct, 2014 - Attempt to defend new startup defaults
https://bugzilla.redhat.com/show_bug.cgi?id=1153049
. Jul, 2015 - Forest vs. %CPU views discussion
https://gitlab.com/procps-ng/procps/issues/6
. Oct, 2017 - Question the use of --disable-modern-top
https://bugzilla.redhat.com/show_bug.cgi?id=1499410
. Oct, 2017 - Forest vs. %CPU views discussion again
https://www.freelists.org/post/procps/Forest-mode-by-default-in-top-seems-a-bit-strange
. Dec, 2017 - Rehash of 3.3.10 startup defaults change
https://gitlab.com/procps-ng/procps/issues/78
Signed-off-by: Jim Warner <james.warner@comcast.net>
2017-12-17 11:30:00 +05:30
|
|
|
|
* line c: contains w->summclr, msgsclr, headclr, taskclr
|
|
|
|
|
* line 15 : miscellaneous additional global settings
|
2018-06-17 10:30:00 +05:30
|
|
|
|
* Any remaining lines are devoted to the optional entries
|
|
|
|
|
* supporting the 'Other Filter' and 'Inspect' provisions.
|
top: allow more flexible approach for startup defaults
Those references below offer more detail regarding the
default startup changes beginning with version 3.3.10.
It is important to remember that all such changes were
supposed to impact only new users or users who had not
saved the personal config file (via that 'W' command).
However, I introduced a bug wherein the rcfile was not
fully honored. This gave the changes a bad reputation.
That bug was corrected in release 3.3.11 but the issue
of default startup options keeps resurfacing. And it's
clear there's no consensus on what should be included.
Our --disable-modern-top configure option is of little
help since it remains an all-or-nothing approach. What
we need is an answer offering unlimited customization.
So, this commit will provide distribution packagers or
system administrators with a much more flexible way to
set their own preferred startup default configuration.
A new rcfile is being introduced: '/etc/topdefaultrc',
whose format/content is the same as a personal rcfile.
Thus once a 'proper' enterprise configuration has been
established and saved via 'W', it can be copied to the
/etc/ directory. Thereafter, startup in the absence of
a saved rcfile will use that configuration as default.
Now if a distribution packager or system administrator
wishes to expose their users to some of top's advanced
capabilities they can do so gradually. Perhaps setting
up graph mode for summary area task and memory display
while retaining the %CPU sort could be tried. Or maybe
showing colors, but better customized for a particular
terminal emulator. Such possibilities are now endless.
[ in exploiting this new capability, i hope that the ]
[ other windows (alt display mode) aren't overlooked ]
Reference(s):
. Sep, 2014 - Not fully honoring rcfile bug discussed
https://www.freelists.org/post/procps/top-saved-rcfile-bug
. Oct, 2014 - Attempt to defend new startup defaults
https://bugzilla.redhat.com/show_bug.cgi?id=1153049
. Jul, 2015 - Forest vs. %CPU views discussion
https://gitlab.com/procps-ng/procps/issues/6
. Oct, 2017 - Question the use of --disable-modern-top
https://bugzilla.redhat.com/show_bug.cgi?id=1499410
. Oct, 2017 - Forest vs. %CPU views discussion again
https://www.freelists.org/post/procps/Forest-mode-by-default-in-top-seems-a-bit-strange
. Dec, 2017 - Rehash of 3.3.10 startup defaults change
https://gitlab.com/procps-ng/procps/issues/78
Signed-off-by: Jim Warner <james.warner@comcast.net>
2017-12-17 11:30:00 +05:30
|
|
|
|
* 3. 'SYS_RCDEFAULTS' system-wide defaults if 'Rc_name' absent
|
2018-01-05 11:30:00 +05:30
|
|
|
|
* format is identical to #2 above */
|
2018-05-18 10:30:00 +05:30
|
|
|
|
static void configs_reads (void) {
|
2011-03-31 16:45:12 +05:30
|
|
|
|
float tmp_delay = DEF_DELAY;
|
2017-01-12 00:48:39 +05:30
|
|
|
|
const char *p, *p_home;
|
2011-03-31 16:45:12 +05:30
|
|
|
|
FILE *fp;
|
|
|
|
|
|
top: allow more flexible approach for startup defaults
Those references below offer more detail regarding the
default startup changes beginning with version 3.3.10.
It is important to remember that all such changes were
supposed to impact only new users or users who had not
saved the personal config file (via that 'W' command).
However, I introduced a bug wherein the rcfile was not
fully honored. This gave the changes a bad reputation.
That bug was corrected in release 3.3.11 but the issue
of default startup options keeps resurfacing. And it's
clear there's no consensus on what should be included.
Our --disable-modern-top configure option is of little
help since it remains an all-or-nothing approach. What
we need is an answer offering unlimited customization.
So, this commit will provide distribution packagers or
system administrators with a much more flexible way to
set their own preferred startup default configuration.
A new rcfile is being introduced: '/etc/topdefaultrc',
whose format/content is the same as a personal rcfile.
Thus once a 'proper' enterprise configuration has been
established and saved via 'W', it can be copied to the
/etc/ directory. Thereafter, startup in the absence of
a saved rcfile will use that configuration as default.
Now if a distribution packager or system administrator
wishes to expose their users to some of top's advanced
capabilities they can do so gradually. Perhaps setting
up graph mode for summary area task and memory display
while retaining the %CPU sort could be tried. Or maybe
showing colors, but better customized for a particular
terminal emulator. Such possibilities are now endless.
[ in exploiting this new capability, i hope that the ]
[ other windows (alt display mode) aren't overlooked ]
Reference(s):
. Sep, 2014 - Not fully honoring rcfile bug discussed
https://www.freelists.org/post/procps/top-saved-rcfile-bug
. Oct, 2014 - Attempt to defend new startup defaults
https://bugzilla.redhat.com/show_bug.cgi?id=1153049
. Jul, 2015 - Forest vs. %CPU views discussion
https://gitlab.com/procps-ng/procps/issues/6
. Oct, 2017 - Question the use of --disable-modern-top
https://bugzilla.redhat.com/show_bug.cgi?id=1499410
. Oct, 2017 - Forest vs. %CPU views discussion again
https://www.freelists.org/post/procps/Forest-mode-by-default-in-top-seems-a-bit-strange
. Dec, 2017 - Rehash of 3.3.10 startup defaults change
https://gitlab.com/procps-ng/procps/issues/78
Signed-off-by: Jim Warner <james.warner@comcast.net>
2017-12-17 11:30:00 +05:30
|
|
|
|
fp = fopen(SYS_RCRESTRICT, "r");
|
2011-03-31 16:45:12 +05:30
|
|
|
|
if (fp) {
|
top: allow more flexible approach for startup defaults
Those references below offer more detail regarding the
default startup changes beginning with version 3.3.10.
It is important to remember that all such changes were
supposed to impact only new users or users who had not
saved the personal config file (via that 'W' command).
However, I introduced a bug wherein the rcfile was not
fully honored. This gave the changes a bad reputation.
That bug was corrected in release 3.3.11 but the issue
of default startup options keeps resurfacing. And it's
clear there's no consensus on what should be included.
Our --disable-modern-top configure option is of little
help since it remains an all-or-nothing approach. What
we need is an answer offering unlimited customization.
So, this commit will provide distribution packagers or
system administrators with a much more flexible way to
set their own preferred startup default configuration.
A new rcfile is being introduced: '/etc/topdefaultrc',
whose format/content is the same as a personal rcfile.
Thus once a 'proper' enterprise configuration has been
established and saved via 'W', it can be copied to the
/etc/ directory. Thereafter, startup in the absence of
a saved rcfile will use that configuration as default.
Now if a distribution packager or system administrator
wishes to expose their users to some of top's advanced
capabilities they can do so gradually. Perhaps setting
up graph mode for summary area task and memory display
while retaining the %CPU sort could be tried. Or maybe
showing colors, but better customized for a particular
terminal emulator. Such possibilities are now endless.
[ in exploiting this new capability, i hope that the ]
[ other windows (alt display mode) aren't overlooked ]
Reference(s):
. Sep, 2014 - Not fully honoring rcfile bug discussed
https://www.freelists.org/post/procps/top-saved-rcfile-bug
. Oct, 2014 - Attempt to defend new startup defaults
https://bugzilla.redhat.com/show_bug.cgi?id=1153049
. Jul, 2015 - Forest vs. %CPU views discussion
https://gitlab.com/procps-ng/procps/issues/6
. Oct, 2017 - Question the use of --disable-modern-top
https://bugzilla.redhat.com/show_bug.cgi?id=1499410
. Oct, 2017 - Forest vs. %CPU views discussion again
https://www.freelists.org/post/procps/Forest-mode-by-default-in-top-seems-a-bit-strange
. Dec, 2017 - Rehash of 3.3.10 startup defaults change
https://gitlab.com/procps-ng/procps/issues/78
Signed-off-by: Jim Warner <james.warner@comcast.net>
2017-12-17 11:30:00 +05:30
|
|
|
|
char fbuf[SMLBUFSIZ];
|
2013-08-20 10:30:00 +05:30
|
|
|
|
if (fgets(fbuf, sizeof(fbuf), fp)) { // sys rc file, line 1
|
|
|
|
|
Secure_mode = 1;
|
|
|
|
|
if (fgets(fbuf, sizeof(fbuf), fp)) // sys rc file, line 2
|
|
|
|
|
sscanf(fbuf, "%f", &Rc.delay_time);
|
|
|
|
|
}
|
2011-07-14 16:46:02 +05:30
|
|
|
|
fclose(fp);
|
2011-03-31 16:45:12 +05:30
|
|
|
|
}
|
|
|
|
|
|
top: Do not default to the cwd in configs_read().
If the HOME environment variable is not set, or not absolute, use the
home directory returned by getpwuid(getuid()), if set and absolute
(instead of the cwd "."); otherwise, set p_home to NULL.
To keep the changes to a minimum, we rely on POSIX, which requires that
fopen() fails with ENOENT if the pathname (Rc_name) is an empty string.
This integrates well into the existing code, and makes write_rcfile()
work without a change.
Also, it makes the code in configs_read() easier to follow: only set and
use p_home if safe, and only set Rc_name if safe (in all the other cases
it is the empty string, and the fopen() calls fail). Plus, check for
snprintf() truncation (and if it happens, reset Rc_name to the empty
string).
Important note: top.1 should probably be updated, since it mentions the
fallback to the current working directory.
1970-01-01 05:30:00 +05:30
|
|
|
|
Rc_name[0] = '\0'; // "fopen() shall fail if pathname is an empty string."
|
2017-01-12 00:48:39 +05:30
|
|
|
|
// attempt to use the legacy file first, if we cannot access that file, use
|
|
|
|
|
// the new XDG basedir locations (XDG_CONFIG_HOME or HOME/.config) instead.
|
|
|
|
|
p_home = getenv("HOME");
|
top: Do not default to the cwd in configs_read().
If the HOME environment variable is not set, or not absolute, use the
home directory returned by getpwuid(getuid()), if set and absolute
(instead of the cwd "."); otherwise, set p_home to NULL.
To keep the changes to a minimum, we rely on POSIX, which requires that
fopen() fails with ENOENT if the pathname (Rc_name) is an empty string.
This integrates well into the existing code, and makes write_rcfile()
work without a change.
Also, it makes the code in configs_read() easier to follow: only set and
use p_home if safe, and only set Rc_name if safe (in all the other cases
it is the empty string, and the fopen() calls fail). Plus, check for
snprintf() truncation (and if it happens, reset Rc_name to the empty
string).
Important note: top.1 should probably be updated, since it mentions the
fallback to the current working directory.
1970-01-01 05:30:00 +05:30
|
|
|
|
if (!p_home || p_home[0] != '/') {
|
|
|
|
|
const struct passwd *const pwd = getpwuid(getuid());
|
|
|
|
|
if (!pwd || !(p_home = pwd->pw_dir) || p_home[0] != '/') {
|
|
|
|
|
p_home = NULL;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
if (p_home) {
|
2018-05-18 10:30:00 +05:30
|
|
|
|
configs_path("%s/.%src", p_home, Myname);
|
top: Do not default to the cwd in configs_read().
If the HOME environment variable is not set, or not absolute, use the
home directory returned by getpwuid(getuid()), if set and absolute
(instead of the cwd "."); otherwise, set p_home to NULL.
To keep the changes to a minimum, we rely on POSIX, which requires that
fopen() fails with ENOENT if the pathname (Rc_name) is an empty string.
This integrates well into the existing code, and makes write_rcfile()
work without a change.
Also, it makes the code in configs_read() easier to follow: only set and
use p_home if safe, and only set Rc_name if safe (in all the other cases
it is the empty string, and the fopen() calls fail). Plus, check for
snprintf() truncation (and if it happens, reset Rc_name to the empty
string).
Important note: top.1 should probably be updated, since it mentions the
fallback to the current working directory.
1970-01-01 05:30:00 +05:30
|
|
|
|
}
|
2017-01-12 00:48:39 +05:30
|
|
|
|
|
2017-10-07 10:30:00 +05:30
|
|
|
|
if (!(fp = fopen(Rc_name, "r"))) {
|
2017-01-12 00:48:39 +05:30
|
|
|
|
p = getenv("XDG_CONFIG_HOME");
|
|
|
|
|
// ensure the path we get is absolute, fallback otherwise.
|
|
|
|
|
if (!p || p[0] != '/') {
|
top: Do not default to the cwd in configs_read().
If the HOME environment variable is not set, or not absolute, use the
home directory returned by getpwuid(getuid()), if set and absolute
(instead of the cwd "."); otherwise, set p_home to NULL.
To keep the changes to a minimum, we rely on POSIX, which requires that
fopen() fails with ENOENT if the pathname (Rc_name) is an empty string.
This integrates well into the existing code, and makes write_rcfile()
work without a change.
Also, it makes the code in configs_read() easier to follow: only set and
use p_home if safe, and only set Rc_name if safe (in all the other cases
it is the empty string, and the fopen() calls fail). Plus, check for
snprintf() truncation (and if it happens, reset Rc_name to the empty
string).
Important note: top.1 should probably be updated, since it mentions the
fallback to the current working directory.
1970-01-01 05:30:00 +05:30
|
|
|
|
if (!p_home) goto system_default;
|
2017-01-12 00:48:39 +05:30
|
|
|
|
p = fmtmk("%s/.config", p_home);
|
|
|
|
|
(void)mkdir(p, 0700);
|
|
|
|
|
}
|
2018-05-18 10:30:00 +05:30
|
|
|
|
if (!configs_path("%s/procps", p)) goto system_default;
|
2017-01-12 00:48:39 +05:30
|
|
|
|
(void)mkdir(Rc_name, 0700);
|
2018-05-18 10:30:00 +05:30
|
|
|
|
if (!configs_path("%s/procps/%src", p, Myname)) goto system_default;
|
2017-10-07 10:30:00 +05:30
|
|
|
|
fp = fopen(Rc_name, "r");
|
2017-01-12 00:48:39 +05:30
|
|
|
|
}
|
|
|
|
|
|
2011-03-31 16:45:12 +05:30
|
|
|
|
if (fp) {
|
2018-06-17 10:30:00 +05:30
|
|
|
|
p = configs_file(fp, Rc_name, &tmp_delay);
|
2011-03-31 16:45:12 +05:30
|
|
|
|
fclose(fp);
|
2018-01-05 11:30:00 +05:30
|
|
|
|
if (p) goto default_or_error;
|
top: allow more flexible approach for startup defaults
Those references below offer more detail regarding the
default startup changes beginning with version 3.3.10.
It is important to remember that all such changes were
supposed to impact only new users or users who had not
saved the personal config file (via that 'W' command).
However, I introduced a bug wherein the rcfile was not
fully honored. This gave the changes a bad reputation.
That bug was corrected in release 3.3.11 but the issue
of default startup options keeps resurfacing. And it's
clear there's no consensus on what should be included.
Our --disable-modern-top configure option is of little
help since it remains an all-or-nothing approach. What
we need is an answer offering unlimited customization.
So, this commit will provide distribution packagers or
system administrators with a much more flexible way to
set their own preferred startup default configuration.
A new rcfile is being introduced: '/etc/topdefaultrc',
whose format/content is the same as a personal rcfile.
Thus once a 'proper' enterprise configuration has been
established and saved via 'W', it can be copied to the
/etc/ directory. Thereafter, startup in the absence of
a saved rcfile will use that configuration as default.
Now if a distribution packager or system administrator
wishes to expose their users to some of top's advanced
capabilities they can do so gradually. Perhaps setting
up graph mode for summary area task and memory display
while retaining the %CPU sort could be tried. Or maybe
showing colors, but better customized for a particular
terminal emulator. Such possibilities are now endless.
[ in exploiting this new capability, i hope that the ]
[ other windows (alt display mode) aren't overlooked ]
Reference(s):
. Sep, 2014 - Not fully honoring rcfile bug discussed
https://www.freelists.org/post/procps/top-saved-rcfile-bug
. Oct, 2014 - Attempt to defend new startup defaults
https://bugzilla.redhat.com/show_bug.cgi?id=1153049
. Jul, 2015 - Forest vs. %CPU views discussion
https://gitlab.com/procps-ng/procps/issues/6
. Oct, 2017 - Question the use of --disable-modern-top
https://bugzilla.redhat.com/show_bug.cgi?id=1499410
. Oct, 2017 - Forest vs. %CPU views discussion again
https://www.freelists.org/post/procps/Forest-mode-by-default-in-top-seems-a-bit-strange
. Dec, 2017 - Rehash of 3.3.10 startup defaults change
https://gitlab.com/procps-ng/procps/issues/78
Signed-off-by: Jim Warner <james.warner@comcast.net>
2017-12-17 11:30:00 +05:30
|
|
|
|
} else {
|
top: Do not default to the cwd in configs_read().
If the HOME environment variable is not set, or not absolute, use the
home directory returned by getpwuid(getuid()), if set and absolute
(instead of the cwd "."); otherwise, set p_home to NULL.
To keep the changes to a minimum, we rely on POSIX, which requires that
fopen() fails with ENOENT if the pathname (Rc_name) is an empty string.
This integrates well into the existing code, and makes write_rcfile()
work without a change.
Also, it makes the code in configs_read() easier to follow: only set and
use p_home if safe, and only set Rc_name if safe (in all the other cases
it is the empty string, and the fopen() calls fail). Plus, check for
snprintf() truncation (and if it happens, reset Rc_name to the empty
string).
Important note: top.1 should probably be updated, since it mentions the
fallback to the current working directory.
1970-01-01 05:30:00 +05:30
|
|
|
|
system_default:
|
top: allow more flexible approach for startup defaults
Those references below offer more detail regarding the
default startup changes beginning with version 3.3.10.
It is important to remember that all such changes were
supposed to impact only new users or users who had not
saved the personal config file (via that 'W' command).
However, I introduced a bug wherein the rcfile was not
fully honored. This gave the changes a bad reputation.
That bug was corrected in release 3.3.11 but the issue
of default startup options keeps resurfacing. And it's
clear there's no consensus on what should be included.
Our --disable-modern-top configure option is of little
help since it remains an all-or-nothing approach. What
we need is an answer offering unlimited customization.
So, this commit will provide distribution packagers or
system administrators with a much more flexible way to
set their own preferred startup default configuration.
A new rcfile is being introduced: '/etc/topdefaultrc',
whose format/content is the same as a personal rcfile.
Thus once a 'proper' enterprise configuration has been
established and saved via 'W', it can be copied to the
/etc/ directory. Thereafter, startup in the absence of
a saved rcfile will use that configuration as default.
Now if a distribution packager or system administrator
wishes to expose their users to some of top's advanced
capabilities they can do so gradually. Perhaps setting
up graph mode for summary area task and memory display
while retaining the %CPU sort could be tried. Or maybe
showing colors, but better customized for a particular
terminal emulator. Such possibilities are now endless.
[ in exploiting this new capability, i hope that the ]
[ other windows (alt display mode) aren't overlooked ]
Reference(s):
. Sep, 2014 - Not fully honoring rcfile bug discussed
https://www.freelists.org/post/procps/top-saved-rcfile-bug
. Oct, 2014 - Attempt to defend new startup defaults
https://bugzilla.redhat.com/show_bug.cgi?id=1153049
. Jul, 2015 - Forest vs. %CPU views discussion
https://gitlab.com/procps-ng/procps/issues/6
. Oct, 2017 - Question the use of --disable-modern-top
https://bugzilla.redhat.com/show_bug.cgi?id=1499410
. Oct, 2017 - Forest vs. %CPU views discussion again
https://www.freelists.org/post/procps/Forest-mode-by-default-in-top-seems-a-bit-strange
. Dec, 2017 - Rehash of 3.3.10 startup defaults change
https://gitlab.com/procps-ng/procps/issues/78
Signed-off-by: Jim Warner <james.warner@comcast.net>
2017-12-17 11:30:00 +05:30
|
|
|
|
fp = fopen(SYS_RCDEFAULTS, "r");
|
|
|
|
|
if (fp) {
|
2018-06-17 10:30:00 +05:30
|
|
|
|
p = configs_file(fp, SYS_RCDEFAULTS, &tmp_delay);
|
top: allow more flexible approach for startup defaults
Those references below offer more detail regarding the
default startup changes beginning with version 3.3.10.
It is important to remember that all such changes were
supposed to impact only new users or users who had not
saved the personal config file (via that 'W' command).
However, I introduced a bug wherein the rcfile was not
fully honored. This gave the changes a bad reputation.
That bug was corrected in release 3.3.11 but the issue
of default startup options keeps resurfacing. And it's
clear there's no consensus on what should be included.
Our --disable-modern-top configure option is of little
help since it remains an all-or-nothing approach. What
we need is an answer offering unlimited customization.
So, this commit will provide distribution packagers or
system administrators with a much more flexible way to
set their own preferred startup default configuration.
A new rcfile is being introduced: '/etc/topdefaultrc',
whose format/content is the same as a personal rcfile.
Thus once a 'proper' enterprise configuration has been
established and saved via 'W', it can be copied to the
/etc/ directory. Thereafter, startup in the absence of
a saved rcfile will use that configuration as default.
Now if a distribution packager or system administrator
wishes to expose their users to some of top's advanced
capabilities they can do so gradually. Perhaps setting
up graph mode for summary area task and memory display
while retaining the %CPU sort could be tried. Or maybe
showing colors, but better customized for a particular
terminal emulator. Such possibilities are now endless.
[ in exploiting this new capability, i hope that the ]
[ other windows (alt display mode) aren't overlooked ]
Reference(s):
. Sep, 2014 - Not fully honoring rcfile bug discussed
https://www.freelists.org/post/procps/top-saved-rcfile-bug
. Oct, 2014 - Attempt to defend new startup defaults
https://bugzilla.redhat.com/show_bug.cgi?id=1153049
. Jul, 2015 - Forest vs. %CPU views discussion
https://gitlab.com/procps-ng/procps/issues/6
. Oct, 2017 - Question the use of --disable-modern-top
https://bugzilla.redhat.com/show_bug.cgi?id=1499410
. Oct, 2017 - Forest vs. %CPU views discussion again
https://www.freelists.org/post/procps/Forest-mode-by-default-in-top-seems-a-bit-strange
. Dec, 2017 - Rehash of 3.3.10 startup defaults change
https://gitlab.com/procps-ng/procps/issues/78
Signed-off-by: Jim Warner <james.warner@comcast.net>
2017-12-17 11:30:00 +05:30
|
|
|
|
fclose(fp);
|
2018-01-05 11:30:00 +05:30
|
|
|
|
if (p) goto default_or_error;
|
top: allow more flexible approach for startup defaults
Those references below offer more detail regarding the
default startup changes beginning with version 3.3.10.
It is important to remember that all such changes were
supposed to impact only new users or users who had not
saved the personal config file (via that 'W' command).
However, I introduced a bug wherein the rcfile was not
fully honored. This gave the changes a bad reputation.
That bug was corrected in release 3.3.11 but the issue
of default startup options keeps resurfacing. And it's
clear there's no consensus on what should be included.
Our --disable-modern-top configure option is of little
help since it remains an all-or-nothing approach. What
we need is an answer offering unlimited customization.
So, this commit will provide distribution packagers or
system administrators with a much more flexible way to
set their own preferred startup default configuration.
A new rcfile is being introduced: '/etc/topdefaultrc',
whose format/content is the same as a personal rcfile.
Thus once a 'proper' enterprise configuration has been
established and saved via 'W', it can be copied to the
/etc/ directory. Thereafter, startup in the absence of
a saved rcfile will use that configuration as default.
Now if a distribution packager or system administrator
wishes to expose their users to some of top's advanced
capabilities they can do so gradually. Perhaps setting
up graph mode for summary area task and memory display
while retaining the %CPU sort could be tried. Or maybe
showing colors, but better customized for a particular
terminal emulator. Such possibilities are now endless.
[ in exploiting this new capability, i hope that the ]
[ other windows (alt display mode) aren't overlooked ]
Reference(s):
. Sep, 2014 - Not fully honoring rcfile bug discussed
https://www.freelists.org/post/procps/top-saved-rcfile-bug
. Oct, 2014 - Attempt to defend new startup defaults
https://bugzilla.redhat.com/show_bug.cgi?id=1153049
. Jul, 2015 - Forest vs. %CPU views discussion
https://gitlab.com/procps-ng/procps/issues/6
. Oct, 2017 - Question the use of --disable-modern-top
https://bugzilla.redhat.com/show_bug.cgi?id=1499410
. Oct, 2017 - Forest vs. %CPU views discussion again
https://www.freelists.org/post/procps/Forest-mode-by-default-in-top-seems-a-bit-strange
. Dec, 2017 - Rehash of 3.3.10 startup defaults change
https://gitlab.com/procps-ng/procps/issues/78
Signed-off-by: Jim Warner <james.warner@comcast.net>
2017-12-17 11:30:00 +05:30
|
|
|
|
}
|
|
|
|
|
}
|
2006-06-17 10:50:01 +05:30
|
|
|
|
|
2002-12-05 04:18:30 +05:30
|
|
|
|
// lastly, establish the true runtime secure mode and delay time
|
2002-12-05 06:08:57 +05:30
|
|
|
|
if (!getuid()) Secure_mode = 0;
|
2011-03-31 16:45:12 +05:30
|
|
|
|
if (!Secure_mode) Rc.delay_time = tmp_delay;
|
|
|
|
|
return;
|
2002-02-02 04:17:29 +05:30
|
|
|
|
|
top: honor the restrictive, crufty old top rcfile
At one time, new top silently defaulted when an rcfile
was found to be incompatible. This is exactly what
the old top did. However, after some discussion it
was decided top should alert the user and thereby
save the system administrator some headaches.
Now, some are upset over the fatal error, proving you
can't please everybody. But in all fairness, given
the difficulty of customizing old top, any reluctance
to delete an old saved rcfile is understandable.
To ease transition to this new top, old style rcfiles
will now be honored and converted to the new format.
And if not disabled at ./configure time via CFLAGS,
a user will be warned when an old style rcfile is
about to be overwritten using the 'W' command.
Lastly, the config validation logic was enhanced to
help ensure both types of rcfile haven't been edited
manually and possibly made unuseable.
Reported-By: sergio <mailbox@sergio.spb.ru>
Bug-Debian: http://bugs.debian.org/651213
Reported-By: martin f krafft <madduck@debian.org>
Bug-Debian: http://bugs.debian.org/651863
Signed-off-by: Jim Warner <james.warner@comcast.net>
2012-03-01 11:29:59 +05:30
|
|
|
|
default_or_error:
|
2011-04-15 04:54:29 +05:30
|
|
|
|
#ifdef RCFILE_NOERR
|
top: honor the restrictive, crufty old top rcfile
At one time, new top silently defaulted when an rcfile
was found to be incompatible. This is exactly what
the old top did. However, after some discussion it
was decided top should alert the user and thereby
save the system administrator some headaches.
Now, some are upset over the fatal error, proving you
can't please everybody. But in all fairness, given
the difficulty of customizing old top, any reluctance
to delete an old saved rcfile is understandable.
To ease transition to this new top, old style rcfiles
will now be honored and converted to the new format.
And if not disabled at ./configure time via CFLAGS,
a user will be warned when an old style rcfile is
about to be overwritten using the 'W' command.
Lastly, the config validation logic was enhanced to
help ensure both types of rcfile haven't been edited
manually and possibly made unuseable.
Reported-By: sergio <mailbox@sergio.spb.ru>
Bug-Debian: http://bugs.debian.org/651213
Reported-By: martin f krafft <madduck@debian.org>
Bug-Debian: http://bugs.debian.org/651863
Signed-off-by: Jim Warner <james.warner@comcast.net>
2012-03-01 11:29:59 +05:30
|
|
|
|
{ RCF_t rcdef = DEF_RCFILE;
|
top: allow more flexible approach for startup defaults
Those references below offer more detail regarding the
default startup changes beginning with version 3.3.10.
It is important to remember that all such changes were
supposed to impact only new users or users who had not
saved the personal config file (via that 'W' command).
However, I introduced a bug wherein the rcfile was not
fully honored. This gave the changes a bad reputation.
That bug was corrected in release 3.3.11 but the issue
of default startup options keeps resurfacing. And it's
clear there's no consensus on what should be included.
Our --disable-modern-top configure option is of little
help since it remains an all-or-nothing approach. What
we need is an answer offering unlimited customization.
So, this commit will provide distribution packagers or
system administrators with a much more flexible way to
set their own preferred startup default configuration.
A new rcfile is being introduced: '/etc/topdefaultrc',
whose format/content is the same as a personal rcfile.
Thus once a 'proper' enterprise configuration has been
established and saved via 'W', it can be copied to the
/etc/ directory. Thereafter, startup in the absence of
a saved rcfile will use that configuration as default.
Now if a distribution packager or system administrator
wishes to expose their users to some of top's advanced
capabilities they can do so gradually. Perhaps setting
up graph mode for summary area task and memory display
while retaining the %CPU sort could be tried. Or maybe
showing colors, but better customized for a particular
terminal emulator. Such possibilities are now endless.
[ in exploiting this new capability, i hope that the ]
[ other windows (alt display mode) aren't overlooked ]
Reference(s):
. Sep, 2014 - Not fully honoring rcfile bug discussed
https://www.freelists.org/post/procps/top-saved-rcfile-bug
. Oct, 2014 - Attempt to defend new startup defaults
https://bugzilla.redhat.com/show_bug.cgi?id=1153049
. Jul, 2015 - Forest vs. %CPU views discussion
https://gitlab.com/procps-ng/procps/issues/6
. Oct, 2017 - Question the use of --disable-modern-top
https://bugzilla.redhat.com/show_bug.cgi?id=1499410
. Oct, 2017 - Forest vs. %CPU views discussion again
https://www.freelists.org/post/procps/Forest-mode-by-default-in-top-seems-a-bit-strange
. Dec, 2017 - Rehash of 3.3.10 startup defaults change
https://gitlab.com/procps-ng/procps/issues/78
Signed-off-by: Jim Warner <james.warner@comcast.net>
2017-12-17 11:30:00 +05:30
|
|
|
|
int i;
|
2011-03-31 16:45:12 +05:30
|
|
|
|
Rc = rcdef;
|
|
|
|
|
for (i = 0 ; i < GROUPSMAX; i++)
|
|
|
|
|
Winstk[i].rc = Rc.win[i];
|
top: honor the restrictive, crufty old top rcfile
At one time, new top silently defaulted when an rcfile
was found to be incompatible. This is exactly what
the old top did. However, after some discussion it
was decided top should alert the user and thereby
save the system administrator some headaches.
Now, some are upset over the fatal error, proving you
can't please everybody. But in all fairness, given
the difficulty of customizing old top, any reluctance
to delete an old saved rcfile is understandable.
To ease transition to this new top, old style rcfiles
will now be honored and converted to the new format.
And if not disabled at ./configure time via CFLAGS,
a user will be warned when an old style rcfile is
about to be overwritten using the 'W' command.
Lastly, the config validation logic was enhanced to
help ensure both types of rcfile haven't been edited
manually and possibly made unuseable.
Reported-By: sergio <mailbox@sergio.spb.ru>
Bug-Debian: http://bugs.debian.org/651213
Reported-By: martin f krafft <madduck@debian.org>
Bug-Debian: http://bugs.debian.org/651863
Signed-off-by: Jim Warner <james.warner@comcast.net>
2012-03-01 11:29:59 +05:30
|
|
|
|
}
|
|
|
|
|
#else
|
|
|
|
|
error_exit(p);
|
2011-03-31 16:45:12 +05:30
|
|
|
|
#endif
|
2018-05-18 10:30:00 +05:30
|
|
|
|
} // end: configs_reads
|
2002-12-05 04:18:30 +05:30
|
|
|
|
|
2011-03-31 16:45:12 +05:30
|
|
|
|
|
|
|
|
|
/*
|
|
|
|
|
* Parse command line arguments.
|
|
|
|
|
* Note: it's assumed that the rc file(s) have already been read
|
|
|
|
|
* and our job is to see if any of those options are to be
|
|
|
|
|
* overridden -- we'll force some on and negate others in our
|
|
|
|
|
* best effort to honor the loser's (oops, user's) wishes... */
|
|
|
|
|
static void parse_args (char **args) {
|
2002-06-19 05:15:30 +05:30
|
|
|
|
/* differences between us and the former top:
|
2002-09-13 17:12:44 +05:30
|
|
|
|
-C (separate CPU states for SMP) is left to an rcfile
|
2011-03-31 16:45:12 +05:30
|
|
|
|
-u (user monitoring) added to compliment interactive 'u'
|
2002-12-06 12:23:29 +05:30
|
|
|
|
-p (pid monitoring) allows a comma delimited list
|
2002-06-19 05:15:30 +05:30
|
|
|
|
-q (zero delay) eliminated as redundant, incomplete and inappropriate
|
|
|
|
|
use: "nice -n-10 top -d0" to achieve what was only claimed
|
2011-03-31 16:45:12 +05:30
|
|
|
|
. most switches act as toggles (not 'on' sw) for more user flexibility
|
2002-06-19 05:15:30 +05:30
|
|
|
|
. no deprecated/illegal use of 'breakargv:' with goto
|
|
|
|
|
. bunched args are actually handled properly and none are ignored
|
|
|
|
|
. we tolerate NO whitespace and NO switches -- maybe too tolerant? */
|
2011-03-31 16:45:12 +05:30
|
|
|
|
static const char numbs_str[] = "+,-.0123456789";
|
2014-08-01 10:30:00 +05:30
|
|
|
|
float tmp_delay = FLT_MAX;
|
2012-12-13 11:30:00 +05:30
|
|
|
|
int i;
|
2002-05-30 09:14:46 +05:30
|
|
|
|
|
2002-06-19 05:15:30 +05:30
|
|
|
|
while (*args) {
|
2002-11-29 04:39:48 +05:30
|
|
|
|
const char *cp = *(args++);
|
2002-05-30 09:14:46 +05:30
|
|
|
|
|
|
|
|
|
while (*cp) {
|
2011-03-31 16:45:12 +05:30
|
|
|
|
char ch;
|
2014-06-25 10:30:00 +05:30
|
|
|
|
float tmp;
|
|
|
|
|
|
2011-03-31 16:45:12 +05:30
|
|
|
|
switch ((ch = *cp)) {
|
2002-05-30 09:14:46 +05:30
|
|
|
|
case '\0':
|
|
|
|
|
break;
|
2011-03-31 16:45:12 +05:30
|
|
|
|
case '-':
|
|
|
|
|
if (cp[1]) ++cp;
|
|
|
|
|
else if (*args) cp = *args++;
|
2017-05-22 22:30:00 +05:30
|
|
|
|
if (strspn(cp, "+,-."))
|
2011-10-18 04:59:59 +05:30
|
|
|
|
error_exit(fmtmk(N_fmt(WRONG_switch_fmt)
|
|
|
|
|
, cp, Myname, N_txt(USAGE_abbrev_txt)));
|
2011-03-31 16:45:12 +05:30
|
|
|
|
continue;
|
2017-03-10 11:30:00 +05:30
|
|
|
|
case '1': // ensure behavior identical to run-time toggle
|
|
|
|
|
if (CHKw(Curwin, View_CPUNOD)) OFFw(Curwin, View_CPUSUM);
|
|
|
|
|
else TOGw(Curwin, View_CPUSUM);
|
|
|
|
|
OFFw(Curwin, View_CPUNOD);
|
|
|
|
|
SETw(Curwin, View_STATES);
|
2017-03-20 10:30:00 +05:30
|
|
|
|
goto bump_cp;
|
2002-05-30 09:14:46 +05:30
|
|
|
|
case 'b':
|
|
|
|
|
Batch = 1;
|
2017-03-20 10:30:00 +05:30
|
|
|
|
goto bump_cp;
|
2002-05-30 09:14:46 +05:30
|
|
|
|
case 'c':
|
2002-06-19 05:15:30 +05:30
|
|
|
|
TOGw(Curwin, Show_CMDLIN);
|
2017-03-20 10:30:00 +05:30
|
|
|
|
goto bump_cp;
|
2002-05-30 09:14:46 +05:30
|
|
|
|
case 'd':
|
|
|
|
|
if (cp[1]) ++cp;
|
2002-06-19 05:15:30 +05:30
|
|
|
|
else if (*args) cp = *args++;
|
2011-10-12 00:32:59 +05:30
|
|
|
|
else error_exit(fmtmk(N_fmt(MISSING_args_fmt), ch));
|
2014-06-25 10:30:00 +05:30
|
|
|
|
if (!mkfloat(cp, &tmp_delay, 0))
|
2011-10-12 00:32:59 +05:30
|
|
|
|
error_exit(fmtmk(N_fmt(BAD_delayint_fmt), cp));
|
2014-06-25 10:30:00 +05:30
|
|
|
|
if (0 > tmp_delay)
|
|
|
|
|
error_exit(N_txt(DELAY_badarg_txt));
|
2002-05-30 09:14:46 +05:30
|
|
|
|
break;
|
2020-03-29 10:30:00 +05:30
|
|
|
|
case 'e':
|
|
|
|
|
{ const char *get = "kmgtp", *got;
|
|
|
|
|
if (cp[1]) cp++;
|
|
|
|
|
else if (*args) cp = *args++;
|
|
|
|
|
else error_exit(fmtmk(N_fmt(MISSING_args_fmt), ch));
|
|
|
|
|
if (!(got = strchr(get, tolower(*cp))))
|
|
|
|
|
error_exit(fmtmk(N_fmt(BAD_memscale_fmt), *cp));
|
|
|
|
|
Rc.task_mscale = (int)(got - get);
|
|
|
|
|
} goto bump_cp;
|
2017-03-09 11:30:00 +05:30
|
|
|
|
case 'E':
|
|
|
|
|
{ const char *get = "kmgtpe", *got;
|
|
|
|
|
if (cp[1]) cp++;
|
|
|
|
|
else if (*args) cp = *args++;
|
|
|
|
|
else error_exit(fmtmk(N_fmt(MISSING_args_fmt), ch));
|
|
|
|
|
if (!(got = strchr(get, tolower(*cp))))
|
|
|
|
|
error_exit(fmtmk(N_fmt(BAD_memscale_fmt), *cp));
|
|
|
|
|
Rc.summ_mscale = (int)(got - get);
|
2017-03-20 10:30:00 +05:30
|
|
|
|
} goto bump_cp;
|
2005-06-22 00:50:39 +05:30
|
|
|
|
case 'H':
|
2011-03-31 16:45:12 +05:30
|
|
|
|
Thread_mode = 1;
|
2017-03-20 10:30:00 +05:30
|
|
|
|
goto bump_cp;
|
2005-06-22 00:50:39 +05:30
|
|
|
|
case 'h':
|
top: add a flexible 'Inspect' capability
This commit introduces an extremely powerful, flexible
brand new capability. Now, users can pause the normal
iterative display and inspect the contents of any file
or output from any script, command, or even pipelines.
It's invoked via the 'Y' interactive command which, in
turn, is supported with simple user supplied additions
as new entries in the top personal configuration file.
A separate new 'Inspect' window supports scrolling and
searching, similar to the main top display. Except it
extends existing 'L'/'&' (locate/locate-next) commands
so that an out-of-view match automatically adjusts the
horizontal position bringing such data into view. And
it provides for multiple successive same line matches.
Also, the basic 'more/less' navigation keys are active
in this new 'Inspect' window, to ease user transition.
There are no program changes required when entries are
added to or deleted from the rcfile. And there are no
known limits to the complexity of a script, command or
pipeline, other than the unidirectional nature imposed
by the 'popen' function call which top cannot violate.
Since it's impossible to predict exactly what contents
will be generated, top treats all output as raw binary
data. Any control characters display in '^C' notation
while all other unprintable characters show as '<AB>'.
The biggest problem encountered was with the find/next
capability since that strstr guy was really diminished
given the possibility that numerous 'strings' could be
encountered *within* many of top's raw, binary 'rows'.
Oh, and another problem was in maintaining the perfect
left & right text justification of this commit message
along with all of the commit summaries. Some of those
summaries (like this very one) are of course, slightly
shorter, to make room for the 'man document' addition.
Enjoy!
Signed-off-by: Jim Warner <james.warner@comcast.net>
2012-11-25 10:30:05 +05:30
|
|
|
|
case 'v':
|
2012-12-13 11:30:00 +05:30
|
|
|
|
puts(fmtmk(N_fmt(HELP_cmdline_fmt)
|
2015-06-18 18:07:24 +05:30
|
|
|
|
, PACKAGE_STRING, Myname, N_txt(USAGE_abbrev_txt)));
|
2011-03-31 16:45:12 +05:30
|
|
|
|
bye_bye(NULL);
|
2002-05-30 09:14:46 +05:30
|
|
|
|
case 'i':
|
2002-06-19 05:15:30 +05:30
|
|
|
|
TOGw(Curwin, Show_IDLEPS);
|
2002-11-30 06:52:01 +05:30
|
|
|
|
Curwin->rc.maxtasks = 0;
|
2017-03-20 10:30:00 +05:30
|
|
|
|
goto bump_cp;
|
2002-05-30 09:14:46 +05:30
|
|
|
|
case 'n':
|
|
|
|
|
if (cp[1]) cp++;
|
2002-06-19 05:15:30 +05:30
|
|
|
|
else if (*args) cp = *args++;
|
2011-10-12 00:32:59 +05:30
|
|
|
|
else error_exit(fmtmk(N_fmt(MISSING_args_fmt), ch));
|
2014-06-25 10:30:00 +05:30
|
|
|
|
if (!mkfloat(cp, &tmp, 1) || 1.0 > tmp)
|
2011-10-14 22:15:44 +05:30
|
|
|
|
error_exit(fmtmk(N_fmt(BAD_niterate_fmt), cp));
|
2014-06-25 10:30:00 +05:30
|
|
|
|
Loops = (int)tmp;
|
2002-05-30 09:14:46 +05:30
|
|
|
|
break;
|
2012-12-13 11:30:00 +05:30
|
|
|
|
case 'o':
|
|
|
|
|
if (cp[1]) cp++;
|
|
|
|
|
else if (*args) cp = *args++;
|
|
|
|
|
else error_exit(fmtmk(N_fmt(MISSING_args_fmt), ch));
|
2012-12-20 11:30:00 +05:30
|
|
|
|
if (*cp == '+') { SETw(Curwin, Qsrt_NORMAL); ++cp; }
|
|
|
|
|
else if (*cp == '-') { OFFw(Curwin, Qsrt_NORMAL); ++cp; }
|
2014-02-25 11:30:00 +05:30
|
|
|
|
for (i = 0; i < EU_MAXPFLGS; i++)
|
2012-12-13 11:30:00 +05:30
|
|
|
|
if (!STRCMP(cp, N_col(i))) break;
|
2014-02-25 11:30:00 +05:30
|
|
|
|
if (i == EU_MAXPFLGS)
|
2013-03-03 11:30:00 +05:30
|
|
|
|
error_exit(fmtmk(N_fmt(XTRA_badflds_fmt), cp));
|
2012-12-13 11:30:00 +05:30
|
|
|
|
OFFw(Curwin, Show_FOREST);
|
|
|
|
|
Curwin->rc.sortindx = i;
|
|
|
|
|
cp += strlen(cp);
|
|
|
|
|
break;
|
|
|
|
|
case 'O':
|
2014-02-25 11:30:00 +05:30
|
|
|
|
for (i = 0; i < EU_MAXPFLGS; i++)
|
2012-12-13 11:30:00 +05:30
|
|
|
|
puts(N_col(i));
|
|
|
|
|
bye_bye(NULL);
|
2017-03-20 10:30:00 +05:30
|
|
|
|
case 'p':
|
|
|
|
|
{ int pid; char *p;
|
2011-10-12 00:32:59 +05:30
|
|
|
|
if (Curwin->usrseltyp) error_exit(N_txt(SELECT_clash_txt));
|
2014-06-25 10:30:00 +05:30
|
|
|
|
do {
|
2002-06-19 05:15:30 +05:30
|
|
|
|
if (cp[1]) cp++;
|
|
|
|
|
else if (*args) cp = *args++;
|
2011-10-14 22:15:44 +05:30
|
|
|
|
else error_exit(fmtmk(N_fmt(MISSING_args_fmt), ch));
|
2002-05-30 09:14:46 +05:30
|
|
|
|
if (Monpidsidx >= MONPIDMAX)
|
2011-10-12 00:32:59 +05:30
|
|
|
|
error_exit(fmtmk(N_fmt(LIMIT_exceed_fmt), MONPIDMAX));
|
2014-06-25 10:30:00 +05:30
|
|
|
|
if (1 != sscanf(cp, "%d", &pid)
|
2017-05-22 22:30:00 +05:30
|
|
|
|
|| strpbrk(cp, "+-."))
|
2011-10-12 00:32:59 +05:30
|
|
|
|
error_exit(fmtmk(N_fmt(BAD_mon_pids_fmt), cp));
|
2012-04-16 01:45:15 +05:30
|
|
|
|
if (!pid) pid = getpid();
|
|
|
|
|
for (i = 0; i < Monpidsidx; i++)
|
|
|
|
|
if (Monpids[i] == pid) goto next_pid;
|
|
|
|
|
Monpids[Monpidsidx++] = pid;
|
|
|
|
|
next_pid:
|
|
|
|
|
if (!(p = strchr(cp, ','))) break;
|
2002-06-19 05:15:30 +05:30
|
|
|
|
cp = p;
|
2002-05-30 09:14:46 +05:30
|
|
|
|
} while (*cp);
|
2014-06-25 10:30:00 +05:30
|
|
|
|
} break;
|
2002-05-30 09:14:46 +05:30
|
|
|
|
case 's':
|
|
|
|
|
Secure_mode = 1;
|
2017-03-20 10:30:00 +05:30
|
|
|
|
goto bump_cp;
|
2002-05-30 09:14:46 +05:30
|
|
|
|
case 'S':
|
2002-06-19 05:15:30 +05:30
|
|
|
|
TOGw(Curwin, Show_CTIMES);
|
2017-03-20 10:30:00 +05:30
|
|
|
|
goto bump_cp;
|
2002-12-10 08:31:17 +05:30
|
|
|
|
case 'u':
|
|
|
|
|
case 'U':
|
2011-12-09 22:40:30 +05:30
|
|
|
|
{ const char *errmsg;
|
2011-10-12 00:32:59 +05:30
|
|
|
|
if (Monpidsidx || Curwin->usrseltyp) error_exit(N_txt(SELECT_clash_txt));
|
2011-03-31 16:45:12 +05:30
|
|
|
|
if (cp[1]) cp++;
|
|
|
|
|
else if (*args) cp = *args++;
|
2011-10-14 22:15:44 +05:30
|
|
|
|
else error_exit(fmtmk(N_fmt(MISSING_args_fmt), ch));
|
2011-12-09 22:40:30 +05:30
|
|
|
|
if ((errmsg = user_certify(Curwin, cp, ch))) error_exit(errmsg);
|
2011-03-31 16:45:12 +05:30
|
|
|
|
cp += strlen(cp);
|
2017-03-10 11:30:00 +05:30
|
|
|
|
} break;
|
2011-05-26 15:03:32 +05:30
|
|
|
|
case 'w':
|
2011-06-23 19:15:09 +05:30
|
|
|
|
{ const char *pn = NULL;
|
2011-05-26 15:03:32 +05:30
|
|
|
|
int ai = 0, ci = 0;
|
2015-02-01 11:30:00 +05:30
|
|
|
|
tmp = -1;
|
2011-06-23 19:15:09 +05:30
|
|
|
|
if (cp[1]) pn = &cp[1];
|
2011-05-26 15:03:32 +05:30
|
|
|
|
else if (*args) { pn = *args; ai = 1; }
|
2014-06-25 10:30:00 +05:30
|
|
|
|
if (pn && !(ci = strspn(pn, numbs_str))) { ai = 0; pn = NULL; }
|
1970-01-01 05:30:00 +05:30
|
|
|
|
if (pn && (!mkfloat(pn, &tmp, 1) || tmp < W_MIN_COL || tmp > SCREENMAX))
|
2014-06-25 10:30:00 +05:30
|
|
|
|
error_exit(fmtmk(N_fmt(BAD_widtharg_fmt), pn));
|
|
|
|
|
Width_mode = (int)tmp;
|
2011-05-26 15:03:32 +05:30
|
|
|
|
cp++;
|
|
|
|
|
args += ai;
|
|
|
|
|
if (pn) cp = pn + ci;
|
2014-06-25 10:30:00 +05:30
|
|
|
|
} continue;
|
2002-05-30 09:14:46 +05:30
|
|
|
|
default :
|
2011-10-18 04:59:59 +05:30
|
|
|
|
error_exit(fmtmk(N_fmt(UNKNOWN_opts_fmt)
|
|
|
|
|
, *cp, Myname, N_txt(USAGE_abbrev_txt)));
|
2011-03-31 16:45:12 +05:30
|
|
|
|
} // end: switch (*cp)
|
2002-05-30 09:14:46 +05:30
|
|
|
|
|
2011-03-31 16:45:12 +05:30
|
|
|
|
// advance cp and jump over any numerical args used above
|
2017-03-20 10:30:00 +05:30
|
|
|
|
if (*cp) cp += strspn(&cp[1], numbs_str);
|
|
|
|
|
bump_cp:
|
2017-06-21 06:50:20 +05:30
|
|
|
|
if (*cp) ++cp;
|
2011-03-31 16:45:12 +05:30
|
|
|
|
} // end: while (*cp)
|
|
|
|
|
} // end: while (*args)
|
|
|
|
|
|
|
|
|
|
// fixup delay time, maybe...
|
2014-08-01 10:30:00 +05:30
|
|
|
|
if (FLT_MAX > tmp_delay) {
|
2011-03-31 16:45:12 +05:30
|
|
|
|
if (Secure_mode)
|
2011-10-12 00:32:59 +05:30
|
|
|
|
error_exit(N_txt(DELAY_secure_txt));
|
2011-03-31 16:45:12 +05:30
|
|
|
|
Rc.delay_time = tmp_delay;
|
2002-05-30 09:14:46 +05:30
|
|
|
|
}
|
2011-03-31 16:45:12 +05:30
|
|
|
|
} // end: parse_args
|
2002-02-02 04:17:29 +05:30
|
|
|
|
|
2002-05-30 09:14:46 +05:30
|
|
|
|
|
|
|
|
|
/*
|
|
|
|
|
* Set up the terminal attributes */
|
2011-03-31 16:45:12 +05:30
|
|
|
|
static void whack_terminal (void) {
|
|
|
|
|
static char dummy[] = "dumb";
|
|
|
|
|
struct termios tmptty;
|
2002-05-30 09:14:46 +05:30
|
|
|
|
|
2011-03-31 16:45:12 +05:30
|
|
|
|
// the curses part...
|
2004-09-12 21:13:48 +05:30
|
|
|
|
if (Batch) {
|
2011-03-31 16:45:12 +05:30
|
|
|
|
setupterm(dummy, STDOUT_FILENO, NULL);
|
2004-09-12 21:13:48 +05:30
|
|
|
|
return;
|
|
|
|
|
}
|
2011-03-31 16:45:12 +05:30
|
|
|
|
#ifdef PRETENDNOCAP
|
|
|
|
|
setupterm(dummy, STDOUT_FILENO, NULL);
|
|
|
|
|
#else
|
2002-05-30 09:14:46 +05:30
|
|
|
|
setupterm(NULL, STDOUT_FILENO, NULL);
|
2011-03-31 16:45:12 +05:30
|
|
|
|
#endif
|
|
|
|
|
// our part...
|
|
|
|
|
if (-1 == tcgetattr(STDIN_FILENO, &Tty_original))
|
2011-10-12 00:32:59 +05:30
|
|
|
|
error_exit(N_txt(FAIL_tty_get_txt));
|
2011-03-31 16:45:12 +05:30
|
|
|
|
// ok, haven't really changed anything but we do have our snapshot
|
2004-09-12 21:13:48 +05:30
|
|
|
|
Ttychanged = 1;
|
2011-03-31 16:45:12 +05:30
|
|
|
|
|
|
|
|
|
// first, a consistent canonical mode for interactive line input
|
|
|
|
|
tmptty = Tty_original;
|
|
|
|
|
tmptty.c_lflag |= (ECHO | ECHOCTL | ECHOE | ICANON | ISIG);
|
|
|
|
|
tmptty.c_lflag &= ~NOFLSH;
|
|
|
|
|
tmptty.c_oflag &= ~TAB3;
|
|
|
|
|
tmptty.c_iflag |= BRKINT;
|
|
|
|
|
tmptty.c_iflag &= ~IGNBRK;
|
|
|
|
|
if (key_backspace && 1 == strlen(key_backspace))
|
|
|
|
|
tmptty.c_cc[VERASE] = *key_backspace;
|
2013-02-15 11:30:00 +05:30
|
|
|
|
#ifdef TERMIOS_ONLY
|
2011-03-31 16:45:12 +05:30
|
|
|
|
if (-1 == tcsetattr(STDIN_FILENO, TCSAFLUSH, &tmptty))
|
2013-01-16 11:30:00 +05:30
|
|
|
|
error_exit(fmtmk(N_fmt(FAIL_tty_set_fmt), strerror(errno)));
|
2011-03-31 16:45:12 +05:30
|
|
|
|
tcgetattr(STDIN_FILENO, &Tty_tweaked);
|
|
|
|
|
#endif
|
|
|
|
|
// lastly, a nearly raw mode for unsolicited single keystrokes
|
|
|
|
|
tmptty.c_lflag &= ~(ECHO | ECHOCTL | ECHOE | ICANON);
|
|
|
|
|
tmptty.c_cc[VMIN] = 1;
|
|
|
|
|
tmptty.c_cc[VTIME] = 0;
|
|
|
|
|
if (-1 == tcsetattr(STDIN_FILENO, TCSAFLUSH, &tmptty))
|
2013-01-16 11:30:00 +05:30
|
|
|
|
error_exit(fmtmk(N_fmt(FAIL_tty_set_fmt), strerror(errno)));
|
2011-03-31 16:45:12 +05:30
|
|
|
|
tcgetattr(STDIN_FILENO, &Tty_raw);
|
|
|
|
|
|
|
|
|
|
#ifndef OFF_STDIOLBF
|
2004-09-12 21:13:48 +05:30
|
|
|
|
// thanks anyway stdio, but we'll manage buffering at the frame level...
|
|
|
|
|
setbuffer(stdout, Stdout_buf, sizeof(Stdout_buf));
|
|
|
|
|
#endif
|
2013-06-28 10:30:00 +05:30
|
|
|
|
#ifdef OFF_SCROLLBK
|
2013-01-31 11:30:00 +05:30
|
|
|
|
// this has the effect of disabling any troublesome scrollback buffer...
|
|
|
|
|
if (enter_ca_mode) putp(enter_ca_mode);
|
2013-06-28 10:30:00 +05:30
|
|
|
|
#endif
|
2013-01-16 11:30:00 +05:30
|
|
|
|
// and don't forget to ask iokey to initialize his tinfo_tab
|
2013-02-15 11:30:00 +05:30
|
|
|
|
iokey(0);
|
2011-03-31 16:45:12 +05:30
|
|
|
|
} // end: whack_terminal
|
|
|
|
|
|
2002-06-19 05:15:30 +05:30
|
|
|
|
/*###### Windows/Field Groups support #################################*/
|
2002-02-02 04:17:29 +05:30
|
|
|
|
|
2011-03-31 16:45:12 +05:30
|
|
|
|
/*
|
|
|
|
|
* Value a window's name and make the associated group name. */
|
|
|
|
|
static void win_names (WIN_t *q, const char *name) {
|
|
|
|
|
/* note: sprintf/snprintf results are "undefined" when src==dst,
|
|
|
|
|
according to C99 & POSIX.1-2001 (thanks adc) */
|
|
|
|
|
if (q->rc.winname != name)
|
|
|
|
|
snprintf(q->rc.winname, sizeof(q->rc.winname), "%s", name);
|
|
|
|
|
snprintf(q->grpname, sizeof(q->grpname), "%d:%s", q->winnum, name);
|
|
|
|
|
} // end: win_names
|
2002-02-02 04:17:29 +05:30
|
|
|
|
|
|
|
|
|
|
2013-02-27 11:30:00 +05:30
|
|
|
|
/*
|
|
|
|
|
* This guy just resets (normalizes) a single window
|
|
|
|
|
* and he ensures pid monitoring is no longer active. */
|
|
|
|
|
static void win_reset (WIN_t *q) {
|
|
|
|
|
SETw(q, Show_IDLEPS | Show_TASKON);
|
|
|
|
|
#ifndef SCROLLVAR_NO
|
2018-06-20 10:30:00 +05:30
|
|
|
|
q->rc.maxtasks = q->usrseltyp = q->begpflg = q->begtask = q->begnext = q->varcolbeg = 0;
|
2013-02-27 11:30:00 +05:30
|
|
|
|
#else
|
2018-06-20 10:30:00 +05:30
|
|
|
|
q->rc.maxtasks = q->usrseltyp = q->begpflg = q->begtask = q->begnext = 0;
|
2013-02-27 11:30:00 +05:30
|
|
|
|
#endif
|
|
|
|
|
Monpidsidx = 0;
|
2013-03-03 11:30:00 +05:30
|
|
|
|
osel_clear(q);
|
2015-10-24 10:30:00 +05:30
|
|
|
|
q->findstr[0] = '\0';
|
|
|
|
|
#ifndef USE_X_COLHDR
|
|
|
|
|
// NOHISEL_xxx is redundant (already turned off by osel_clear)
|
|
|
|
|
OFFw(q, NOHIFND_xxx | NOHISEL_xxx);
|
|
|
|
|
#endif
|
2020-05-29 10:30:00 +05:30
|
|
|
|
q->rc.combine_cpus = 0;
|
2013-02-27 11:30:00 +05:30
|
|
|
|
} // end: win_reset
|
|
|
|
|
|
|
|
|
|
|
2011-03-31 16:45:12 +05:30
|
|
|
|
/*
|
|
|
|
|
* Display a window/field group (ie. make it "current"). */
|
2013-01-11 11:30:00 +05:30
|
|
|
|
static WIN_t *win_select (int ch) {
|
2011-03-31 16:45:12 +05:30
|
|
|
|
WIN_t *w = Curwin; // avoid gcc bloat with a local copy
|
2002-05-30 09:14:46 +05:30
|
|
|
|
|
2002-11-08 06:01:28 +05:30
|
|
|
|
/* if there's no ch, it means we're supporting the external interface,
|
2002-06-19 05:15:30 +05:30
|
|
|
|
so we must try to get our own darn ch by begging the user... */
|
|
|
|
|
if (!ch) {
|
2011-10-12 00:32:59 +05:30
|
|
|
|
show_pmt(N_txt(CHOOSE_group_txt));
|
2013-02-15 11:30:00 +05:30
|
|
|
|
if (1 > (ch = iokey(1))) return w;
|
2002-05-30 09:14:46 +05:30
|
|
|
|
}
|
2002-06-19 05:15:30 +05:30
|
|
|
|
switch (ch) {
|
2013-07-04 10:30:00 +05:30
|
|
|
|
case 'a': // we don't carry 'a' / 'w' in our
|
|
|
|
|
w = w->next; // pmt - they're here for a good
|
|
|
|
|
break; // friend of ours -- wins_colors.
|
|
|
|
|
case 'w': // (however those letters work via
|
|
|
|
|
w = w->prev; // the pmt too but gee, end-loser
|
|
|
|
|
break; // should just press the darn key)
|
2012-03-05 22:52:33 +05:30
|
|
|
|
case '1': case '2' : case '3': case '4':
|
2011-03-31 16:45:12 +05:30
|
|
|
|
w = &Winstk[ch - '1'];
|
|
|
|
|
break;
|
|
|
|
|
default: // keep gcc happy
|
2002-06-19 05:15:30 +05:30
|
|
|
|
break;
|
2002-05-30 09:14:46 +05:30
|
|
|
|
}
|
2018-06-23 22:30:00 +05:30
|
|
|
|
Curwin = w;
|
|
|
|
|
mkVIZrow1(Curwin);
|
|
|
|
|
return Curwin;
|
2011-03-31 16:45:12 +05:30
|
|
|
|
} // end: win_select
|
2002-02-02 04:17:29 +05:30
|
|
|
|
|
|
|
|
|
|
2011-03-31 16:45:12 +05:30
|
|
|
|
/*
|
|
|
|
|
* Just warn the user when a command can't be honored. */
|
|
|
|
|
static int win_warn (int what) {
|
|
|
|
|
switch (what) {
|
|
|
|
|
case Warn_ALT:
|
2011-10-14 22:15:44 +05:30
|
|
|
|
show_msg(N_txt(DISABLED_cmd_txt));
|
2011-03-31 16:45:12 +05:30
|
|
|
|
break;
|
|
|
|
|
case Warn_VIZ:
|
2011-10-12 00:32:59 +05:30
|
|
|
|
show_msg(fmtmk(N_fmt(DISABLED_win_fmt), Curwin->grpname));
|
2011-03-31 16:45:12 +05:30
|
|
|
|
break;
|
|
|
|
|
default: // keep gcc happy
|
|
|
|
|
break;
|
|
|
|
|
}
|
|
|
|
|
/* we gotta' return false 'cause we're somewhat well known within
|
|
|
|
|
macro society, by way of that sassy little tertiary operator... */
|
2002-06-19 05:15:30 +05:30
|
|
|
|
return 0;
|
2011-03-31 16:45:12 +05:30
|
|
|
|
} // end: win_warn
|
2002-05-30 09:14:46 +05:30
|
|
|
|
|
|
|
|
|
|
2011-03-31 16:45:12 +05:30
|
|
|
|
/*
|
|
|
|
|
* Change colors *Helper* function to save/restore settings;
|
|
|
|
|
* ensure colors will show; and rebuild the terminfo strings. */
|
2012-02-07 22:41:11 +05:30
|
|
|
|
static void wins_clrhlp (WIN_t *q, int save) {
|
2002-06-19 05:15:30 +05:30
|
|
|
|
static int flgssav, summsav, msgssav, headsav, tasksav;
|
2002-05-30 09:14:46 +05:30
|
|
|
|
|
2002-06-19 05:15:30 +05:30
|
|
|
|
if (save) {
|
2002-11-30 06:52:01 +05:30
|
|
|
|
flgssav = q->rc.winflags; summsav = q->rc.summclr;
|
|
|
|
|
msgssav = q->rc.msgsclr; headsav = q->rc.headclr; tasksav = q->rc.taskclr;
|
2002-06-19 05:15:30 +05:30
|
|
|
|
SETw(q, Show_COLORS);
|
|
|
|
|
} else {
|
2002-11-30 06:52:01 +05:30
|
|
|
|
q->rc.winflags = flgssav; q->rc.summclr = summsav;
|
|
|
|
|
q->rc.msgsclr = msgssav; q->rc.headclr = headsav; q->rc.taskclr = tasksav;
|
2002-05-30 09:14:46 +05:30
|
|
|
|
}
|
2002-06-19 05:15:30 +05:30
|
|
|
|
capsmk(q);
|
2012-02-07 22:41:11 +05:30
|
|
|
|
} // end: wins_clrhlp
|
2002-05-30 09:14:46 +05:30
|
|
|
|
|
|
|
|
|
|
2011-03-31 16:45:12 +05:30
|
|
|
|
/*
|
|
|
|
|
* Change colors used in display */
|
|
|
|
|
static void wins_colors (void) {
|
|
|
|
|
#define kbdABORT 'q'
|
|
|
|
|
#define kbdAPPLY kbd_ENTER
|
|
|
|
|
WIN_t *w = Curwin; // avoid gcc bloat with a local copy
|
|
|
|
|
int clr = w->rc.taskclr, *pclr = &w->rc.taskclr;
|
2013-01-11 11:30:00 +05:30
|
|
|
|
char tgt = 'T';
|
|
|
|
|
int key;
|
2002-05-30 09:14:46 +05:30
|
|
|
|
|
2002-06-19 05:15:30 +05:30
|
|
|
|
if (0 >= max_colors) {
|
2011-10-12 00:32:59 +05:30
|
|
|
|
show_msg(N_txt(COLORS_nomap_txt));
|
2002-06-19 05:15:30 +05:30
|
|
|
|
return;
|
|
|
|
|
}
|
2012-02-07 22:41:11 +05:30
|
|
|
|
wins_clrhlp(w, 1);
|
2013-01-29 11:30:00 +05:30
|
|
|
|
putp((Cursor_state = Cap_curs_huge));
|
2013-01-16 11:30:00 +05:30
|
|
|
|
signify_that:
|
2002-10-19 02:37:49 +05:30
|
|
|
|
putp(Cap_clr_scr);
|
2013-01-16 11:30:00 +05:30
|
|
|
|
adj_geometry();
|
2002-06-19 05:15:30 +05:30
|
|
|
|
|
|
|
|
|
do {
|
2002-10-19 02:37:49 +05:30
|
|
|
|
putp(Cap_home);
|
2011-03-31 16:45:12 +05:30
|
|
|
|
// this string is well above ISO C89's minimum requirements!
|
2011-10-12 00:32:59 +05:30
|
|
|
|
show_special(1, fmtmk(N_unq(COLOR_custom_fmt)
|
2018-06-04 10:30:00 +05:30
|
|
|
|
, w->grpname
|
2011-10-12 00:32:59 +05:30
|
|
|
|
, CHKw(w, View_NOBOLD) ? N_txt(ON_word_only_txt) : N_txt(OFF_one_word_txt)
|
|
|
|
|
, CHKw(w, Show_COLORS) ? N_txt(ON_word_only_txt) : N_txt(OFF_one_word_txt)
|
|
|
|
|
, CHKw(w, Show_HIBOLD) ? N_txt(ON_word_only_txt) : N_txt(OFF_one_word_txt)
|
2018-06-07 10:30:00 +05:30
|
|
|
|
, tgt, max_colors, clr, w->grpname));
|
2013-01-16 11:30:00 +05:30
|
|
|
|
putp(Cap_clr_eos);
|
|
|
|
|
fflush(stdout);
|
2013-01-11 11:30:00 +05:30
|
|
|
|
|
2013-06-30 10:30:00 +05:30
|
|
|
|
if (Frames_signal) goto signify_that;
|
2013-02-15 11:30:00 +05:30
|
|
|
|
key = iokey(1);
|
2013-01-16 11:30:00 +05:30
|
|
|
|
if (key < 1) goto signify_that;
|
2018-06-13 10:30:00 +05:30
|
|
|
|
if (key == kbd_ESC) break;
|
2013-01-16 11:30:00 +05:30
|
|
|
|
|
2013-01-11 11:30:00 +05:30
|
|
|
|
switch (key) {
|
2002-06-19 05:15:30 +05:30
|
|
|
|
case 'S':
|
2011-03-31 16:45:12 +05:30
|
|
|
|
pclr = &w->rc.summclr;
|
2002-06-19 05:15:30 +05:30
|
|
|
|
clr = *pclr;
|
2013-01-11 11:30:00 +05:30
|
|
|
|
tgt = key;
|
2002-06-19 05:15:30 +05:30
|
|
|
|
break;
|
|
|
|
|
case 'M':
|
2011-03-31 16:45:12 +05:30
|
|
|
|
pclr = &w->rc.msgsclr;
|
2002-06-19 05:15:30 +05:30
|
|
|
|
clr = *pclr;
|
2013-01-11 11:30:00 +05:30
|
|
|
|
tgt = key;
|
2002-06-19 05:15:30 +05:30
|
|
|
|
break;
|
|
|
|
|
case 'H':
|
2011-03-31 16:45:12 +05:30
|
|
|
|
pclr = &w->rc.headclr;
|
2002-06-19 05:15:30 +05:30
|
|
|
|
clr = *pclr;
|
2013-01-11 11:30:00 +05:30
|
|
|
|
tgt = key;
|
2002-06-19 05:15:30 +05:30
|
|
|
|
break;
|
|
|
|
|
case 'T':
|
2011-03-31 16:45:12 +05:30
|
|
|
|
pclr = &w->rc.taskclr;
|
2002-06-19 05:15:30 +05:30
|
|
|
|
clr = *pclr;
|
2013-01-11 11:30:00 +05:30
|
|
|
|
tgt = key;
|
2002-06-19 05:15:30 +05:30
|
|
|
|
break;
|
2012-03-05 22:52:33 +05:30
|
|
|
|
case '0': case '1': case '2': case '3':
|
|
|
|
|
case '4': case '5': case '6': case '7':
|
2013-01-11 11:30:00 +05:30
|
|
|
|
clr = key - '0';
|
2002-06-19 05:15:30 +05:30
|
|
|
|
*pclr = clr;
|
|
|
|
|
break;
|
2018-06-04 10:30:00 +05:30
|
|
|
|
case kbd_UP:
|
|
|
|
|
++clr;
|
|
|
|
|
if (clr >= max_colors) clr = 0;
|
|
|
|
|
*pclr = clr;
|
|
|
|
|
break;
|
|
|
|
|
case kbd_DOWN:
|
|
|
|
|
--clr;
|
|
|
|
|
if (clr < 0) clr = max_colors - 1;
|
|
|
|
|
*pclr = clr;
|
|
|
|
|
break;
|
2002-11-25 03:34:03 +05:30
|
|
|
|
case 'B':
|
2011-03-31 16:45:12 +05:30
|
|
|
|
TOGw(w, View_NOBOLD);
|
2002-11-25 03:34:03 +05:30
|
|
|
|
break;
|
2002-06-19 05:15:30 +05:30
|
|
|
|
case 'b':
|
2011-03-31 16:45:12 +05:30
|
|
|
|
TOGw(w, Show_HIBOLD);
|
2002-06-19 05:15:30 +05:30
|
|
|
|
break;
|
|
|
|
|
case 'z':
|
2011-03-31 16:45:12 +05:30
|
|
|
|
TOGw(w, Show_COLORS);
|
2002-06-19 05:15:30 +05:30
|
|
|
|
break;
|
|
|
|
|
case 'a':
|
|
|
|
|
case 'w':
|
2013-01-11 11:30:00 +05:30
|
|
|
|
wins_clrhlp((w = win_select(key)), 1);
|
2011-03-31 16:45:12 +05:30
|
|
|
|
clr = w->rc.taskclr, pclr = &w->rc.taskclr;
|
2002-06-19 05:15:30 +05:30
|
|
|
|
tgt = 'T';
|
|
|
|
|
break;
|
2013-01-16 11:30:00 +05:30
|
|
|
|
default:
|
|
|
|
|
break; // keep gcc happy
|
2002-06-19 05:15:30 +05:30
|
|
|
|
}
|
2011-03-31 16:45:12 +05:30
|
|
|
|
capsmk(w);
|
2013-01-16 11:30:00 +05:30
|
|
|
|
} while (key != kbdAPPLY && key != kbdABORT);
|
2013-01-11 11:30:00 +05:30
|
|
|
|
|
2018-06-13 10:30:00 +05:30
|
|
|
|
if (key == kbdABORT || key == kbd_ESC) wins_clrhlp(w, 0);
|
2002-06-19 05:15:30 +05:30
|
|
|
|
|
2011-03-31 16:45:12 +05:30
|
|
|
|
#undef kbdABORT
|
|
|
|
|
#undef kbdAPPLY
|
|
|
|
|
} // end: wins_colors
|
2002-06-19 05:15:30 +05:30
|
|
|
|
|
|
|
|
|
|
2011-03-31 16:45:12 +05:30
|
|
|
|
/*
|
|
|
|
|
* Manipulate flag(s) for all our windows. */
|
|
|
|
|
static void wins_reflag (int what, int flg) {
|
|
|
|
|
WIN_t *w = Curwin; // avoid gcc bloat with a local copy
|
2002-06-19 05:15:30 +05:30
|
|
|
|
|
|
|
|
|
do {
|
|
|
|
|
switch (what) {
|
2002-06-27 05:26:49 +05:30
|
|
|
|
case Flags_TOG:
|
2002-06-19 05:15:30 +05:30
|
|
|
|
TOGw(w, flg);
|
|
|
|
|
break;
|
2011-03-31 16:45:12 +05:30
|
|
|
|
case Flags_SET: // Ummmm, i can't find anybody
|
|
|
|
|
SETw(w, flg); // who uses Flags_set ...
|
2002-10-02 05:40:30 +05:30
|
|
|
|
break;
|
2002-06-27 05:26:49 +05:30
|
|
|
|
case Flags_OFF:
|
2002-06-19 05:15:30 +05:30
|
|
|
|
OFFw(w, flg);
|
|
|
|
|
break;
|
2011-03-31 16:45:12 +05:30
|
|
|
|
default: // keep gcc happy
|
|
|
|
|
break;
|
2002-06-19 05:15:30 +05:30
|
|
|
|
}
|
2011-03-31 16:45:12 +05:30
|
|
|
|
/* a flag with special significance -- user wants to rebalance
|
|
|
|
|
display so we gotta' off some stuff then force on two flags... */
|
2013-02-27 11:30:00 +05:30
|
|
|
|
if (EQUWINS_xxx == flg)
|
|
|
|
|
win_reset(w);
|
|
|
|
|
|
2002-10-02 05:40:30 +05:30
|
|
|
|
w = w->next;
|
|
|
|
|
} while (w != Curwin);
|
2011-03-31 16:45:12 +05:30
|
|
|
|
} // end: wins_reflag
|
2002-06-19 05:15:30 +05:30
|
|
|
|
|
|
|
|
|
|
2011-03-31 16:45:12 +05:30
|
|
|
|
/*
|
|
|
|
|
* Set up the raw/incomplete field group windows --
|
|
|
|
|
* they'll be finished off after startup completes.
|
|
|
|
|
* [ and very likely that will override most/all of our efforts ]
|
|
|
|
|
* [ --- life-is-NOT-fair --- ] */
|
|
|
|
|
static void wins_stage_1 (void) {
|
2002-06-19 05:15:30 +05:30
|
|
|
|
WIN_t *w;
|
2002-11-08 06:01:28 +05:30
|
|
|
|
int i;
|
2002-06-19 05:15:30 +05:30
|
|
|
|
|
|
|
|
|
for (i = 0; i < GROUPSMAX; i++) {
|
2002-12-05 08:30:42 +05:30
|
|
|
|
w = &Winstk[i];
|
2002-06-27 05:26:49 +05:30
|
|
|
|
w->winnum = i + 1;
|
2002-12-05 04:18:30 +05:30
|
|
|
|
w->rc = Rc.win[i];
|
2002-06-19 05:15:30 +05:30
|
|
|
|
w->captab[0] = Cap_norm;
|
|
|
|
|
w->captab[1] = Cap_norm;
|
2002-11-25 03:34:03 +05:30
|
|
|
|
w->captab[2] = w->cap_bold;
|
2002-11-08 06:01:28 +05:30
|
|
|
|
w->captab[3] = w->capclr_sum;
|
|
|
|
|
w->captab[4] = w->capclr_msg;
|
|
|
|
|
w->captab[5] = w->capclr_pmt;
|
|
|
|
|
w->captab[6] = w->capclr_hdr;
|
|
|
|
|
w->captab[7] = w->capclr_rowhigh;
|
|
|
|
|
w->captab[8] = w->capclr_rownorm;
|
2002-06-19 05:15:30 +05:30
|
|
|
|
w->next = w + 1;
|
|
|
|
|
w->prev = w - 1;
|
|
|
|
|
}
|
2011-03-31 16:45:12 +05:30
|
|
|
|
|
|
|
|
|
// fixup the circular chains...
|
|
|
|
|
Winstk[GROUPSMAX - 1].next = &Winstk[0];
|
|
|
|
|
Winstk[0].prev = &Winstk[GROUPSMAX - 1];
|
2002-12-05 08:30:42 +05:30
|
|
|
|
Curwin = Winstk;
|
2011-03-31 16:45:12 +05:30
|
|
|
|
} // end: wins_stage_1
|
2002-06-19 05:15:30 +05:30
|
|
|
|
|
|
|
|
|
|
2011-03-31 16:45:12 +05:30
|
|
|
|
/*
|
|
|
|
|
* This guy just completes the field group windows after the
|
2013-01-16 11:30:00 +05:30
|
|
|
|
* rcfiles have been read and command line arguments parsed.
|
|
|
|
|
* And since he's the cabose of startup, he'll also tidy up
|
|
|
|
|
* a few final things... */
|
2011-03-31 16:45:12 +05:30
|
|
|
|
static void wins_stage_2 (void) {
|
2002-06-19 05:15:30 +05:30
|
|
|
|
int i;
|
|
|
|
|
|
|
|
|
|
for (i = 0; i < GROUPSMAX; i++) {
|
2002-12-05 08:30:42 +05:30
|
|
|
|
win_names(&Winstk[i], Winstk[i].rc.winname);
|
|
|
|
|
capsmk(&Winstk[i]);
|
top: highlight all regular search string(s) when found
With the recent inspect search highlight provisions in
place, the lack of highlighting in task based searches
has grown from being only irritating to a real defect.
Thus, this commit introduces parallel functionality to
those searches initiated within a visible task window.
And just as separate inspect searches are possible for
each selection, per window task searches are provided.
However, it should be noted that there are differences
between task based searches and inspect type searches:
* There is no concept of out-of-view data when dealing
. with task rows -- if the data can't bee seen, it has
. not, in fact, been constructed from a proc_t struct.
* While inspect data is output at the character level,
. up to now all task display data was only potentially
. output and it was always based on a complete string.
* With task search highlighting, rows now containing a
. match must be output in pieces and, therefore, can't
. be optimized away like other rows which haven't been
. been altered. This is because top cannot predict the
. the contents of a search string or, how many matches
. might occur in a given row. Short search strings and
. many matches would raise buffer needs geometrically.
(now that we know a '.' + 2 spaces is squeezed to one)
(everything's perfectly justified, but it's just luck)
Signed-off-by: Jim Warner <james.warner@comcast.net>
2012-12-08 11:30:00 +05:30
|
|
|
|
Winstk[i].findstr = alloc_c(FNDBUFSIZ);
|
|
|
|
|
Winstk[i].findlen = 0;
|
2020-05-29 10:30:00 +05:30
|
|
|
|
if (Winstk[i].rc.combine_cpus >= smp_num_cpus)
|
|
|
|
|
Winstk[i].rc.combine_cpus = 0;
|
2020-05-31 10:30:00 +05:30
|
|
|
|
if (CHKw(&Winstk[i], (View_CPUSUM | View_CPUNOD)))
|
|
|
|
|
Winstk[i].rc.double_up = 0;
|
2002-06-19 05:15:30 +05:30
|
|
|
|
}
|
2013-01-29 11:30:00 +05:30
|
|
|
|
if (!Batch)
|
|
|
|
|
putp((Cursor_state = Cap_curs_hide));
|
|
|
|
|
else {
|
2011-05-26 15:03:32 +05:30
|
|
|
|
OFFw(Curwin, View_SCROLL);
|
2012-12-18 11:30:00 +05:30
|
|
|
|
signal(SIGHUP, SIG_IGN); // allow running under nohup
|
|
|
|
|
}
|
2011-08-30 17:35:45 +05:30
|
|
|
|
// fill in missing Fieldstab members and build each window's columnhdr
|
|
|
|
|
zap_fieldstab();
|
2013-01-16 11:30:00 +05:30
|
|
|
|
|
2014-02-20 11:30:00 +05:30
|
|
|
|
#ifndef OFF_STDERROR
|
2013-11-03 10:30:00 +05:30
|
|
|
|
/* there's a chance that damn libnuma may spew to stderr so we gotta
|
|
|
|
|
make sure he does not corrupt poor ol' top's first output screen!
|
|
|
|
|
Yes, he provides some overridable 'weak' functions to change such
|
|
|
|
|
behavior but we can't exploit that since we don't follow a normal
|
|
|
|
|
ld route to symbol resolution (we use that dlopen() guy instead)! */
|
2013-11-30 11:30:00 +05:30
|
|
|
|
Stderr_save = dup(fileno(stderr));
|
|
|
|
|
if (-1 < Stderr_save && freopen("/dev/null", "w", stderr))
|
2013-11-03 10:30:00 +05:30
|
|
|
|
; // avoid -Wunused-result
|
|
|
|
|
#endif
|
|
|
|
|
|
2018-09-18 10:30:00 +05:30
|
|
|
|
// with preserved 'other filters' & command line 'user filters',
|
|
|
|
|
// we must ensure that we always have a visible task on row one.
|
2018-06-23 22:30:00 +05:30
|
|
|
|
mkVIZrow1(Curwin);
|
|
|
|
|
|
2013-01-16 11:30:00 +05:30
|
|
|
|
// lastly, initialize a signal set used to throttle one troublesome signal
|
|
|
|
|
sigemptyset(&Sigwinch_set);
|
2013-01-29 11:30:00 +05:30
|
|
|
|
#ifdef SIGNALS_LESS
|
2013-01-16 11:30:00 +05:30
|
|
|
|
sigaddset(&Sigwinch_set, SIGWINCH);
|
2013-01-16 11:30:00 +05:30
|
|
|
|
#endif
|
2011-03-31 16:45:12 +05:30
|
|
|
|
} // end: wins_stage_2
|
2018-06-24 10:30:00 +05:30
|
|
|
|
|
|
|
|
|
|
|
|
|
|
/*
|
|
|
|
|
* Determine if this task matches the 'u/U' selection
|
|
|
|
|
* criteria for a given window */
|
|
|
|
|
static inline int wins_usrselect (const WIN_t *q, const int idx) {
|
|
|
|
|
proc_t *p = q->ppt[idx];
|
|
|
|
|
switch(q->usrseltyp) {
|
|
|
|
|
case 0: // uid selection inactive
|
|
|
|
|
return 1;
|
|
|
|
|
case 'U': // match any uid
|
|
|
|
|
if (p->ruid == q->usrseluid) return q->usrselflg;
|
|
|
|
|
if (p->suid == q->usrseluid) return q->usrselflg;
|
|
|
|
|
if (p->fuid == q->usrseluid) return q->usrselflg;
|
|
|
|
|
// fall through...
|
|
|
|
|
case 'u': // match effective uid
|
|
|
|
|
if (p->euid == q->usrseluid) return q->usrselflg;
|
|
|
|
|
// fall through...
|
|
|
|
|
default: // no match...
|
|
|
|
|
;
|
|
|
|
|
}
|
|
|
|
|
return !q->usrselflg;
|
|
|
|
|
} // end: wins_usrselect
|
2011-03-31 16:45:12 +05:30
|
|
|
|
|
2018-06-19 10:30:00 +05:30
|
|
|
|
/*###### Forest View support ###########################################*/
|
|
|
|
|
|
|
|
|
|
/*
|
2020-08-21 10:30:00 +05:30
|
|
|
|
* We try keeping most existing code unaware of these activities |
|
|
|
|
|
* ( plus, maintain alphabetical order within carefully chosen ) |
|
|
|
|
|
* ( names beginning forest_a, forest_b, forest_c and forest_d ) |
|
|
|
|
|
* ( with each name exactly 1 letter more than its predecessor ) | */
|
|
|
|
|
static proc_t **Seed_ppt; // temporary win ppt pointer |
|
|
|
|
|
static proc_t **Tree_ppt; // forest_create will resize |
|
|
|
|
|
static int Tree_idx; // frame_make resets to zero |
|
|
|
|
|
/* the next three support collapse/expand children. the Hide_pid |
|
|
|
|
|
array holds parent pids whose children have been manipulated. |
|
|
|
|
|
positive pid values represent parents with collapsed children |
|
|
|
|
|
while a negative pid value means children have been expanded. |
|
|
|
|
|
( the first two are managed under the 'keys_task()' routine ) | */
|
|
|
|
|
static int *Hide_pid; // collapsible process array |
|
|
|
|
|
static int Hide_tot; // total used in above array |
|
top: parent total cpu includes collapsed children, pgm
Now, when a parent's children have been collapsed, the
cpu used by those unseen tasks will disappear no more.
Instead such tics will be added to the parent's total.
[ if one wished a return to the 'land of lost tics', ]
[ the '#define TREE_VCPUOFF' directive is available. ]
------------------------------------------------------
Note: With collapsible parents now displaying children
cpu usage, it will eventually be noticed the cpu stats
for the summary area and task areas often vary widely.
It's worth a reminder that for top's summary area each
individual cpu and the cpu summary is limited to 100%,
regardless of how many tics a linux kernel may export.
An individual task is limited to 100% times the number
of threads. But, in no case will cpu usage ever exceed
100% times total number of processors. Such limits are
further reduced under 'Solaris' mode ('I' toggle off).
In this mode, a task cpu usage will never exceed 100%.
These limits will now also apply to collapsed parents.
In addition to those influences, results are subjected
to kernel timer sampling anomalies and the distortions
inherent in a small sample size, made worse by smaller
delay intervals. Often there is just 1 or 2 tics for a
few tasks at smaller intervals such as: 1/10th second.
Anyway, should questions on this subject arise, a good
starting point, beyond the reminders above, is the 1st
link listed below. Those other links were derivatives.
Reference(s):
. from the kernel documentation
https://www.kernel.org/doc/Documentation/cpu-load.txt
. as mentioned in the above kernel documentation
https://lkml.org/lkml/2007/2/12/6
. from above, with many more links on the subject
https://www.boblycat.org/~malc/apc/
Signed-off-by: Jim Warner <james.warner@comcast.net>
top: parent total cpu includes collapsed children, pgm
2018-06-25 10:30:00 +05:30
|
|
|
|
#ifndef TREE_VCPUOFF
|
2020-08-21 10:30:00 +05:30
|
|
|
|
static unsigned *Hide_cpu; // accum tics from collapsed |
|
top: parent total cpu includes collapsed children, pgm
Now, when a parent's children have been collapsed, the
cpu used by those unseen tasks will disappear no more.
Instead such tics will be added to the parent's total.
[ if one wished a return to the 'land of lost tics', ]
[ the '#define TREE_VCPUOFF' directive is available. ]
------------------------------------------------------
Note: With collapsible parents now displaying children
cpu usage, it will eventually be noticed the cpu stats
for the summary area and task areas often vary widely.
It's worth a reminder that for top's summary area each
individual cpu and the cpu summary is limited to 100%,
regardless of how many tics a linux kernel may export.
An individual task is limited to 100% times the number
of threads. But, in no case will cpu usage ever exceed
100% times total number of processors. Such limits are
further reduced under 'Solaris' mode ('I' toggle off).
In this mode, a task cpu usage will never exceed 100%.
These limits will now also apply to collapsed parents.
In addition to those influences, results are subjected
to kernel timer sampling anomalies and the distortions
inherent in a small sample size, made worse by smaller
delay intervals. Often there is just 1 or 2 tics for a
few tasks at smaller intervals such as: 1/10th second.
Anyway, should questions on this subject arise, a good
starting point, beyond the reminders above, is the 1st
link listed below. Those other links were derivatives.
Reference(s):
. from the kernel documentation
https://www.kernel.org/doc/Documentation/cpu-load.txt
. as mentioned in the above kernel documentation
https://lkml.org/lkml/2007/2/12/6
. from above, with many more links on the subject
https://www.boblycat.org/~malc/apc/
Signed-off-by: Jim Warner <james.warner@comcast.net>
top: parent total cpu includes collapsed children, pgm
2018-06-25 10:30:00 +05:30
|
|
|
|
#endif
|
2018-06-19 10:30:00 +05:30
|
|
|
|
|
|
|
|
|
/*
|
2020-08-21 10:30:00 +05:30
|
|
|
|
* This little recursive guy was the real forest view workhorse. |
|
|
|
|
|
* He fills in the Tree_ppt array and also sets the child indent |
|
|
|
|
|
* level which is stored in an 'extra' result struct as a u_int. | */
|
2018-06-19 10:30:00 +05:30
|
|
|
|
static void forest_adds (const int self, int level) {
|
|
|
|
|
int i;
|
|
|
|
|
|
2020-08-21 10:30:00 +05:30
|
|
|
|
if (Tree_idx < Frame_maxtask) { // immunize against insanity |
|
|
|
|
|
if (level > 100) level = 101; // our arbitrary nests limit |
|
|
|
|
|
Tree_ppt[Tree_idx] = Seed_ppt[self]; // add this as root or child |
|
|
|
|
|
Tree_ppt[Tree_idx++]->pad_3 = level; // borrow 1 byte, 127 levels |
|
2018-06-19 10:30:00 +05:30
|
|
|
|
#ifdef TREE_SCANALL
|
|
|
|
|
for (i = 0; i < Frame_maxtask; i++) {
|
|
|
|
|
if (i == self) continue;
|
|
|
|
|
#else
|
|
|
|
|
for (i = self + 1; i < Frame_maxtask; i++) {
|
|
|
|
|
#endif
|
|
|
|
|
if (Seed_ppt[self]->tid == Seed_ppt[i]->tgid
|
|
|
|
|
|| (Seed_ppt[self]->tid == Seed_ppt[i]->ppid && Seed_ppt[i]->tid == Seed_ppt[i]->tgid))
|
|
|
|
|
forest_adds(i, level + 1); // got one child any others?
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
} // end: forest_adds
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
#ifndef TREE_SCANALL
|
|
|
|
|
/*
|
2020-08-21 10:30:00 +05:30
|
|
|
|
* A qsort callback to order a ppt by the non-display start_time |
|
|
|
|
|
* which will make us immune to any pid, ppid and tgid anomalies |
|
|
|
|
|
* if/when the pid values ever become are wrapped by the kernel! | */
|
2018-06-19 10:30:00 +05:30
|
|
|
|
static int forest_based (const proc_t **x, const proc_t **y) {
|
|
|
|
|
if ( (*x)->start_time > (*y)->start_time ) return 1;
|
|
|
|
|
if ( (*x)->start_time < (*y)->start_time ) return -1;
|
|
|
|
|
return 0;
|
|
|
|
|
} // end: forest_based
|
|
|
|
|
#endif
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
/*
|
2020-08-21 10:30:00 +05:30
|
|
|
|
* This function is responsible for preparing those proc_t's for |
|
|
|
|
|
* a forest display in that designated window. After completion, |
|
|
|
|
|
* he'll replace that original window ppt array with a specially |
|
|
|
|
|
* ordered forest view version. He'll also mark hidden children! | */
|
2018-06-19 10:30:00 +05:30
|
|
|
|
static void forest_create (WIN_t *q) {
|
|
|
|
|
static int hwmsav;
|
2018-06-19 10:30:00 +05:30
|
|
|
|
int i, j;
|
2018-06-19 10:30:00 +05:30
|
|
|
|
|
2020-08-21 10:30:00 +05:30
|
|
|
|
Seed_ppt = q->ppt; // avoid passing pointers |
|
|
|
|
|
if (!Tree_idx) { // do just once per frame |
|
|
|
|
|
if (hwmsav < Frame_maxtask) { // grow, but never shrink |
|
2018-06-19 10:30:00 +05:30
|
|
|
|
hwmsav = Frame_maxtask;
|
2018-08-08 10:30:00 +05:30
|
|
|
|
Tree_ppt = alloc_r(Tree_ppt, sizeof(proc_t *) * hwmsav);
|
top: parent total cpu includes collapsed children, pgm
Now, when a parent's children have been collapsed, the
cpu used by those unseen tasks will disappear no more.
Instead such tics will be added to the parent's total.
[ if one wished a return to the 'land of lost tics', ]
[ the '#define TREE_VCPUOFF' directive is available. ]
------------------------------------------------------
Note: With collapsible parents now displaying children
cpu usage, it will eventually be noticed the cpu stats
for the summary area and task areas often vary widely.
It's worth a reminder that for top's summary area each
individual cpu and the cpu summary is limited to 100%,
regardless of how many tics a linux kernel may export.
An individual task is limited to 100% times the number
of threads. But, in no case will cpu usage ever exceed
100% times total number of processors. Such limits are
further reduced under 'Solaris' mode ('I' toggle off).
In this mode, a task cpu usage will never exceed 100%.
These limits will now also apply to collapsed parents.
In addition to those influences, results are subjected
to kernel timer sampling anomalies and the distortions
inherent in a small sample size, made worse by smaller
delay intervals. Often there is just 1 or 2 tics for a
few tasks at smaller intervals such as: 1/10th second.
Anyway, should questions on this subject arise, a good
starting point, beyond the reminders above, is the 1st
link listed below. Those other links were derivatives.
Reference(s):
. from the kernel documentation
https://www.kernel.org/doc/Documentation/cpu-load.txt
. as mentioned in the above kernel documentation
https://lkml.org/lkml/2007/2/12/6
. from above, with many more links on the subject
https://www.boblycat.org/~malc/apc/
Signed-off-by: Jim Warner <james.warner@comcast.net>
top: parent total cpu includes collapsed children, pgm
2018-06-25 10:30:00 +05:30
|
|
|
|
#ifndef TREE_VCPUOFF
|
2018-07-17 10:30:00 +05:30
|
|
|
|
Hide_cpu = alloc_r(Hide_cpu, sizeof(unsigned) * hwmsav);
|
top: parent total cpu includes collapsed children, pgm
Now, when a parent's children have been collapsed, the
cpu used by those unseen tasks will disappear no more.
Instead such tics will be added to the parent's total.
[ if one wished a return to the 'land of lost tics', ]
[ the '#define TREE_VCPUOFF' directive is available. ]
------------------------------------------------------
Note: With collapsible parents now displaying children
cpu usage, it will eventually be noticed the cpu stats
for the summary area and task areas often vary widely.
It's worth a reminder that for top's summary area each
individual cpu and the cpu summary is limited to 100%,
regardless of how many tics a linux kernel may export.
An individual task is limited to 100% times the number
of threads. But, in no case will cpu usage ever exceed
100% times total number of processors. Such limits are
further reduced under 'Solaris' mode ('I' toggle off).
In this mode, a task cpu usage will never exceed 100%.
These limits will now also apply to collapsed parents.
In addition to those influences, results are subjected
to kernel timer sampling anomalies and the distortions
inherent in a small sample size, made worse by smaller
delay intervals. Often there is just 1 or 2 tics for a
few tasks at smaller intervals such as: 1/10th second.
Anyway, should questions on this subject arise, a good
starting point, beyond the reminders above, is the 1st
link listed below. Those other links were derivatives.
Reference(s):
. from the kernel documentation
https://www.kernel.org/doc/Documentation/cpu-load.txt
. as mentioned in the above kernel documentation
https://lkml.org/lkml/2007/2/12/6
. from above, with many more links on the subject
https://www.boblycat.org/~malc/apc/
Signed-off-by: Jim Warner <james.warner@comcast.net>
top: parent total cpu includes collapsed children, pgm
2018-06-25 10:30:00 +05:30
|
|
|
|
#endif
|
2018-06-19 10:30:00 +05:30
|
|
|
|
}
|
2018-06-19 10:30:00 +05:30
|
|
|
|
|
2018-06-19 10:30:00 +05:30
|
|
|
|
#ifndef TREE_SCANALL
|
2018-08-08 10:30:00 +05:30
|
|
|
|
qsort(Seed_ppt, Frame_maxtask, sizeof(proc_t *), (QFP_t)forest_based);
|
2018-06-19 10:30:00 +05:30
|
|
|
|
#endif
|
2020-08-21 10:30:00 +05:30
|
|
|
|
for (i = 0; i < Frame_maxtask; i++) { // avoid hidepid distorts |
|
|
|
|
|
if (!Seed_ppt[i]->pad_3) // parents are at level 0 |
|
|
|
|
|
forest_adds(i, 0); // add parents + children |
|
2018-06-24 10:30:00 +05:30
|
|
|
|
}
|
top: parent total cpu includes collapsed children, pgm
Now, when a parent's children have been collapsed, the
cpu used by those unseen tasks will disappear no more.
Instead such tics will be added to the parent's total.
[ if one wished a return to the 'land of lost tics', ]
[ the '#define TREE_VCPUOFF' directive is available. ]
------------------------------------------------------
Note: With collapsible parents now displaying children
cpu usage, it will eventually be noticed the cpu stats
for the summary area and task areas often vary widely.
It's worth a reminder that for top's summary area each
individual cpu and the cpu summary is limited to 100%,
regardless of how many tics a linux kernel may export.
An individual task is limited to 100% times the number
of threads. But, in no case will cpu usage ever exceed
100% times total number of processors. Such limits are
further reduced under 'Solaris' mode ('I' toggle off).
In this mode, a task cpu usage will never exceed 100%.
These limits will now also apply to collapsed parents.
In addition to those influences, results are subjected
to kernel timer sampling anomalies and the distortions
inherent in a small sample size, made worse by smaller
delay intervals. Often there is just 1 or 2 tics for a
few tasks at smaller intervals such as: 1/10th second.
Anyway, should questions on this subject arise, a good
starting point, beyond the reminders above, is the 1st
link listed below. Those other links were derivatives.
Reference(s):
. from the kernel documentation
https://www.kernel.org/doc/Documentation/cpu-load.txt
. as mentioned in the above kernel documentation
https://lkml.org/lkml/2007/2/12/6
. from above, with many more links on the subject
https://www.boblycat.org/~malc/apc/
Signed-off-by: Jim Warner <james.warner@comcast.net>
top: parent total cpu includes collapsed children, pgm
2018-06-25 10:30:00 +05:30
|
|
|
|
#ifndef TREE_VCPUOFF
|
2018-07-17 10:30:00 +05:30
|
|
|
|
memset(Hide_cpu, 0, sizeof(unsigned) * Frame_maxtask);
|
top: parent total cpu includes collapsed children, pgm
Now, when a parent's children have been collapsed, the
cpu used by those unseen tasks will disappear no more.
Instead such tics will be added to the parent's total.
[ if one wished a return to the 'land of lost tics', ]
[ the '#define TREE_VCPUOFF' directive is available. ]
------------------------------------------------------
Note: With collapsible parents now displaying children
cpu usage, it will eventually be noticed the cpu stats
for the summary area and task areas often vary widely.
It's worth a reminder that for top's summary area each
individual cpu and the cpu summary is limited to 100%,
regardless of how many tics a linux kernel may export.
An individual task is limited to 100% times the number
of threads. But, in no case will cpu usage ever exceed
100% times total number of processors. Such limits are
further reduced under 'Solaris' mode ('I' toggle off).
In this mode, a task cpu usage will never exceed 100%.
These limits will now also apply to collapsed parents.
In addition to those influences, results are subjected
to kernel timer sampling anomalies and the distortions
inherent in a small sample size, made worse by smaller
delay intervals. Often there is just 1 or 2 tics for a
few tasks at smaller intervals such as: 1/10th second.
Anyway, should questions on this subject arise, a good
starting point, beyond the reminders above, is the 1st
link listed below. Those other links were derivatives.
Reference(s):
. from the kernel documentation
https://www.kernel.org/doc/Documentation/cpu-load.txt
. as mentioned in the above kernel documentation
https://lkml.org/lkml/2007/2/12/6
. from above, with many more links on the subject
https://www.boblycat.org/~malc/apc/
Signed-off-by: Jim Warner <james.warner@comcast.net>
top: parent total cpu includes collapsed children, pgm
2018-06-25 10:30:00 +05:30
|
|
|
|
#endif
|
2020-08-21 10:30:00 +05:30
|
|
|
|
/* now we're going to borrow a couple of 'pad' bytes in the proc_t |
|
|
|
|
|
pad_2: 'x' means a collapsed thread & 'z' means an unseen child |
|
|
|
|
|
pad_3: this is where the level numbers will be stored (0 - 100) | */
|
2018-06-19 10:30:00 +05:30
|
|
|
|
for (i = 0; i < Hide_tot; i++) {
|
|
|
|
|
if (Hide_pid[i] > 0) {
|
|
|
|
|
for (j = 0; j < Frame_maxtask; j++) {
|
|
|
|
|
if (Tree_ppt[j]->tid == Hide_pid[i]) {
|
2018-06-24 10:30:00 +05:30
|
|
|
|
int parent = j;
|
|
|
|
|
int children = 0;
|
|
|
|
|
char level = Tree_ppt[j]->pad_3;
|
|
|
|
|
|
|
|
|
|
while (j+1 < Frame_maxtask && Tree_ppt[j+1]->pad_3 > level) {
|
2018-07-04 10:30:00 +05:30
|
|
|
|
++j;
|
|
|
|
|
Tree_ppt[j]->pad_2 = 'z';
|
top: parent total cpu includes collapsed children, pgm
Now, when a parent's children have been collapsed, the
cpu used by those unseen tasks will disappear no more.
Instead such tics will be added to the parent's total.
[ if one wished a return to the 'land of lost tics', ]
[ the '#define TREE_VCPUOFF' directive is available. ]
------------------------------------------------------
Note: With collapsible parents now displaying children
cpu usage, it will eventually be noticed the cpu stats
for the summary area and task areas often vary widely.
It's worth a reminder that for top's summary area each
individual cpu and the cpu summary is limited to 100%,
regardless of how many tics a linux kernel may export.
An individual task is limited to 100% times the number
of threads. But, in no case will cpu usage ever exceed
100% times total number of processors. Such limits are
further reduced under 'Solaris' mode ('I' toggle off).
In this mode, a task cpu usage will never exceed 100%.
These limits will now also apply to collapsed parents.
In addition to those influences, results are subjected
to kernel timer sampling anomalies and the distortions
inherent in a small sample size, made worse by smaller
delay intervals. Often there is just 1 or 2 tics for a
few tasks at smaller intervals such as: 1/10th second.
Anyway, should questions on this subject arise, a good
starting point, beyond the reminders above, is the 1st
link listed below. Those other links were derivatives.
Reference(s):
. from the kernel documentation
https://www.kernel.org/doc/Documentation/cpu-load.txt
. as mentioned in the above kernel documentation
https://lkml.org/lkml/2007/2/12/6
. from above, with many more links on the subject
https://www.boblycat.org/~malc/apc/
Signed-off-by: Jim Warner <james.warner@comcast.net>
top: parent total cpu includes collapsed children, pgm
2018-06-25 10:30:00 +05:30
|
|
|
|
#ifndef TREE_VCPUOFF
|
2018-07-04 10:30:00 +05:30
|
|
|
|
Hide_cpu[parent] += Tree_ppt[j]->pcpu;
|
top: parent total cpu includes collapsed children, pgm
Now, when a parent's children have been collapsed, the
cpu used by those unseen tasks will disappear no more.
Instead such tics will be added to the parent's total.
[ if one wished a return to the 'land of lost tics', ]
[ the '#define TREE_VCPUOFF' directive is available. ]
------------------------------------------------------
Note: With collapsible parents now displaying children
cpu usage, it will eventually be noticed the cpu stats
for the summary area and task areas often vary widely.
It's worth a reminder that for top's summary area each
individual cpu and the cpu summary is limited to 100%,
regardless of how many tics a linux kernel may export.
An individual task is limited to 100% times the number
of threads. But, in no case will cpu usage ever exceed
100% times total number of processors. Such limits are
further reduced under 'Solaris' mode ('I' toggle off).
In this mode, a task cpu usage will never exceed 100%.
These limits will now also apply to collapsed parents.
In addition to those influences, results are subjected
to kernel timer sampling anomalies and the distortions
inherent in a small sample size, made worse by smaller
delay intervals. Often there is just 1 or 2 tics for a
few tasks at smaller intervals such as: 1/10th second.
Anyway, should questions on this subject arise, a good
starting point, beyond the reminders above, is the 1st
link listed below. Those other links were derivatives.
Reference(s):
. from the kernel documentation
https://www.kernel.org/doc/Documentation/cpu-load.txt
. as mentioned in the above kernel documentation
https://lkml.org/lkml/2007/2/12/6
. from above, with many more links on the subject
https://www.boblycat.org/~malc/apc/
Signed-off-by: Jim Warner <james.warner@comcast.net>
top: parent total cpu includes collapsed children, pgm
2018-06-25 10:30:00 +05:30
|
|
|
|
#endif
|
2018-06-24 10:30:00 +05:30
|
|
|
|
children = 1;
|
2018-06-19 10:30:00 +05:30
|
|
|
|
}
|
2020-08-21 10:30:00 +05:30
|
|
|
|
/* if any children found (& collapsed) mark the parent |
|
|
|
|
|
( when children aren't found don't negate the pid ) |
|
|
|
|
|
( to prevent future scans since who's to say such ) |
|
|
|
|
|
( tasks will not fork more children in the future ) | */
|
2018-06-24 10:30:00 +05:30
|
|
|
|
if (children) Tree_ppt[parent]->pad_2 = 'x';
|
2020-08-21 10:30:00 +05:30
|
|
|
|
// this will force a check of next Hide_pid[i], if any |
|
top: a tweak to the forest view collapsed code (again)
From the outset, top has tried to provide some minimal
garbage collection in support of forest view collapse.
For example, with every 'v' keystroke, a check is made
of the currently targeted pids. If all were negative,
which means expanded, that Hide_pid array was emptied.
Recently, yet another efficiency was added wherein the
continuing scan for a targeted pid was terminated when
a match was found. But, one more inefficiency existed.
When a task which was subject to collapse under forest
view mode has disappeared (ended), repeatedly scanning
for such a pid with each iteration makes little sense.
So this commit will negate such targeted pids and thus
avoid scanning every current task looking for a match.
Then, if 'v' is ever stuck at some point in the future
there will be a chance to empty that Hide_pid[] array.
[ hopefully this will be a final tweak of the forest ]
[ view collapse stuff, but cross your fingers anyway ]
Signed-off-by: Jim Warner <james.warner@comcast.net>
2018-08-21 10:30:00 +05:30
|
|
|
|
j = Frame_maxtask + 1;
|
2018-06-19 10:30:00 +05:30
|
|
|
|
}
|
|
|
|
|
}
|
2020-08-21 10:30:00 +05:30
|
|
|
|
// if a target task disappeared prevent any further scanning |
|
top: a tweak to the forest view collapsed code (again)
From the outset, top has tried to provide some minimal
garbage collection in support of forest view collapse.
For example, with every 'v' keystroke, a check is made
of the currently targeted pids. If all were negative,
which means expanded, that Hide_pid array was emptied.
Recently, yet another efficiency was added wherein the
continuing scan for a targeted pid was terminated when
a match was found. But, one more inefficiency existed.
When a task which was subject to collapse under forest
view mode has disappeared (ended), repeatedly scanning
for such a pid with each iteration makes little sense.
So this commit will negate such targeted pids and thus
avoid scanning every current task looking for a match.
Then, if 'v' is ever stuck at some point in the future
there will be a chance to empty that Hide_pid[] array.
[ hopefully this will be a final tweak of the forest ]
[ view collapse stuff, but cross your fingers anyway ]
Signed-off-by: Jim Warner <james.warner@comcast.net>
2018-08-21 10:30:00 +05:30
|
|
|
|
if (j == Frame_maxtask) Hide_pid[i] = -Hide_pid[i];
|
2018-06-19 10:30:00 +05:30
|
|
|
|
}
|
|
|
|
|
}
|
2018-06-19 10:30:00 +05:30
|
|
|
|
}
|
2018-08-08 10:30:00 +05:30
|
|
|
|
memcpy(Seed_ppt, Tree_ppt, sizeof(proc_t *) * Frame_maxtask);
|
2018-06-19 10:30:00 +05:30
|
|
|
|
} // end: forest_create
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
/*
|
2020-08-21 10:30:00 +05:30
|
|
|
|
* This guy adds the artwork to either 'cmd' or 'cmdline' values |
|
|
|
|
|
* when we're in forest view mode otherwise he just returns them | */
|
2018-06-19 10:30:00 +05:30
|
|
|
|
static inline const char *forest_display (const WIN_t *q, const proc_t *p) {
|
|
|
|
|
#ifndef SCROLLVAR_NO
|
|
|
|
|
static char buf[1024*64*2]; // the same as readproc's MAX_BUFSZ
|
|
|
|
|
#else
|
|
|
|
|
static char buf[ROWMINSIZ];
|
|
|
|
|
#endif
|
|
|
|
|
const char *which = (CHKw(q, Show_CMDLIN)) ? *p->cmdline : p->cmd;
|
|
|
|
|
|
|
|
|
|
if (!CHKw(q, Show_FOREST) || !p->pad_3) return which;
|
2018-06-19 10:30:00 +05:30
|
|
|
|
#ifndef TREE_VWINALL
|
2018-06-23 22:30:00 +05:30
|
|
|
|
if (q == Curwin) // note: the following is NOT indented
|
2018-06-19 10:30:00 +05:30
|
|
|
|
#endif
|
|
|
|
|
if (p->pad_2 == 'x') {
|
2018-10-01 10:30:00 +05:30
|
|
|
|
#ifdef TREE_VALTMRK
|
|
|
|
|
snprintf(buf, sizeof(buf), "%*s%s", (4 * p->pad_3), "`+ ", which);
|
|
|
|
|
#else
|
2018-06-19 10:30:00 +05:30
|
|
|
|
snprintf(buf, sizeof(buf), "+%*s%s", ((4 * p->pad_3) - 1), "`- ", which);
|
2018-10-01 10:30:00 +05:30
|
|
|
|
#endif
|
2018-06-19 10:30:00 +05:30
|
|
|
|
return buf;
|
|
|
|
|
}
|
2018-06-19 10:30:00 +05:30
|
|
|
|
if (p->pad_3 > 100) snprintf(buf, sizeof(buf), "%400s%s", " + ", which);
|
|
|
|
|
else snprintf(buf, sizeof(buf), "%*s%s", (4 * p->pad_3), " `- ", which);
|
|
|
|
|
return buf;
|
|
|
|
|
} // end: forest_display
|
|
|
|
|
|
2013-03-03 11:30:00 +05:30
|
|
|
|
/*###### Interactive Input Tertiary support ############################*/
|
2002-05-30 09:14:46 +05:30
|
|
|
|
|
2013-03-03 11:30:00 +05:30
|
|
|
|
/*
|
|
|
|
|
* This section exists so as to offer some function naming freedom
|
|
|
|
|
* while also maintaining the strict alphabetical order protocol
|
|
|
|
|
* within each section. */
|
2002-05-30 09:14:46 +05:30
|
|
|
|
|
top: highlight all regular search string(s) when found
With the recent inspect search highlight provisions in
place, the lack of highlighting in task based searches
has grown from being only irritating to a real defect.
Thus, this commit introduces parallel functionality to
those searches initiated within a visible task window.
And just as separate inspect searches are possible for
each selection, per window task searches are provided.
However, it should be noted that there are differences
between task based searches and inspect type searches:
* There is no concept of out-of-view data when dealing
. with task rows -- if the data can't bee seen, it has
. not, in fact, been constructed from a proc_t struct.
* While inspect data is output at the character level,
. up to now all task display data was only potentially
. output and it was always based on a complete string.
* With task search highlighting, rows now containing a
. match must be output in pieces and, therefore, can't
. be optimized away like other rows which haven't been
. been altered. This is because top cannot predict the
. the contents of a search string or, how many matches
. might occur in a given row. Short search strings and
. many matches would raise buffer needs geometrically.
(now that we know a '.' + 2 spaces is squeezed to one)
(everything's perfectly justified, but it's just luck)
Signed-off-by: Jim Warner <james.warner@comcast.net>
2012-12-08 11:30:00 +05:30
|
|
|
|
/*
|
|
|
|
|
* This guy is a *Helper* function serving the following two masters:
|
|
|
|
|
* find_string() - find the next match in a given window
|
|
|
|
|
* task_show() - highlight all matches currently in-view
|
|
|
|
|
* If q->findstr is found in the designated buffer, he returns the
|
|
|
|
|
* offset from the start of the buffer, otherwise he returns -1. */
|
|
|
|
|
static inline int find_ofs (const WIN_t *q, const char *buf) {
|
|
|
|
|
char *fnd;
|
|
|
|
|
|
|
|
|
|
if (q->findstr[0] && (fnd = STRSTR(buf, q->findstr)))
|
|
|
|
|
return (int)(fnd - buf);
|
|
|
|
|
return -1;
|
|
|
|
|
} // end: find_ofs
|
|
|
|
|
|
|
|
|
|
|
2012-02-11 13:32:02 +05:30
|
|
|
|
|
|
|
|
|
/* This is currently the one true prototype require by top.
|
|
|
|
|
It is placed here, instead of top.h, so as to avoid a compiler
|
|
|
|
|
warning when top_nls.c is compiled. */
|
2018-06-24 10:30:00 +05:30
|
|
|
|
static const char *task_show (const WIN_t *q, const int idx);
|
2012-02-11 13:32:02 +05:30
|
|
|
|
|
2011-12-17 01:34:38 +05:30
|
|
|
|
static void find_string (int ch) {
|
2011-12-21 02:13:54 +05:30
|
|
|
|
#define reDUX (found) ? N_txt(WORD_another_txt) : ""
|
2011-12-17 01:34:38 +05:30
|
|
|
|
static int found;
|
|
|
|
|
int i;
|
|
|
|
|
|
top: highlight all regular search string(s) when found
With the recent inspect search highlight provisions in
place, the lack of highlighting in task based searches
has grown from being only irritating to a real defect.
Thus, this commit introduces parallel functionality to
those searches initiated within a visible task window.
And just as separate inspect searches are possible for
each selection, per window task searches are provided.
However, it should be noted that there are differences
between task based searches and inspect type searches:
* There is no concept of out-of-view data when dealing
. with task rows -- if the data can't bee seen, it has
. not, in fact, been constructed from a proc_t struct.
* While inspect data is output at the character level,
. up to now all task display data was only potentially
. output and it was always based on a complete string.
* With task search highlighting, rows now containing a
. match must be output in pieces and, therefore, can't
. be optimized away like other rows which haven't been
. been altered. This is because top cannot predict the
. the contents of a search string or, how many matches
. might occur in a given row. Short search strings and
. many matches would raise buffer needs geometrically.
(now that we know a '.' + 2 spaces is squeezed to one)
(everything's perfectly justified, but it's just luck)
Signed-off-by: Jim Warner <james.warner@comcast.net>
2012-12-08 11:30:00 +05:30
|
|
|
|
if ('&' == ch && !Curwin->findstr[0]) {
|
2011-12-21 02:13:54 +05:30
|
|
|
|
show_msg(N_txt(FIND_no_next_txt));
|
2011-12-17 01:34:38 +05:30
|
|
|
|
return;
|
|
|
|
|
}
|
|
|
|
|
if ('L' == ch) {
|
2014-04-27 10:30:00 +05:30
|
|
|
|
char *str = ioline(N_txt(GET_find_str_txt));
|
|
|
|
|
if (*str == kbd_ESC) return;
|
|
|
|
|
snprintf(Curwin->findstr, FNDBUFSIZ, "%s", str);
|
top: highlight all regular search string(s) when found
With the recent inspect search highlight provisions in
place, the lack of highlighting in task based searches
has grown from being only irritating to a real defect.
Thus, this commit introduces parallel functionality to
those searches initiated within a visible task window.
And just as separate inspect searches are possible for
each selection, per window task searches are provided.
However, it should be noted that there are differences
between task based searches and inspect type searches:
* There is no concept of out-of-view data when dealing
. with task rows -- if the data can't bee seen, it has
. not, in fact, been constructed from a proc_t struct.
* While inspect data is output at the character level,
. up to now all task display data was only potentially
. output and it was always based on a complete string.
* With task search highlighting, rows now containing a
. match must be output in pieces and, therefore, can't
. be optimized away like other rows which haven't been
. been altered. This is because top cannot predict the
. the contents of a search string or, how many matches
. might occur in a given row. Short search strings and
. many matches would raise buffer needs geometrically.
(now that we know a '.' + 2 spaces is squeezed to one)
(everything's perfectly justified, but it's just luck)
Signed-off-by: Jim Warner <james.warner@comcast.net>
2012-12-08 11:30:00 +05:30
|
|
|
|
Curwin->findlen = strlen(Curwin->findstr);
|
2011-12-17 01:34:38 +05:30
|
|
|
|
found = 0;
|
2013-01-04 11:30:00 +05:30
|
|
|
|
#ifndef USE_X_COLHDR
|
2013-03-03 11:30:00 +05:30
|
|
|
|
if (Curwin->findstr[0]) SETw(Curwin, NOHIFND_xxx);
|
|
|
|
|
else OFFw(Curwin, NOHIFND_xxx);
|
2013-01-04 11:30:00 +05:30
|
|
|
|
#endif
|
2011-12-17 01:34:38 +05:30
|
|
|
|
}
|
top: highlight all regular search string(s) when found
With the recent inspect search highlight provisions in
place, the lack of highlighting in task based searches
has grown from being only irritating to a real defect.
Thus, this commit introduces parallel functionality to
those searches initiated within a visible task window.
And just as separate inspect searches are possible for
each selection, per window task searches are provided.
However, it should be noted that there are differences
between task based searches and inspect type searches:
* There is no concept of out-of-view data when dealing
. with task rows -- if the data can't bee seen, it has
. not, in fact, been constructed from a proc_t struct.
* While inspect data is output at the character level,
. up to now all task display data was only potentially
. output and it was always based on a complete string.
* With task search highlighting, rows now containing a
. match must be output in pieces and, therefore, can't
. be optimized away like other rows which haven't been
. been altered. This is because top cannot predict the
. the contents of a search string or, how many matches
. might occur in a given row. Short search strings and
. many matches would raise buffer needs geometrically.
(now that we know a '.' + 2 spaces is squeezed to one)
(everything's perfectly justified, but it's just luck)
Signed-off-by: Jim Warner <james.warner@comcast.net>
2012-12-08 11:30:00 +05:30
|
|
|
|
if (Curwin->findstr[0]) {
|
2018-06-20 10:30:00 +05:30
|
|
|
|
SETw(Curwin, NOPRINT_xxx);
|
2011-12-17 01:34:38 +05:30
|
|
|
|
for (i = Curwin->begtask; i < Frame_maxtask; i++) {
|
2018-06-24 10:30:00 +05:30
|
|
|
|
const char *row = task_show(Curwin, i);
|
2013-03-03 11:30:00 +05:30
|
|
|
|
if (*row && -1 < find_ofs(Curwin, row)) {
|
2011-12-17 01:34:38 +05:30
|
|
|
|
found = 1;
|
|
|
|
|
if (i == Curwin->begtask) continue;
|
|
|
|
|
Curwin->begtask = i;
|
|
|
|
|
return;
|
|
|
|
|
}
|
|
|
|
|
}
|
top: highlight all regular search string(s) when found
With the recent inspect search highlight provisions in
place, the lack of highlighting in task based searches
has grown from being only irritating to a real defect.
Thus, this commit introduces parallel functionality to
those searches initiated within a visible task window.
And just as separate inspect searches are possible for
each selection, per window task searches are provided.
However, it should be noted that there are differences
between task based searches and inspect type searches:
* There is no concept of out-of-view data when dealing
. with task rows -- if the data can't bee seen, it has
. not, in fact, been constructed from a proc_t struct.
* While inspect data is output at the character level,
. up to now all task display data was only potentially
. output and it was always based on a complete string.
* With task search highlighting, rows now containing a
. match must be output in pieces and, therefore, can't
. be optimized away like other rows which haven't been
. been altered. This is because top cannot predict the
. the contents of a search string or, how many matches
. might occur in a given row. Short search strings and
. many matches would raise buffer needs geometrically.
(now that we know a '.' + 2 spaces is squeezed to one)
(everything's perfectly justified, but it's just luck)
Signed-off-by: Jim Warner <james.warner@comcast.net>
2012-12-08 11:30:00 +05:30
|
|
|
|
show_msg(fmtmk(N_fmt(FIND_no_find_fmt), reDUX, Curwin->findstr));
|
2011-12-17 01:34:38 +05:30
|
|
|
|
}
|
|
|
|
|
#undef reDUX
|
|
|
|
|
} // end: find_string
|
|
|
|
|
|
|
|
|
|
|
2011-03-31 16:45:12 +05:30
|
|
|
|
static void help_view (void) {
|
|
|
|
|
WIN_t *w = Curwin; // avoid gcc bloat with a local copy
|
2013-01-16 11:30:00 +05:30
|
|
|
|
char key = 1;
|
2002-05-30 09:14:46 +05:30
|
|
|
|
|
2013-01-29 11:30:00 +05:30
|
|
|
|
putp((Cursor_state = Cap_curs_huge));
|
2013-01-16 11:30:00 +05:30
|
|
|
|
signify_that:
|
2011-03-31 16:45:12 +05:30
|
|
|
|
putp(Cap_clr_scr);
|
2013-01-16 11:30:00 +05:30
|
|
|
|
adj_geometry();
|
2002-05-30 09:14:46 +05:30
|
|
|
|
|
2011-10-12 00:32:59 +05:30
|
|
|
|
show_special(1, fmtmk(N_unq(KEYS_helpbas_fmt)
|
2015-06-18 18:07:24 +05:30
|
|
|
|
, PACKAGE_STRING
|
2011-03-31 16:45:12 +05:30
|
|
|
|
, w->grpname
|
2011-10-12 00:32:59 +05:30
|
|
|
|
, CHKw(w, Show_CTIMES) ? N_txt(ON_word_only_txt) : N_txt(OFF_one_word_txt)
|
2011-03-31 16:45:12 +05:30
|
|
|
|
, Rc.delay_time
|
2011-10-12 00:32:59 +05:30
|
|
|
|
, Secure_mode ? N_txt(ON_word_only_txt) : N_txt(OFF_one_word_txt)
|
|
|
|
|
, Secure_mode ? "" : N_unq(KEYS_helpext_fmt)));
|
2013-01-16 11:30:00 +05:30
|
|
|
|
putp(Cap_clr_eos);
|
|
|
|
|
fflush(stdout);
|
2011-03-31 16:45:12 +05:30
|
|
|
|
|
2013-06-30 10:30:00 +05:30
|
|
|
|
if (Frames_signal) goto signify_that;
|
2013-02-15 11:30:00 +05:30
|
|
|
|
key = iokey(1);
|
2013-01-16 11:30:00 +05:30
|
|
|
|
if (key < 1) goto signify_that;
|
|
|
|
|
|
|
|
|
|
switch (key) {
|
|
|
|
|
case kbd_ESC: case 'q':
|
|
|
|
|
break;
|
|
|
|
|
case '?': case 'h': case 'H':
|
|
|
|
|
do {
|
|
|
|
|
putp(Cap_home);
|
|
|
|
|
show_special(1, fmtmk(N_unq(WINDOWS_help_fmt)
|
|
|
|
|
, w->grpname
|
|
|
|
|
, Winstk[0].rc.winname, Winstk[1].rc.winname
|
|
|
|
|
, Winstk[2].rc.winname, Winstk[3].rc.winname));
|
|
|
|
|
putp(Cap_clr_eos);
|
|
|
|
|
fflush(stdout);
|
2013-06-30 10:30:00 +05:30
|
|
|
|
if (Frames_signal || (key = iokey(1)) < 1) {
|
2013-01-16 11:30:00 +05:30
|
|
|
|
adj_geometry();
|
2013-01-29 11:30:00 +05:30
|
|
|
|
putp(Cap_clr_scr);
|
|
|
|
|
} else w = win_select(key);
|
2013-01-16 11:30:00 +05:30
|
|
|
|
} while (key != kbd_ENTER && key != kbd_ESC);
|
|
|
|
|
break;
|
|
|
|
|
default:
|
|
|
|
|
goto signify_that;
|
2011-03-31 16:45:12 +05:30
|
|
|
|
}
|
|
|
|
|
} // end: help_view
|
2002-11-25 03:34:03 +05:30
|
|
|
|
|
2002-05-30 09:14:46 +05:30
|
|
|
|
|
2018-06-17 10:30:00 +05:30
|
|
|
|
static void other_filters (int ch) {
|
2018-06-17 10:30:00 +05:30
|
|
|
|
WIN_t *w = Curwin; // avoid gcc bloat with a local copy
|
2018-06-17 10:30:00 +05:30
|
|
|
|
const char *txt, *p;
|
|
|
|
|
char *glob;
|
2013-03-03 11:30:00 +05:30
|
|
|
|
|
2018-06-17 10:30:00 +05:30
|
|
|
|
switch (ch) {
|
|
|
|
|
case 'o':
|
|
|
|
|
case 'O':
|
|
|
|
|
if (ch == 'o') txt = N_txt(OSEL_casenot_txt);
|
|
|
|
|
else txt = N_txt(OSEL_caseyes_txt);
|
|
|
|
|
glob = ioline(fmtmk(N_fmt(OSEL_prompts_fmt), w->osel_tot + 1, txt));
|
|
|
|
|
if (*glob == kbd_ESC || *glob == '\0')
|
|
|
|
|
return;
|
|
|
|
|
if ((p = osel_add(w, ch, glob, 1))) {
|
|
|
|
|
show_msg(p);
|
|
|
|
|
return;
|
|
|
|
|
}
|
2013-03-03 11:30:00 +05:30
|
|
|
|
#ifndef USE_X_COLHDR
|
2018-06-17 10:30:00 +05:30
|
|
|
|
SETw(w, NOHISEL_xxx);
|
2013-03-03 11:30:00 +05:30
|
|
|
|
#endif
|
2018-06-17 10:30:00 +05:30
|
|
|
|
break;
|
|
|
|
|
case kbd_CtrlO:
|
|
|
|
|
if (VIZCHKw(w)) {
|
|
|
|
|
char buf[SCREENMAX], **pp;
|
|
|
|
|
struct osel_s *osel;
|
|
|
|
|
int i;
|
|
|
|
|
|
|
|
|
|
i = 0;
|
|
|
|
|
osel = w->osel_1st;
|
2020-05-27 10:30:00 +05:30
|
|
|
|
pp = alloc_c((w->osel_tot + 1) * sizeof(char *));
|
2018-06-17 10:30:00 +05:30
|
|
|
|
while (osel && i < w->osel_tot) {
|
|
|
|
|
pp[i++] = osel->raw;
|
|
|
|
|
osel = osel->nxt;
|
|
|
|
|
}
|
|
|
|
|
buf[0] = '\0';
|
|
|
|
|
for ( ; i > 0; )
|
|
|
|
|
strncat(buf, fmtmk("%s'%s'", " + " , pp[--i]), sizeof(buf) - (strlen(buf) + 1));
|
|
|
|
|
if (buf[0]) p = buf + strspn(buf, " + ");
|
|
|
|
|
else p = N_txt(WORD_noneone_txt);
|
|
|
|
|
ioline(fmtmk(N_fmt(OSEL_statlin_fmt), p));
|
|
|
|
|
free(pp);
|
|
|
|
|
}
|
|
|
|
|
break;
|
|
|
|
|
default: // keep gcc happy
|
|
|
|
|
break;
|
|
|
|
|
}
|
2018-06-17 10:30:00 +05:30
|
|
|
|
} // end: other_filters
|
2013-03-03 11:30:00 +05:30
|
|
|
|
|
|
|
|
|
|
2013-03-03 11:30:00 +05:30
|
|
|
|
static void write_rcfile (void) {
|
|
|
|
|
FILE *fp;
|
|
|
|
|
int i;
|
|
|
|
|
|
|
|
|
|
if (Rc_questions) {
|
|
|
|
|
show_pmt(N_txt(XTRA_warncfg_txt));
|
|
|
|
|
if ('y' != tolower(iokey(1)))
|
|
|
|
|
return;
|
|
|
|
|
Rc_questions = 0;
|
|
|
|
|
}
|
2020-05-29 10:30:00 +05:30
|
|
|
|
if (Rc_compatibilty) {
|
|
|
|
|
show_pmt(N_txt(XTRA_warnold_txt));
|
|
|
|
|
if ('y' != tolower(iokey(1)))
|
|
|
|
|
return;
|
|
|
|
|
Rc_compatibilty = 0;
|
|
|
|
|
}
|
2013-03-03 11:30:00 +05:30
|
|
|
|
if (!(fp = fopen(Rc_name, "w"))) {
|
|
|
|
|
show_msg(fmtmk(N_fmt(FAIL_rc_open_fmt), Rc_name, strerror(errno)));
|
|
|
|
|
return;
|
|
|
|
|
}
|
|
|
|
|
fprintf(fp, "%s's " RCF_EYECATCHER, Myname);
|
|
|
|
|
fprintf(fp, "Id:%c, Mode_altscr=%d, Mode_irixps=%d, Delay_time=%d.%d, Curwin=%d\n"
|
|
|
|
|
, RCF_VERSION_ID
|
|
|
|
|
, Rc.mode_altscr, Rc.mode_irixps
|
|
|
|
|
// this may be ugly, but it keeps us locale independent...
|
|
|
|
|
, (int)Rc.delay_time, (int)((Rc.delay_time - (int)Rc.delay_time) * 1000)
|
|
|
|
|
, (int)(Curwin - Winstk));
|
|
|
|
|
|
|
|
|
|
for (i = 0 ; i < GROUPSMAX; i++) {
|
|
|
|
|
fprintf(fp, "%s\tfieldscur=%s\n"
|
|
|
|
|
, Winstk[i].rc.winname, Winstk[i].rc.fieldscur);
|
2020-05-29 10:30:00 +05:30
|
|
|
|
fprintf(fp, "\twinflags=%d, sortindx=%d, maxtasks=%d, graph_cpus=%d, graph_mems=%d"
|
|
|
|
|
", double_up=%d, combine_cpus=%d\n"
|
2014-06-27 10:30:00 +05:30
|
|
|
|
, Winstk[i].rc.winflags, Winstk[i].rc.sortindx, Winstk[i].rc.maxtasks
|
2020-05-29 10:30:00 +05:30
|
|
|
|
, Winstk[i].rc.graph_cpus, Winstk[i].rc.graph_mems
|
|
|
|
|
, Winstk[i].rc.double_up, Winstk[i].rc.combine_cpus);
|
2013-03-03 11:30:00 +05:30
|
|
|
|
fprintf(fp, "\tsummclr=%d, msgsclr=%d, headclr=%d, taskclr=%d\n"
|
|
|
|
|
, Winstk[i].rc.summclr, Winstk[i].rc.msgsclr
|
|
|
|
|
, Winstk[i].rc.headclr, Winstk[i].rc.taskclr);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
// any new addition(s) last, for older rcfiles compatibility...
|
2014-06-27 10:30:00 +05:30
|
|
|
|
fprintf(fp, "Fixed_widest=%d, Summ_mscale=%d, Task_mscale=%d, Zero_suppress=%d\n"
|
|
|
|
|
, Rc.fixed_widest, Rc.summ_mscale, Rc.task_mscale, Rc.zero_suppress);
|
2013-03-03 11:30:00 +05:30
|
|
|
|
|
2018-06-17 10:30:00 +05:30
|
|
|
|
if (Winstk[0].osel_tot + Winstk[1].osel_tot
|
|
|
|
|
+ Winstk[2].osel_tot + Winstk[3].osel_tot) {
|
|
|
|
|
fprintf(fp, "\n");
|
|
|
|
|
fprintf(fp, Osel_delim_1_txt);
|
|
|
|
|
for (i = 0 ; i < GROUPSMAX; i++) {
|
|
|
|
|
struct osel_s *osel = Winstk[i].osel_1st;
|
|
|
|
|
if (osel) {
|
|
|
|
|
fprintf(fp, Osel_window_fmts, i, Winstk[i].osel_tot);
|
|
|
|
|
do {
|
|
|
|
|
fprintf(fp, Osel_filterO_fmt, osel->typ, osel->raw);
|
|
|
|
|
osel = osel->nxt;
|
|
|
|
|
} while (osel);
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
fprintf(fp, Osel_delim_2_txt);
|
|
|
|
|
}
|
|
|
|
|
|
2013-03-03 11:30:00 +05:30
|
|
|
|
if (Inspect.raw)
|
|
|
|
|
fputs(Inspect.raw, fp);
|
|
|
|
|
|
|
|
|
|
fclose(fp);
|
|
|
|
|
show_msg(fmtmk(N_fmt(WRITE_rcfile_fmt), Rc_name));
|
|
|
|
|
} // end: write_rcfile
|
|
|
|
|
|
|
|
|
|
/*###### Interactive Input Secondary support (do_key helpers) ##########*/
|
|
|
|
|
|
|
|
|
|
/*
|
|
|
|
|
* These routines exist just to keep the do_key() function
|
|
|
|
|
* a reasonably modest size. */
|
|
|
|
|
|
2011-03-31 16:45:12 +05:30
|
|
|
|
static void keys_global (int ch) {
|
|
|
|
|
WIN_t *w = Curwin; // avoid gcc bloat with a local copy
|
|
|
|
|
|
|
|
|
|
switch (ch) {
|
2012-01-24 02:14:13 +05:30
|
|
|
|
case '?':
|
|
|
|
|
case 'h':
|
|
|
|
|
help_view();
|
|
|
|
|
break;
|
2011-03-31 16:45:12 +05:30
|
|
|
|
case 'B':
|
|
|
|
|
TOGw(w, View_NOBOLD);
|
|
|
|
|
capsmk(w);
|
|
|
|
|
break;
|
2002-11-08 06:01:28 +05:30
|
|
|
|
case 'd':
|
|
|
|
|
case 's':
|
|
|
|
|
if (Secure_mode)
|
2011-10-12 00:32:59 +05:30
|
|
|
|
show_msg(N_txt(NOT_onsecure_txt));
|
2002-11-08 06:01:28 +05:30
|
|
|
|
else {
|
|
|
|
|
float tmp =
|
2011-10-12 00:32:59 +05:30
|
|
|
|
get_float(fmtmk(N_fmt(DELAY_change_fmt), Rc.delay_time));
|
2014-04-27 10:30:00 +05:30
|
|
|
|
if (tmp > -1) Rc.delay_time = tmp;
|
2002-05-30 09:14:46 +05:30
|
|
|
|
}
|
2002-11-08 06:01:28 +05:30
|
|
|
|
break;
|
2012-12-14 11:30:00 +05:30
|
|
|
|
case 'E':
|
2012-12-18 11:30:00 +05:30
|
|
|
|
if (++Rc.summ_mscale > SK_Eb) Rc.summ_mscale = SK_Kb;
|
top: provide the means to adjust scaled process memory
This commit is an unrequested outgrowth of the earlier
change dealing with summary area memory field scaling.
That user selectable scaling provision is now extended
to include 6 (at present) task oriented memory fields.
The new companion 'e' (lower case) interactive command
has been added and, like the 'E' command, it can cycle
each of the currently displayed memory columns between
KiB through TiB. There are, however, some differences.
Where '+' indicates summary area truncation at a given
radix, task memory fields are automatically scaled for
their column. Thus, not all rows use the same scaling.
And, while summary area field widths were not changed,
the task memory columns were widened in order to offer
more meaningful data when the radix was increased. The
precision is automatically increased in step with each
radix: MiB displays 2 decimal places, GiB 3 and TiB 4.
To compliment that additional precision, both the %CPU
and %MEM fields were widened by 1 column and now offer
precision up to 3 decimal places. But, unique to %CPU,
widening could already have occurred due to the number
of processors in some massively parallel boxes. At any
rate, total extra width for both memory and percentage
fields could amount to twenty (precious) columns more.
So for both the memory and % fields the original width
(along with loss of precision) can be restored via new
compiler conditionals which this commit also provides.
p.s. and it will be rcfile preserved for any restarts!
(now that we know a '.' + 2 spaces is squeezed to one)
(everything's perfectly justified, but it's just luck)
Reference(s):
http://www.freelists.org/post/procps/top-regression-reports
Signed-off-by: Jim Warner <james.warner@comcast.net>
2012-12-14 11:30:00 +05:30
|
|
|
|
break;
|
|
|
|
|
case 'e':
|
2012-12-18 11:30:00 +05:30
|
|
|
|
if (++Rc.task_mscale > SK_Pb) Rc.task_mscale = SK_Kb;
|
2012-12-14 11:30:00 +05:30
|
|
|
|
break;
|
2002-11-08 06:01:28 +05:30
|
|
|
|
case 'F':
|
2011-03-31 16:45:12 +05:30
|
|
|
|
case 'f':
|
|
|
|
|
fields_utility();
|
2002-11-08 06:01:28 +05:30
|
|
|
|
break;
|
|
|
|
|
case 'g':
|
|
|
|
|
win_select(0);
|
|
|
|
|
break;
|
2005-06-22 00:50:39 +05:30
|
|
|
|
case 'H':
|
2011-03-31 16:45:12 +05:30
|
|
|
|
Thread_mode = !Thread_mode;
|
2011-08-30 17:35:45 +05:30
|
|
|
|
if (!CHKw(w, View_STATES))
|
2011-10-12 00:32:59 +05:30
|
|
|
|
show_msg(fmtmk(N_fmt(THREADS_show_fmt)
|
|
|
|
|
, Thread_mode ? N_txt(ON_word_only_txt) : N_txt(OFF_one_word_txt)));
|
2018-06-06 10:30:00 +05:30
|
|
|
|
Winstk[0].begtask = Winstk[1].begtask = Winstk[2].begtask = Winstk[3].begtask = 0;
|
2012-01-09 22:56:45 +05:30
|
|
|
|
// force an extra procs refresh to avoid %cpu distortions...
|
|
|
|
|
Pseudo_row = PROC_XTRA;
|
2002-11-08 06:01:28 +05:30
|
|
|
|
break;
|
|
|
|
|
case 'I':
|
top: improve logic surrounding 'smp_num_cpus' variable
I thank Guido Jäkel for raising the issue cited in the
merge request referenced below. While restoring 1 line
of code would produce the desired results, it does not
address the root cause of that problem he experienced.
The variable 'smp_num_cpus' was set by libprocps via a
sysconf(_SC_NPROCESSORS_ONLN) call. It was supposed to
represent total number of processors currently online.
It also served as the position in the Cpu_tics[] array
where the /proc/stat line #1 (cpu summary) was stored.
The variable 'Cpu_faux_tot' was valued by top based on
total individual cpus parsed from the /proc/stat file.
It serves as a fence post for Cpu_tics[] array access.
The problem Guido experienced results from a disparity
between those 2 variables, plus one instance where the
wrong variable was used in the summary_show() routine.
. Here is the real culprit, the actual incorrect code:
. summary_hlp(&Cpu_tics[Cpu_faux_tot], N_txt(WORD_a...
Which always should have been represented in this way:
. summary_hlp(&Cpu_tics[smp_num_cpus], N_txt(WORD_a...
------------------------------------------------------
The above 'disparity' might arise in any system when a
cpu is taken offline since there's a 3 second delay in
cpu and memory refreshes in an effort to reduce costs.
Usually this particular condition will be short lived.
However, there is a more persistent problem under lxc.
If a host cpu is taken offline and then brought online
again, within the container sysconf returns the proper
number of online processors. But, /proc/stat does not!
Sadly, I've yet to find a way to coax a container into
refreshing its /proc/stat, short of reboting the host.
[ might that represent a potential bug in lxc logic? ]
Reference(s):
https://gitlab.com/procps-ng/procps/merge_requests/82
Signed-off-by: Jim Warner <james.warner@comcast.net>
With-thanks-to: Guido Jäkel <G.Jaekel@DNB.DE>
2019-01-11 11:30:00 +05:30
|
|
|
|
if (smp_num_cpus > 1) {
|
2002-12-05 04:18:30 +05:30
|
|
|
|
Rc.mode_irixps = !Rc.mode_irixps;
|
2011-10-12 00:32:59 +05:30
|
|
|
|
show_msg(fmtmk(N_fmt(IRIX_curmode_fmt)
|
|
|
|
|
, Rc.mode_irixps ? N_txt(ON_word_only_txt) : N_txt(OFF_one_word_txt)));
|
2002-11-08 06:01:28 +05:30
|
|
|
|
} else
|
2011-10-12 00:32:59 +05:30
|
|
|
|
show_msg(N_txt(NOT_smp_cpus_txt));
|
2002-11-08 06:01:28 +05:30
|
|
|
|
break;
|
|
|
|
|
case 'k':
|
|
|
|
|
if (Secure_mode) {
|
2011-10-12 00:32:59 +05:30
|
|
|
|
show_msg(N_txt(NOT_onsecure_txt));
|
2002-11-08 06:01:28 +05:30
|
|
|
|
} else {
|
2014-04-27 10:30:00 +05:30
|
|
|
|
int sig = SIGTERM,
|
|
|
|
|
def = w->ppt[w->begtask]->tid,
|
|
|
|
|
pid = get_int(fmtmk(N_txt(GET_pid2kill_fmt), def));
|
|
|
|
|
if (pid > GET_NUM_ESC) {
|
2012-12-05 11:30:00 +05:30
|
|
|
|
char *str;
|
2014-04-27 10:30:00 +05:30
|
|
|
|
if (pid == GET_NUM_NOT) pid = def;
|
2013-01-16 11:30:00 +05:30
|
|
|
|
str = ioline(fmtmk(N_fmt(GET_sigs_num_fmt), pid, SIGTERM));
|
2014-04-27 10:30:00 +05:30
|
|
|
|
if (*str != kbd_ESC) {
|
|
|
|
|
if (*str) sig = signal_name_to_number(str);
|
|
|
|
|
if (Frames_signal) break;
|
|
|
|
|
if (0 < sig && kill(pid, sig))
|
|
|
|
|
show_msg(fmtmk(N_fmt(FAIL_signals_fmt)
|
|
|
|
|
, pid, sig, strerror(errno)));
|
|
|
|
|
else if (0 > sig) show_msg(N_txt(BAD_signalid_txt));
|
|
|
|
|
}
|
2002-11-08 06:01:28 +05:30
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
break;
|
2011-03-31 16:45:12 +05:30
|
|
|
|
case 'r':
|
|
|
|
|
if (Secure_mode)
|
2011-10-12 00:32:59 +05:30
|
|
|
|
show_msg(N_txt(NOT_onsecure_txt));
|
2011-03-31 16:45:12 +05:30
|
|
|
|
else {
|
2014-04-27 10:30:00 +05:30
|
|
|
|
int val,
|
|
|
|
|
def = w->ppt[w->begtask]->tid,
|
2017-09-27 10:31:11 +05:30
|
|
|
|
pid = get_int(fmtmk(N_fmt(GET_pid2nice_fmt), def));
|
2014-04-27 10:30:00 +05:30
|
|
|
|
if (pid > GET_NUM_ESC) {
|
|
|
|
|
if (pid == GET_NUM_NOT) pid = def;
|
|
|
|
|
val = get_int(fmtmk(N_fmt(GET_nice_num_fmt), pid));
|
|
|
|
|
if (val > GET_NUM_NOT
|
|
|
|
|
&& setpriority(PRIO_PROCESS, (unsigned)pid, val))
|
|
|
|
|
show_msg(fmtmk(N_fmt(FAIL_re_nice_fmt)
|
|
|
|
|
, pid, val, strerror(errno)));
|
2012-11-25 10:30:03 +05:30
|
|
|
|
}
|
2011-03-31 16:45:12 +05:30
|
|
|
|
}
|
|
|
|
|
break;
|
2012-09-21 11:31:01 +05:30
|
|
|
|
case 'X':
|
|
|
|
|
{ int wide = get_int(fmtmk(N_fmt(XTRA_fixwide_fmt), Rc.fixed_widest));
|
2014-04-27 10:30:00 +05:30
|
|
|
|
if (wide > GET_NUM_NOT) {
|
1970-01-01 05:30:00 +05:30
|
|
|
|
if (wide >= 0 && wide <= SCREENMAX) Rc.fixed_widest = wide;
|
2014-04-27 10:30:00 +05:30
|
|
|
|
else Rc.fixed_widest = -1;
|
2012-11-25 10:30:03 +05:30
|
|
|
|
}
|
2012-09-21 11:31:01 +05:30
|
|
|
|
}
|
|
|
|
|
break;
|
top: add a flexible 'Inspect' capability
This commit introduces an extremely powerful, flexible
brand new capability. Now, users can pause the normal
iterative display and inspect the contents of any file
or output from any script, command, or even pipelines.
It's invoked via the 'Y' interactive command which, in
turn, is supported with simple user supplied additions
as new entries in the top personal configuration file.
A separate new 'Inspect' window supports scrolling and
searching, similar to the main top display. Except it
extends existing 'L'/'&' (locate/locate-next) commands
so that an out-of-view match automatically adjusts the
horizontal position bringing such data into view. And
it provides for multiple successive same line matches.
Also, the basic 'more/less' navigation keys are active
in this new 'Inspect' window, to ease user transition.
There are no program changes required when entries are
added to or deleted from the rcfile. And there are no
known limits to the complexity of a script, command or
pipeline, other than the unidirectional nature imposed
by the 'popen' function call which top cannot violate.
Since it's impossible to predict exactly what contents
will be generated, top treats all output as raw binary
data. Any control characters display in '^C' notation
while all other unprintable characters show as '<AB>'.
The biggest problem encountered was with the find/next
capability since that strstr guy was really diminished
given the possibility that numerous 'strings' could be
encountered *within* many of top's raw, binary 'rows'.
Oh, and another problem was in maintaining the perfect
left & right text justification of this commit message
along with all of the commit summaries. Some of those
summaries (like this very one) are of course, slightly
shorter, to make room for the 'man document' addition.
Enjoy!
Signed-off-by: Jim Warner <james.warner@comcast.net>
2012-11-25 10:30:05 +05:30
|
|
|
|
case 'Y':
|
|
|
|
|
if (!Inspect.total)
|
2013-01-16 11:30:00 +05:30
|
|
|
|
ioline(N_txt(YINSP_noents_txt));
|
top: add a flexible 'Inspect' capability
This commit introduces an extremely powerful, flexible
brand new capability. Now, users can pause the normal
iterative display and inspect the contents of any file
or output from any script, command, or even pipelines.
It's invoked via the 'Y' interactive command which, in
turn, is supported with simple user supplied additions
as new entries in the top personal configuration file.
A separate new 'Inspect' window supports scrolling and
searching, similar to the main top display. Except it
extends existing 'L'/'&' (locate/locate-next) commands
so that an out-of-view match automatically adjusts the
horizontal position bringing such data into view. And
it provides for multiple successive same line matches.
Also, the basic 'more/less' navigation keys are active
in this new 'Inspect' window, to ease user transition.
There are no program changes required when entries are
added to or deleted from the rcfile. And there are no
known limits to the complexity of a script, command or
pipeline, other than the unidirectional nature imposed
by the 'popen' function call which top cannot violate.
Since it's impossible to predict exactly what contents
will be generated, top treats all output as raw binary
data. Any control characters display in '^C' notation
while all other unprintable characters show as '<AB>'.
The biggest problem encountered was with the find/next
capability since that strstr guy was really diminished
given the possibility that numerous 'strings' could be
encountered *within* many of top's raw, binary 'rows'.
Oh, and another problem was in maintaining the perfect
left & right text justification of this commit message
along with all of the commit summaries. Some of those
summaries (like this very one) are of course, slightly
shorter, to make room for the 'man document' addition.
Enjoy!
Signed-off-by: Jim Warner <james.warner@comcast.net>
2012-11-25 10:30:05 +05:30
|
|
|
|
else {
|
2014-04-27 10:30:00 +05:30
|
|
|
|
int def = w->ppt[w->begtask]->tid,
|
|
|
|
|
pid = get_int(fmtmk(N_fmt(YINSP_pidsee_fmt), def));
|
|
|
|
|
if (pid > GET_NUM_ESC) {
|
|
|
|
|
if (pid == GET_NUM_NOT) pid = def;
|
top: add a flexible 'Inspect' capability
This commit introduces an extremely powerful, flexible
brand new capability. Now, users can pause the normal
iterative display and inspect the contents of any file
or output from any script, command, or even pipelines.
It's invoked via the 'Y' interactive command which, in
turn, is supported with simple user supplied additions
as new entries in the top personal configuration file.
A separate new 'Inspect' window supports scrolling and
searching, similar to the main top display. Except it
extends existing 'L'/'&' (locate/locate-next) commands
so that an out-of-view match automatically adjusts the
horizontal position bringing such data into view. And
it provides for multiple successive same line matches.
Also, the basic 'more/less' navigation keys are active
in this new 'Inspect' window, to ease user transition.
There are no program changes required when entries are
added to or deleted from the rcfile. And there are no
known limits to the complexity of a script, command or
pipeline, other than the unidirectional nature imposed
by the 'popen' function call which top cannot violate.
Since it's impossible to predict exactly what contents
will be generated, top treats all output as raw binary
data. Any control characters display in '^C' notation
while all other unprintable characters show as '<AB>'.
The biggest problem encountered was with the find/next
capability since that strstr guy was really diminished
given the possibility that numerous 'strings' could be
encountered *within* many of top's raw, binary 'rows'.
Oh, and another problem was in maintaining the perfect
left & right text justification of this commit message
along with all of the commit summaries. Some of those
summaries (like this very one) are of course, slightly
shorter, to make room for the 'man document' addition.
Enjoy!
Signed-off-by: Jim Warner <james.warner@comcast.net>
2012-11-25 10:30:05 +05:30
|
|
|
|
if (pid) inspection_utility(pid);
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
break;
|
2011-03-31 16:45:12 +05:30
|
|
|
|
case 'Z':
|
|
|
|
|
wins_colors();
|
|
|
|
|
break;
|
2012-12-15 11:30:00 +05:30
|
|
|
|
case '0':
|
|
|
|
|
Rc.zero_suppress = !Rc.zero_suppress;
|
|
|
|
|
break;
|
2014-05-27 10:30:00 +05:30
|
|
|
|
case kbd_ENTER: // these two have the effect of waking us
|
|
|
|
|
case kbd_SPACE: // from 'pselect', refreshing the display
|
|
|
|
|
break; // and updating any hot-plugged resources
|
2011-03-31 16:45:12 +05:30
|
|
|
|
default: // keep gcc happy
|
|
|
|
|
break;
|
|
|
|
|
}
|
|
|
|
|
} // end: keys_global
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
static void keys_summary (int ch) {
|
|
|
|
|
WIN_t *w = Curwin; // avoid gcc bloat with a local copy
|
2002-06-19 05:15:30 +05:30
|
|
|
|
|
2011-03-31 16:45:12 +05:30
|
|
|
|
switch (ch) {
|
2020-05-21 10:30:00 +05:30
|
|
|
|
case '!':
|
|
|
|
|
if (CHKw(w, View_CPUSUM) || CHKw(w, View_CPUNOD))
|
|
|
|
|
show_msg(N_txt(XTRA_modebad_txt));
|
|
|
|
|
else {
|
2020-05-29 10:30:00 +05:30
|
|
|
|
if (!w->rc.combine_cpus) w->rc.combine_cpus = 1;
|
|
|
|
|
else w->rc.combine_cpus *= 2;
|
|
|
|
|
if (w->rc.combine_cpus >= Cpu_faux_tot) w->rc.combine_cpus = 0;
|
2020-05-21 10:30:00 +05:30
|
|
|
|
}
|
|
|
|
|
break;
|
2011-03-31 16:45:12 +05:30
|
|
|
|
case '1':
|
2013-04-08 12:30:00 +05:30
|
|
|
|
if (CHKw(w, View_CPUNOD)) OFFw(w, View_CPUSUM);
|
|
|
|
|
else TOGw(w, View_CPUSUM);
|
|
|
|
|
OFFw(w, View_CPUNOD);
|
2013-04-25 10:30:00 +05:30
|
|
|
|
SETw(w, View_STATES);
|
2020-05-29 10:30:00 +05:30
|
|
|
|
w->rc.double_up = 0;
|
2013-04-08 12:30:00 +05:30
|
|
|
|
break;
|
|
|
|
|
case '2':
|
|
|
|
|
if (!Numa_node_tot)
|
|
|
|
|
show_msg(N_txt(NUMA_nodenot_txt));
|
|
|
|
|
else {
|
|
|
|
|
if (Numa_node_sel < 0) TOGw(w, View_CPUNOD);
|
|
|
|
|
if (!CHKw(w, View_CPUNOD)) SETw(w, View_CPUSUM);
|
2013-04-25 10:30:00 +05:30
|
|
|
|
SETw(w, View_STATES);
|
2013-04-08 12:30:00 +05:30
|
|
|
|
Numa_node_sel = -1;
|
2020-05-29 10:30:00 +05:30
|
|
|
|
w->rc.double_up = 0;
|
2013-04-08 12:30:00 +05:30
|
|
|
|
}
|
|
|
|
|
break;
|
|
|
|
|
case '3':
|
|
|
|
|
if (!Numa_node_tot)
|
|
|
|
|
show_msg(N_txt(NUMA_nodenot_txt));
|
|
|
|
|
else {
|
|
|
|
|
int num = get_int(fmtmk(N_fmt(NUMA_nodeget_fmt), Numa_node_tot -1));
|
2014-04-27 10:30:00 +05:30
|
|
|
|
if (num > GET_NUM_NOT) {
|
2013-04-08 12:30:00 +05:30
|
|
|
|
if (num >= 0 && num < Numa_node_tot) {
|
|
|
|
|
Numa_node_sel = num;
|
2013-04-25 10:30:00 +05:30
|
|
|
|
SETw(w, View_CPUNOD | View_STATES);
|
2013-04-08 12:30:00 +05:30
|
|
|
|
OFFw(w, View_CPUSUM);
|
2020-05-29 10:30:00 +05:30
|
|
|
|
w->rc.double_up = 0;
|
2013-04-08 12:30:00 +05:30
|
|
|
|
} else
|
|
|
|
|
show_msg(N_txt(NUMA_nodebad_txt));
|
|
|
|
|
}
|
|
|
|
|
}
|
2011-03-31 16:45:12 +05:30
|
|
|
|
break;
|
2020-05-13 10:30:00 +05:30
|
|
|
|
case '4':
|
2020-05-29 10:30:00 +05:30
|
|
|
|
w->rc.double_up = !w->rc.double_up;
|
|
|
|
|
if (w->rc.double_up && Screen_cols < DOUBLE_limit) {
|
2020-05-13 10:30:00 +05:30
|
|
|
|
show_msg(N_txt(XTRA_size2up_txt));
|
2020-05-29 10:30:00 +05:30
|
|
|
|
w->rc.double_up = 0;
|
2020-05-13 10:30:00 +05:30
|
|
|
|
break;
|
|
|
|
|
}
|
|
|
|
|
#ifdef TOG4_NOFORCE
|
|
|
|
|
if (CHKw(w, (View_CPUSUM | View_CPUNOD)))
|
2020-05-29 10:30:00 +05:30
|
|
|
|
w->rc.double_up = 0;
|
2020-05-13 10:30:00 +05:30
|
|
|
|
#else
|
2020-05-29 10:30:00 +05:30
|
|
|
|
if (w->rc.double_up)
|
2020-05-13 10:30:00 +05:30
|
|
|
|
OFFw(w, (View_CPUSUM | View_CPUNOD));
|
|
|
|
|
#endif
|
|
|
|
|
break;
|
2011-03-31 16:45:12 +05:30
|
|
|
|
case 'C':
|
|
|
|
|
VIZTOGw(w, View_SCROLL);
|
|
|
|
|
break;
|
2002-11-08 06:01:28 +05:30
|
|
|
|
case 'l':
|
2011-03-31 16:45:12 +05:30
|
|
|
|
TOGw(w, View_LOADAV);
|
2002-11-08 06:01:28 +05:30
|
|
|
|
break;
|
|
|
|
|
case 'm':
|
2014-06-18 10:30:00 +05:30
|
|
|
|
if (!CHKw(w, View_MEMORY))
|
|
|
|
|
SETw(w, View_MEMORY);
|
2014-06-27 10:30:00 +05:30
|
|
|
|
else if (++w->rc.graph_mems > 2) {
|
2020-03-10 10:30:00 +05:30
|
|
|
|
w->rc.graph_mems = 0;
|
2014-06-18 10:30:00 +05:30
|
|
|
|
OFFw(w, View_MEMORY);
|
|
|
|
|
}
|
2011-03-31 16:45:12 +05:30
|
|
|
|
break;
|
|
|
|
|
case 't':
|
2014-06-18 10:30:00 +05:30
|
|
|
|
if (!CHKw(w, View_STATES))
|
|
|
|
|
SETw(w, View_STATES);
|
2014-06-27 10:30:00 +05:30
|
|
|
|
else if (++w->rc.graph_cpus > 2) {
|
2020-03-10 10:30:00 +05:30
|
|
|
|
w->rc.graph_cpus = 0;
|
2014-06-18 10:30:00 +05:30
|
|
|
|
OFFw(w, View_STATES);
|
|
|
|
|
}
|
2011-03-31 16:45:12 +05:30
|
|
|
|
break;
|
|
|
|
|
default: // keep gcc happy
|
2002-11-08 06:01:28 +05:30
|
|
|
|
break;
|
2011-03-31 16:45:12 +05:30
|
|
|
|
}
|
|
|
|
|
} // end: keys_summary
|
2002-06-19 05:15:30 +05:30
|
|
|
|
|
2011-03-31 16:45:12 +05:30
|
|
|
|
|
|
|
|
|
static void keys_task (int ch) {
|
|
|
|
|
WIN_t *w = Curwin; // avoid gcc bloat with a local copy
|
|
|
|
|
|
|
|
|
|
switch (ch) {
|
2002-06-19 05:15:30 +05:30
|
|
|
|
case '#':
|
2011-03-31 16:45:12 +05:30
|
|
|
|
case 'n':
|
|
|
|
|
if (VIZCHKw(w)) {
|
2011-10-12 00:32:59 +05:30
|
|
|
|
int num = get_int(fmtmk(N_fmt(GET_max_task_fmt), w->rc.maxtasks));
|
2014-04-27 10:30:00 +05:30
|
|
|
|
if (num > GET_NUM_NOT) {
|
2011-09-24 19:57:37 +05:30
|
|
|
|
if (-1 < num ) w->rc.maxtasks = num;
|
2011-10-12 00:32:59 +05:30
|
|
|
|
else show_msg(N_txt(BAD_max_task_txt));
|
2011-09-24 19:57:37 +05:30
|
|
|
|
}
|
2002-06-19 05:15:30 +05:30
|
|
|
|
}
|
|
|
|
|
break;
|
2011-03-31 16:45:12 +05:30
|
|
|
|
case '<':
|
2011-08-30 17:35:45 +05:30
|
|
|
|
#ifdef TREE_NORESET
|
|
|
|
|
if (CHKw(w, Show_FOREST)) break;
|
|
|
|
|
#endif
|
2011-03-31 16:45:12 +05:30
|
|
|
|
if (VIZCHKw(w)) {
|
|
|
|
|
FLG_t *p = w->procflgs + w->maxpflgs - 1;
|
|
|
|
|
while (p > w->procflgs && *p != w->rc.sortindx) --p;
|
|
|
|
|
if (*p == w->rc.sortindx) {
|
|
|
|
|
--p;
|
2011-04-14 02:38:14 +05:30
|
|
|
|
#ifndef USE_X_COLHDR
|
2014-02-25 11:30:00 +05:30
|
|
|
|
if (EU_MAXPFLGS < *p) --p;
|
2011-04-14 02:38:14 +05:30
|
|
|
|
#endif
|
2011-08-30 17:35:45 +05:30
|
|
|
|
if (p >= w->procflgs) {
|
|
|
|
|
w->rc.sortindx = *p;
|
|
|
|
|
#ifndef TREE_NORESET
|
|
|
|
|
OFFw(w, Show_FOREST);
|
|
|
|
|
#endif
|
|
|
|
|
}
|
2011-03-31 16:45:12 +05:30
|
|
|
|
}
|
|
|
|
|
}
|
2002-06-19 05:15:30 +05:30
|
|
|
|
break;
|
2011-03-31 16:45:12 +05:30
|
|
|
|
case '>':
|
2011-08-30 17:35:45 +05:30
|
|
|
|
#ifdef TREE_NORESET
|
|
|
|
|
if (CHKw(w, Show_FOREST)) break;
|
|
|
|
|
#endif
|
2011-03-31 16:45:12 +05:30
|
|
|
|
if (VIZCHKw(w)) {
|
|
|
|
|
FLG_t *p = w->procflgs + w->maxpflgs - 1;
|
|
|
|
|
while (p > w->procflgs && *p != w->rc.sortindx) --p;
|
|
|
|
|
if (*p == w->rc.sortindx) {
|
|
|
|
|
++p;
|
2011-04-14 02:38:14 +05:30
|
|
|
|
#ifndef USE_X_COLHDR
|
2014-02-25 11:30:00 +05:30
|
|
|
|
if (EU_MAXPFLGS < *p) ++p;
|
2011-04-14 02:38:14 +05:30
|
|
|
|
#endif
|
2011-08-30 17:35:45 +05:30
|
|
|
|
if (p < w->procflgs + w->maxpflgs) {
|
|
|
|
|
w->rc.sortindx = *p;
|
|
|
|
|
#ifndef TREE_NORESET
|
|
|
|
|
OFFw(w, Show_FOREST);
|
|
|
|
|
#endif
|
|
|
|
|
}
|
2002-11-08 06:01:28 +05:30
|
|
|
|
}
|
2002-06-19 05:15:30 +05:30
|
|
|
|
}
|
|
|
|
|
break;
|
2011-03-31 16:45:12 +05:30
|
|
|
|
case 'b':
|
2014-06-23 10:30:00 +05:30
|
|
|
|
TOGw(w, Show_HIBOLD);
|
|
|
|
|
capsmk(w);
|
2011-03-31 16:45:12 +05:30
|
|
|
|
break;
|
|
|
|
|
case 'c':
|
|
|
|
|
VIZTOGw(w, Show_CMDLIN);
|
|
|
|
|
break;
|
|
|
|
|
case 'i':
|
2015-07-12 15:14:44 +05:30
|
|
|
|
{ static WIN_t *w_sav;
|
|
|
|
|
static int beg_sav;
|
|
|
|
|
if (w_sav != w) { beg_sav = 0; w_sav = w; }
|
|
|
|
|
if (CHKw(w, Show_IDLEPS)) { beg_sav = w->begtask; w->begtask = 0; }
|
|
|
|
|
else { w->begtask = beg_sav; beg_sav = 0; }
|
|
|
|
|
}
|
2011-03-31 16:45:12 +05:30
|
|
|
|
VIZTOGw(w, Show_IDLEPS);
|
|
|
|
|
break;
|
2012-09-20 11:31:01 +05:30
|
|
|
|
case 'J':
|
|
|
|
|
VIZTOGw(w, Show_JRNUMS);
|
|
|
|
|
break;
|
|
|
|
|
case 'j':
|
|
|
|
|
VIZTOGw(w, Show_JRSTRS);
|
|
|
|
|
break;
|
2002-06-19 05:15:30 +05:30
|
|
|
|
case 'R':
|
2011-08-30 17:35:45 +05:30
|
|
|
|
#ifdef TREE_NORESET
|
|
|
|
|
if (!CHKw(w, Show_FOREST)) VIZTOGw(w, Qsrt_NORMAL);
|
|
|
|
|
#else
|
|
|
|
|
if (VIZCHKw(w)) {
|
|
|
|
|
TOGw(w, Qsrt_NORMAL);
|
|
|
|
|
OFFw(w, Show_FOREST);
|
|
|
|
|
}
|
|
|
|
|
#endif
|
2002-06-19 05:15:30 +05:30
|
|
|
|
break;
|
|
|
|
|
case 'S':
|
2011-03-31 16:45:12 +05:30
|
|
|
|
if (VIZCHKw(w)) {
|
|
|
|
|
TOGw(w, Show_CTIMES);
|
2011-10-18 04:59:59 +05:30
|
|
|
|
show_msg(fmtmk(N_fmt(TIME_accumed_fmt) , CHKw(w, Show_CTIMES)
|
|
|
|
|
? N_txt(ON_word_only_txt) : N_txt(OFF_one_word_txt)));
|
2002-06-19 05:15:30 +05:30
|
|
|
|
}
|
|
|
|
|
break;
|
2013-03-03 11:30:00 +05:30
|
|
|
|
case 'O':
|
|
|
|
|
case 'o':
|
2018-06-17 10:30:00 +05:30
|
|
|
|
case kbd_CtrlO:
|
2018-09-18 10:30:00 +05:30
|
|
|
|
if (VIZCHKw(w)) {
|
|
|
|
|
other_filters(ch);
|
|
|
|
|
mkVIZrow1(w);
|
|
|
|
|
}
|
2013-03-03 11:30:00 +05:30
|
|
|
|
break;
|
2002-12-10 08:31:17 +05:30
|
|
|
|
case 'U':
|
2011-03-31 16:45:12 +05:30
|
|
|
|
case 'u':
|
|
|
|
|
if (VIZCHKw(w)) {
|
2014-04-27 10:30:00 +05:30
|
|
|
|
const char *errmsg, *str = ioline(N_txt(GET_user_ids_txt));
|
|
|
|
|
if (*str != kbd_ESC
|
|
|
|
|
&& (errmsg = user_certify(w, str, ch)))
|
|
|
|
|
show_msg(errmsg);
|
2018-09-18 10:30:00 +05:30
|
|
|
|
mkVIZrow1(w);
|
2011-03-31 16:45:12 +05:30
|
|
|
|
}
|
2002-06-19 05:15:30 +05:30
|
|
|
|
break;
|
2011-08-30 17:35:45 +05:30
|
|
|
|
case 'V':
|
|
|
|
|
if (VIZCHKw(w)) {
|
|
|
|
|
TOGw(w, Show_FOREST);
|
2014-02-25 11:30:00 +05:30
|
|
|
|
if (!ENUviz(w, EU_CMD))
|
2011-10-18 04:59:59 +05:30
|
|
|
|
show_msg(fmtmk(N_fmt(FOREST_modes_fmt) , CHKw(w, Show_FOREST)
|
|
|
|
|
? N_txt(ON_word_only_txt) : N_txt(OFF_one_word_txt)));
|
2011-08-30 17:35:45 +05:30
|
|
|
|
}
|
|
|
|
|
break;
|
2018-07-10 10:30:00 +05:30
|
|
|
|
case 'v':
|
|
|
|
|
if (VIZCHKw(w)) {
|
|
|
|
|
if (CHKw(w, Show_FOREST)) {
|
|
|
|
|
int i, pid = w->ppt[w->begtask]->tid;
|
|
|
|
|
#ifdef TREE_VPROMPT
|
|
|
|
|
int got = get_int(fmtmk(N_txt(XTRA_vforest_fmt), pid));
|
|
|
|
|
if (got < GET_NUM_NOT) break;
|
|
|
|
|
if (got > GET_NUM_NOT) pid = got;
|
|
|
|
|
#endif
|
|
|
|
|
for (i = 0; i < Hide_tot; i++) {
|
|
|
|
|
if (Hide_pid[i] == pid || Hide_pid[i] == -pid) {
|
|
|
|
|
Hide_pid[i] = -Hide_pid[i];
|
|
|
|
|
break;
|
|
|
|
|
}
|
|
|
|
|
}
|
2018-10-08 10:30:00 +05:30
|
|
|
|
if (i == Hide_tot) {
|
|
|
|
|
static int totsav;
|
|
|
|
|
if (Hide_tot >= totsav) {
|
|
|
|
|
totsav += 128;
|
|
|
|
|
Hide_pid = alloc_r(Hide_pid, sizeof(int) * totsav);
|
|
|
|
|
}
|
|
|
|
|
Hide_pid[Hide_tot++] = pid;
|
|
|
|
|
} else {
|
|
|
|
|
// if everything's expanded, let's empty the array ...
|
|
|
|
|
for (i = 0; i < Hide_tot; i++)
|
|
|
|
|
if (Hide_pid[i] > 0) break;
|
|
|
|
|
if (i == Hide_tot) Hide_tot = 0;
|
|
|
|
|
}
|
2018-07-10 10:30:00 +05:30
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
break;
|
2002-06-19 05:15:30 +05:30
|
|
|
|
case 'x':
|
2011-03-31 16:45:12 +05:30
|
|
|
|
if (VIZCHKw(w)) {
|
2011-12-06 06:27:46 +05:30
|
|
|
|
#ifdef USE_X_COLHDR
|
2011-03-31 16:45:12 +05:30
|
|
|
|
TOGw(w, Show_HICOLS);
|
|
|
|
|
capsmk(w);
|
2011-12-06 06:27:46 +05:30
|
|
|
|
#else
|
2015-10-24 10:30:00 +05:30
|
|
|
|
if (ENUviz(w, w->rc.sortindx)
|
|
|
|
|
&& !CHKw(w, NOHIFND_xxx | NOHISEL_xxx)) {
|
2011-12-06 06:27:46 +05:30
|
|
|
|
TOGw(w, Show_HICOLS);
|
|
|
|
|
if (ENUpos(w, w->rc.sortindx) < w->begpflg) {
|
|
|
|
|
if (CHKw(w, Show_HICOLS)) w->begpflg += 2;
|
|
|
|
|
else w->begpflg -= 2;
|
|
|
|
|
if (0 > w->begpflg) w->begpflg = 0;
|
|
|
|
|
}
|
|
|
|
|
capsmk(w);
|
2011-09-12 17:48:23 +05:30
|
|
|
|
}
|
|
|
|
|
#endif
|
2002-06-19 05:15:30 +05:30
|
|
|
|
}
|
|
|
|
|
break;
|
|
|
|
|
case 'y':
|
2011-03-31 16:45:12 +05:30
|
|
|
|
if (VIZCHKw(w)) {
|
|
|
|
|
TOGw(w, Show_HIROWS);
|
|
|
|
|
capsmk(w);
|
2002-06-19 05:15:30 +05:30
|
|
|
|
}
|
|
|
|
|
break;
|
|
|
|
|
case 'z':
|
2011-03-31 16:45:12 +05:30
|
|
|
|
if (VIZCHKw(w)) {
|
|
|
|
|
TOGw(w, Show_COLORS);
|
|
|
|
|
capsmk(w);
|
2002-06-19 05:15:30 +05:30
|
|
|
|
}
|
|
|
|
|
break;
|
2011-03-31 16:45:12 +05:30
|
|
|
|
default: // keep gcc happy
|
2002-06-19 05:15:30 +05:30
|
|
|
|
break;
|
2011-03-31 16:45:12 +05:30
|
|
|
|
}
|
|
|
|
|
} // end: keys_task
|
2002-05-30 09:14:46 +05:30
|
|
|
|
|
|
|
|
|
|
2011-03-31 16:45:12 +05:30
|
|
|
|
static void keys_window (int ch) {
|
|
|
|
|
WIN_t *w = Curwin; // avoid gcc bloat with a local copy
|
2002-05-30 09:14:46 +05:30
|
|
|
|
|
2011-03-31 16:45:12 +05:30
|
|
|
|
switch (ch) {
|
|
|
|
|
case '+':
|
|
|
|
|
if (ALTCHKw) wins_reflag(Flags_OFF, EQUWINS_xxx);
|
2018-06-19 10:30:00 +05:30
|
|
|
|
Hide_tot = 0;
|
2011-03-31 16:45:12 +05:30
|
|
|
|
break;
|
|
|
|
|
case '-':
|
|
|
|
|
if (ALTCHKw) TOGw(w, Show_TASKON);
|
|
|
|
|
break;
|
2002-10-02 05:40:30 +05:30
|
|
|
|
case '=':
|
2013-02-27 11:30:00 +05:30
|
|
|
|
win_reset(w);
|
2018-06-19 10:30:00 +05:30
|
|
|
|
Hide_tot = 0;
|
2002-06-19 05:15:30 +05:30
|
|
|
|
break;
|
2011-03-31 16:45:12 +05:30
|
|
|
|
case '_':
|
|
|
|
|
if (ALTCHKw) wins_reflag(Flags_TOG, Show_TASKON);
|
2002-06-19 05:15:30 +05:30
|
|
|
|
break;
|
2011-12-17 01:34:38 +05:30
|
|
|
|
case '&':
|
|
|
|
|
case 'L':
|
2013-03-03 11:30:00 +05:30
|
|
|
|
if (VIZCHKw(w)) find_string(ch);
|
2011-12-17 01:34:38 +05:30
|
|
|
|
break;
|
2011-03-31 16:45:12 +05:30
|
|
|
|
case 'A':
|
|
|
|
|
Rc.mode_altscr = !Rc.mode_altscr;
|
|
|
|
|
break;
|
|
|
|
|
case 'a':
|
|
|
|
|
case 'w':
|
|
|
|
|
if (ALTCHKw) win_select(ch);
|
|
|
|
|
break;
|
|
|
|
|
case 'G':
|
|
|
|
|
if (ALTCHKw) {
|
2011-04-14 02:38:14 +05:30
|
|
|
|
char tmp[SMLBUFSIZ];
|
2013-01-16 11:30:00 +05:30
|
|
|
|
STRLCPY(tmp, ioline(fmtmk(N_fmt(NAME_windows_fmt), w->rc.winname)));
|
2014-04-27 10:30:00 +05:30
|
|
|
|
if (tmp[0] && tmp[0] != kbd_ESC) win_names(w, tmp);
|
2002-09-13 17:12:44 +05:30
|
|
|
|
}
|
2002-06-19 05:15:30 +05:30
|
|
|
|
break;
|
2011-03-31 16:45:12 +05:30
|
|
|
|
case kbd_UP:
|
2018-06-20 10:30:00 +05:30
|
|
|
|
if (VIZCHKw(w)) if (CHKw(w, Show_IDLEPS)) w->begnext = -1;
|
2011-03-31 16:45:12 +05:30
|
|
|
|
break;
|
|
|
|
|
case kbd_DOWN:
|
2018-06-20 10:30:00 +05:30
|
|
|
|
if (VIZCHKw(w)) if (CHKw(w, Show_IDLEPS)) w->begnext = +1;
|
2011-03-31 16:45:12 +05:30
|
|
|
|
break;
|
2012-06-30 10:30:00 +05:30
|
|
|
|
#ifdef USE_X_COLHDR // ------------------------------------
|
2011-04-14 02:38:14 +05:30
|
|
|
|
case kbd_LEFT:
|
2012-06-30 10:30:00 +05:30
|
|
|
|
#ifndef SCROLLVAR_NO
|
|
|
|
|
if (VIZCHKw(w)) {
|
|
|
|
|
if (VARleft(w))
|
|
|
|
|
w->varcolbeg -= SCROLLAMT;
|
|
|
|
|
else if (0 < w->begpflg)
|
|
|
|
|
w->begpflg -= 1;
|
|
|
|
|
}
|
|
|
|
|
#else
|
2011-04-14 02:38:14 +05:30
|
|
|
|
if (VIZCHKw(w)) if (0 < w->begpflg) w->begpflg -= 1;
|
2012-06-30 10:30:00 +05:30
|
|
|
|
#endif
|
2011-04-14 02:38:14 +05:30
|
|
|
|
break;
|
|
|
|
|
case kbd_RIGHT:
|
2012-06-30 10:30:00 +05:30
|
|
|
|
#ifndef SCROLLVAR_NO
|
|
|
|
|
if (VIZCHKw(w)) {
|
|
|
|
|
if (VARright(w)) {
|
|
|
|
|
w->varcolbeg += SCROLLAMT;
|
|
|
|
|
if (0 > w->varcolbeg) w->varcolbeg = 0;
|
|
|
|
|
} else if (w->begpflg + 1 < w->totpflgs)
|
|
|
|
|
w->begpflg += 1;
|
|
|
|
|
}
|
|
|
|
|
#else
|
2011-04-14 02:38:14 +05:30
|
|
|
|
if (VIZCHKw(w)) if (w->begpflg + 1 < w->totpflgs) w->begpflg += 1;
|
2012-06-30 10:30:00 +05:30
|
|
|
|
#endif
|
2011-04-14 02:38:14 +05:30
|
|
|
|
break;
|
2012-06-30 10:30:00 +05:30
|
|
|
|
#else // USE_X_COLHDR ------------------------------------
|
2011-03-31 16:45:12 +05:30
|
|
|
|
case kbd_LEFT:
|
2012-06-30 10:30:00 +05:30
|
|
|
|
#ifndef SCROLLVAR_NO
|
|
|
|
|
if (VIZCHKw(w)) {
|
|
|
|
|
if (VARleft(w))
|
|
|
|
|
w->varcolbeg -= SCROLLAMT;
|
|
|
|
|
else if (0 < w->begpflg) {
|
|
|
|
|
w->begpflg -= 1;
|
2014-02-25 11:30:00 +05:30
|
|
|
|
if (EU_MAXPFLGS < w->pflgsall[w->begpflg]) w->begpflg -= 2;
|
2012-06-30 10:30:00 +05:30
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
#else
|
2011-03-31 16:45:12 +05:30
|
|
|
|
if (VIZCHKw(w)) if (0 < w->begpflg) {
|
|
|
|
|
w->begpflg -= 1;
|
2014-02-25 11:30:00 +05:30
|
|
|
|
if (EU_MAXPFLGS < w->pflgsall[w->begpflg]) w->begpflg -= 2;
|
2011-03-31 16:45:12 +05:30
|
|
|
|
}
|
2012-06-30 10:30:00 +05:30
|
|
|
|
#endif
|
2011-03-31 16:45:12 +05:30
|
|
|
|
break;
|
|
|
|
|
case kbd_RIGHT:
|
2012-06-30 10:30:00 +05:30
|
|
|
|
#ifndef SCROLLVAR_NO
|
|
|
|
|
if (VIZCHKw(w)) {
|
|
|
|
|
if (VARright(w)) {
|
|
|
|
|
w->varcolbeg += SCROLLAMT;
|
|
|
|
|
if (0 > w->varcolbeg) w->varcolbeg = 0;
|
|
|
|
|
} else if (w->begpflg + 1 < w->totpflgs) {
|
2014-02-25 11:30:00 +05:30
|
|
|
|
if (EU_MAXPFLGS < w->pflgsall[w->begpflg])
|
2012-06-30 10:30:00 +05:30
|
|
|
|
w->begpflg += (w->begpflg + 3 < w->totpflgs) ? 3 : 0;
|
|
|
|
|
else w->begpflg += 1;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
#else
|
2011-03-31 16:45:12 +05:30
|
|
|
|
if (VIZCHKw(w)) if (w->begpflg + 1 < w->totpflgs) {
|
2014-02-25 11:30:00 +05:30
|
|
|
|
if (EU_MAXPFLGS < w->pflgsall[w->begpflg])
|
2011-03-31 16:45:12 +05:30
|
|
|
|
w->begpflg += (w->begpflg + 3 < w->totpflgs) ? 3 : 0;
|
|
|
|
|
else w->begpflg += 1;
|
|
|
|
|
}
|
2011-04-14 02:38:14 +05:30
|
|
|
|
#endif
|
2012-06-30 10:30:00 +05:30
|
|
|
|
break;
|
|
|
|
|
#endif // USE_X_COLHDR ------------------------------------
|
2011-03-31 16:45:12 +05:30
|
|
|
|
case kbd_PGUP:
|
2018-06-06 10:30:00 +05:30
|
|
|
|
if (VIZCHKw(w)) {
|
|
|
|
|
if (CHKw(w, Show_IDLEPS) && 0 < w->begtask) {
|
2019-06-29 10:30:00 +05:30
|
|
|
|
w->begnext = -(w->winlines - (Rc.mode_altscr ? 1 : 2));
|
2011-03-31 16:45:12 +05:30
|
|
|
|
}
|
2018-06-06 10:30:00 +05:30
|
|
|
|
}
|
2011-03-31 16:45:12 +05:30
|
|
|
|
break;
|
|
|
|
|
case kbd_PGDN:
|
2018-06-06 10:30:00 +05:30
|
|
|
|
if (VIZCHKw(w)) {
|
|
|
|
|
if (CHKw(w, Show_IDLEPS) && w->begtask < Frame_maxtask - 1) {
|
2019-06-29 10:30:00 +05:30
|
|
|
|
w->begnext = +(w->winlines - (Rc.mode_altscr ? 1 : 2));
|
2018-06-06 10:30:00 +05:30
|
|
|
|
}
|
|
|
|
|
}
|
2011-03-31 16:45:12 +05:30
|
|
|
|
break;
|
|
|
|
|
case kbd_HOME:
|
2012-06-30 10:30:00 +05:30
|
|
|
|
#ifndef SCROLLVAR_NO
|
2018-06-06 10:30:00 +05:30
|
|
|
|
if (VIZCHKw(w)) if (CHKw(w, Show_IDLEPS)) w->begtask = w->begpflg = w->varcolbeg = 0;
|
2018-06-23 22:30:00 +05:30
|
|
|
|
mkVIZrow1(w);
|
2012-06-30 10:30:00 +05:30
|
|
|
|
#else
|
2018-06-06 10:30:00 +05:30
|
|
|
|
if (VIZCHKw(w)) if (CHKw(w, Show_IDLEPS)) w->begtask = w->begpflg = 0;
|
2018-06-23 22:30:00 +05:30
|
|
|
|
mkVIZrow1(w);
|
2012-06-30 10:30:00 +05:30
|
|
|
|
#endif
|
2011-03-31 16:45:12 +05:30
|
|
|
|
break;
|
|
|
|
|
case kbd_END:
|
|
|
|
|
if (VIZCHKw(w)) {
|
2018-06-06 10:30:00 +05:30
|
|
|
|
if (CHKw(w, Show_IDLEPS)) {
|
2018-06-20 10:30:00 +05:30
|
|
|
|
w->begnext = (Frame_maxtask - w->winlines) + 1;
|
2018-06-06 10:30:00 +05:30
|
|
|
|
w->begpflg = w->endpflg;
|
2012-06-30 10:30:00 +05:30
|
|
|
|
#ifndef SCROLLVAR_NO
|
2018-06-06 10:30:00 +05:30
|
|
|
|
w->varcolbeg = 0;
|
2012-06-30 10:30:00 +05:30
|
|
|
|
#endif
|
2018-06-06 10:30:00 +05:30
|
|
|
|
}
|
2002-09-13 17:12:44 +05:30
|
|
|
|
}
|
2002-06-19 05:15:30 +05:30
|
|
|
|
break;
|
2011-03-31 16:45:12 +05:30
|
|
|
|
default: // keep gcc happy
|
|
|
|
|
break;
|
|
|
|
|
}
|
|
|
|
|
} // end: keys_window
|
|
|
|
|
|
2002-05-30 09:14:46 +05:30
|
|
|
|
|
2011-03-31 16:45:12 +05:30
|
|
|
|
static void keys_xtra (int ch) {
|
|
|
|
|
// const char *xmsg;
|
|
|
|
|
WIN_t *w = Curwin; // avoid gcc bloat with a local copy
|
|
|
|
|
|
2011-08-30 17:35:45 +05:30
|
|
|
|
#ifdef TREE_NORESET
|
|
|
|
|
if (CHKw(w, Show_FOREST)) return;
|
|
|
|
|
#else
|
|
|
|
|
OFFw(w, Show_FOREST);
|
|
|
|
|
#endif
|
2012-04-23 22:20:49 +05:30
|
|
|
|
/* these keys represent old-top compatibility --
|
2011-03-31 16:45:12 +05:30
|
|
|
|
they're grouped here so that if users could ever be weaned,
|
|
|
|
|
we would just whack do_key's key_tab entry and this function... */
|
|
|
|
|
switch (ch) {
|
|
|
|
|
case 'M':
|
2014-02-25 11:30:00 +05:30
|
|
|
|
w->rc.sortindx = EU_MEM;
|
2011-03-31 16:45:12 +05:30
|
|
|
|
// xmsg = "Memory";
|
|
|
|
|
break;
|
|
|
|
|
case 'N':
|
2014-02-25 11:30:00 +05:30
|
|
|
|
w->rc.sortindx = EU_PID;
|
2011-03-31 16:45:12 +05:30
|
|
|
|
// xmsg = "Numerical";
|
|
|
|
|
break;
|
|
|
|
|
case 'P':
|
2014-02-25 11:30:00 +05:30
|
|
|
|
w->rc.sortindx = EU_CPU;
|
2011-03-31 16:45:12 +05:30
|
|
|
|
// xmsg = "CPU";
|
|
|
|
|
break;
|
2002-11-29 21:31:04 +05:30
|
|
|
|
case 'T':
|
2014-02-25 11:30:00 +05:30
|
|
|
|
w->rc.sortindx = EU_TM2;
|
2011-03-31 16:45:12 +05:30
|
|
|
|
// xmsg = "Time";
|
|
|
|
|
break;
|
|
|
|
|
default: // keep gcc happy
|
2002-11-29 21:31:04 +05:30
|
|
|
|
break;
|
2011-03-31 16:45:12 +05:30
|
|
|
|
}
|
|
|
|
|
// some have objected to this message, so we'll just keep silent...
|
2012-09-18 11:31:01 +05:30
|
|
|
|
// show_msg(fmtmk("%s sort compatibility key honored", xmsg));
|
2011-03-31 16:45:12 +05:30
|
|
|
|
} // end: keys_xtra
|
|
|
|
|
|
2020-05-21 10:30:00 +05:30
|
|
|
|
/*###### Cpu Display Secondary support (summary_show helpers) ##########*/
|
2002-05-30 09:14:46 +05:30
|
|
|
|
|
2020-05-13 10:30:00 +05:30
|
|
|
|
/*
|
2020-08-20 10:30:00 +05:30
|
|
|
|
* note how alphabetical order is maintained within carefully chosen |
|
|
|
|
|
* function names such as: (s)cpu_see, (t)cpu_tics, and (u)cpu_unify |
|
2020-12-22 11:30:00 +05:30
|
|
|
|
* with every name exactly 1 letter more than the preceding function |
|
2020-08-20 10:30:00 +05:30
|
|
|
|
* ( surely, this must make us run much more efficiently. amirite? ) | */
|
|
|
|
|
|
|
|
|
|
/*
|
|
|
|
|
* Cpu *Helper* function to show the percentages for one or two cpus |
|
|
|
|
|
* as a single line. We return the number of lines actually printed. | */
|
|
|
|
|
static inline int cpu_see (const char *str, int nobuf) {
|
2020-05-13 10:30:00 +05:30
|
|
|
|
static char row[ROWMINSIZ];
|
|
|
|
|
static int tog;
|
|
|
|
|
char *p;
|
|
|
|
|
|
|
|
|
|
p = scat(row, str);
|
2020-07-09 10:30:00 +05:30
|
|
|
|
if (Curwin->rc.double_up
|
|
|
|
|
&& (!nobuf)
|
|
|
|
|
&& (!tog)) {
|
2020-05-13 10:30:00 +05:30
|
|
|
|
scat(p, Double_sp);
|
|
|
|
|
tog = 1;
|
|
|
|
|
return 0;
|
|
|
|
|
}
|
|
|
|
|
scat(p, "\n");
|
|
|
|
|
show_special(0, row);
|
|
|
|
|
row[0] = '\0';
|
|
|
|
|
tog = 0;
|
|
|
|
|
return 1;
|
2020-08-20 10:30:00 +05:30
|
|
|
|
} // end: cpu_see
|
2020-05-13 10:30:00 +05:30
|
|
|
|
|
|
|
|
|
|
2011-03-31 16:45:12 +05:30
|
|
|
|
/*
|
2020-08-20 10:30:00 +05:30
|
|
|
|
* State display *Helper* function to calculate plus display (maybe) |
|
|
|
|
|
* the percentages for a single cpu. In this way, we'll support the |
|
|
|
|
|
* following environments without (hopefully) that usual code bloat: |
|
|
|
|
|
* 1) single cpu platforms (no matter the paucity of these types) |
|
|
|
|
|
* 2) modest smp boxes with ample room for each cpu's percentages |
|
|
|
|
|
* 3) massive smp guys leaving little or no room for that process |
|
|
|
|
|
* display and thus requiring the '1', '4', or '!' cpu toggles |
|
|
|
|
|
* ( we return the number of lines printed, as reported by cpu_see ) | */
|
2020-05-21 10:30:00 +05:30
|
|
|
|
static int cpu_tics (CPU_t *cpu, const char *pfx, int nobuf) {
|
2011-03-31 16:45:12 +05:30
|
|
|
|
/* we'll trim to zero if we get negative time ticks,
|
2012-02-01 11:30:00 +05:30
|
|
|
|
which has happened with some SMP kernels (pre-2.4?)
|
|
|
|
|
and when cpus are dynamically added or removed */
|
2011-03-31 16:45:12 +05:30
|
|
|
|
#define TRIMz(x) ((tz = (SIC_t)(x)) < 0 ? 0 : tz)
|
2016-12-26 18:37:07 +05:30
|
|
|
|
// user syst nice idle wait hirg sirq steal
|
2006-06-25 07:45:36 +05:30
|
|
|
|
SIC_t u_frme, s_frme, n_frme, i_frme, w_frme, x_frme, y_frme, z_frme, tot_frme, tz;
|
2002-11-08 06:01:28 +05:30
|
|
|
|
float scale;
|
|
|
|
|
|
2012-02-01 11:30:00 +05:30
|
|
|
|
u_frme = TRIMz(cpu->cur.u - cpu->sav.u);
|
|
|
|
|
s_frme = TRIMz(cpu->cur.s - cpu->sav.s);
|
|
|
|
|
n_frme = TRIMz(cpu->cur.n - cpu->sav.n);
|
|
|
|
|
i_frme = TRIMz(cpu->cur.i - cpu->sav.i);
|
|
|
|
|
w_frme = TRIMz(cpu->cur.w - cpu->sav.w);
|
|
|
|
|
x_frme = TRIMz(cpu->cur.x - cpu->sav.x);
|
|
|
|
|
y_frme = TRIMz(cpu->cur.y - cpu->sav.y);
|
|
|
|
|
z_frme = TRIMz(cpu->cur.z - cpu->sav.z);
|
2006-06-25 07:45:36 +05:30
|
|
|
|
tot_frme = u_frme + s_frme + n_frme + i_frme + w_frme + x_frme + y_frme + z_frme;
|
2016-12-26 18:37:07 +05:30
|
|
|
|
#ifndef CPU_ZEROTICS
|
2012-02-09 11:29:59 +05:30
|
|
|
|
if (tot_frme < cpu->edge)
|
2012-02-03 11:30:00 +05:30
|
|
|
|
tot_frme = u_frme = s_frme = n_frme = i_frme = w_frme = x_frme = y_frme = z_frme = 0;
|
|
|
|
|
#endif
|
2016-12-26 18:37:07 +05:30
|
|
|
|
if (1 > tot_frme) i_frme = tot_frme = 1;
|
2002-11-08 06:01:28 +05:30
|
|
|
|
scale = 100.0 / (float)tot_frme;
|
|
|
|
|
|
2011-03-31 16:45:12 +05:30
|
|
|
|
/* display some kinda' cpu state percentages
|
|
|
|
|
(who or what is explained by the passed prefix) */
|
2018-05-18 10:30:00 +05:30
|
|
|
|
if (Curwin->rc.graph_cpus) {
|
|
|
|
|
static struct {
|
|
|
|
|
const char *user, *syst, *type;
|
|
|
|
|
} gtab[] = {
|
|
|
|
|
{ "%-.*s~7", "%-.*s~8", Graph_bars },
|
|
|
|
|
{ "%-.*s~4", "%-.*s~6", Graph_blks }
|
|
|
|
|
};
|
2014-06-22 10:30:00 +05:30
|
|
|
|
char user[SMLBUFSIZ], syst[SMLBUFSIZ], dual[MEDBUFSIZ];
|
2014-06-27 10:30:00 +05:30
|
|
|
|
int ix = Curwin->rc.graph_cpus - 1;
|
2014-06-22 10:30:00 +05:30
|
|
|
|
float pct_user = (float)(u_frme + n_frme) * scale,
|
2016-12-26 18:37:07 +05:30
|
|
|
|
pct_syst = (float)(s_frme + x_frme + y_frme) * scale;
|
2014-08-07 10:30:00 +05:30
|
|
|
|
#ifndef QUICK_GRAPHS
|
|
|
|
|
int num_user = (int)((pct_user * Graph_adj) + .5),
|
|
|
|
|
num_syst = (int)((pct_syst * Graph_adj) + .5);
|
2016-12-26 18:37:07 +05:30
|
|
|
|
if (num_user + num_syst > Graph_len) num_syst = Graph_len - num_user;
|
2014-08-07 10:30:00 +05:30
|
|
|
|
snprintf(user, sizeof(user), gtab[ix].user, num_user, gtab[ix].type);
|
|
|
|
|
snprintf(syst, sizeof(syst), gtab[ix].syst, num_syst, gtab[ix].type);
|
|
|
|
|
#else
|
2014-08-08 22:29:59 +05:30
|
|
|
|
snprintf(user, sizeof(user), gtab[ix].user, (int)((pct_user * Graph_adj) + .5), gtab[ix].type);
|
2014-08-07 10:30:00 +05:30
|
|
|
|
snprintf(syst, sizeof(syst), gtab[ix].syst, (int)((pct_syst * Graph_adj) + .4), gtab[ix].type);
|
|
|
|
|
#endif
|
2014-06-22 10:30:00 +05:30
|
|
|
|
snprintf(dual, sizeof(dual), "%s%s", user, syst);
|
2020-08-20 10:30:00 +05:30
|
|
|
|
return cpu_see(fmtmk("%s ~3%#5.1f~2/%-#5.1f~3 %3.0f[~1%-*s]~1"
|
2020-05-13 10:30:00 +05:30
|
|
|
|
, pfx, pct_user, pct_syst, pct_user + pct_syst, Graph_len +4, dual), nobuf);
|
2014-06-18 10:30:00 +05:30
|
|
|
|
} else {
|
2020-08-20 10:30:00 +05:30
|
|
|
|
return cpu_see(fmtmk(Cpu_States_fmts, pfx
|
2014-06-18 10:30:00 +05:30
|
|
|
|
, (float)u_frme * scale, (float)s_frme * scale
|
|
|
|
|
, (float)n_frme * scale, (float)i_frme * scale
|
|
|
|
|
, (float)w_frme * scale, (float)x_frme * scale
|
2020-05-13 10:30:00 +05:30
|
|
|
|
, (float)y_frme * scale, (float)z_frme * scale), nobuf);
|
2014-06-18 10:30:00 +05:30
|
|
|
|
}
|
2011-03-31 16:45:12 +05:30
|
|
|
|
#undef TRIMz
|
2020-05-21 10:30:00 +05:30
|
|
|
|
} // end: cpu_tics
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
/*
|
2020-08-20 10:30:00 +05:30
|
|
|
|
* Cpu *Helper* function to combine additional cpu statistics in our |
|
|
|
|
|
* efforts to reduce the total number of processors that'll be shown |
|
|
|
|
|
* ( we return the number of lines printed, as reported by cpu_see ) | */
|
2020-05-21 10:30:00 +05:30
|
|
|
|
static int cpu_unify (CPU_t *cpu, int nobuf) {
|
|
|
|
|
static CPU_t accum;
|
|
|
|
|
static int ix, beg;
|
|
|
|
|
char pfx[16];
|
|
|
|
|
int n;
|
|
|
|
|
|
|
|
|
|
accum.cur.u += cpu->cur.u; accum.cur.s += cpu->cur.s;
|
|
|
|
|
accum.cur.n += cpu->cur.n; accum.cur.i += cpu->cur.i;
|
|
|
|
|
accum.cur.w += cpu->cur.w; accum.cur.x += cpu->cur.x;
|
|
|
|
|
accum.cur.y += cpu->cur.y; accum.cur.z += cpu->cur.z;
|
|
|
|
|
accum.sav.u += cpu->sav.u; accum.sav.s += cpu->sav.s;
|
|
|
|
|
accum.sav.n += cpu->sav.n; accum.sav.i += cpu->sav.i;
|
|
|
|
|
accum.sav.w += cpu->sav.w; accum.sav.x += cpu->sav.x;
|
|
|
|
|
accum.sav.y += cpu->sav.y; accum.sav.z += cpu->sav.z;
|
|
|
|
|
|
|
|
|
|
if (!ix) beg = cpu->id;
|
2020-05-29 10:30:00 +05:30
|
|
|
|
if (nobuf || ix >= Curwin->rc.combine_cpus) {
|
2020-05-21 10:30:00 +05:30
|
|
|
|
snprintf(pfx, sizeof(pfx), "%-7.7s:", fmtmk("%d-%d", beg, cpu->id));
|
|
|
|
|
n = cpu_tics(&accum, pfx, nobuf);
|
|
|
|
|
memset(&accum, 0, sizeof(CPU_t));
|
2020-06-16 10:30:00 +05:30
|
|
|
|
ix = 0;
|
2020-05-21 10:30:00 +05:30
|
|
|
|
return n;
|
|
|
|
|
}
|
|
|
|
|
++ix;
|
|
|
|
|
return 0;
|
|
|
|
|
} // end: cpu_unify
|
|
|
|
|
|
|
|
|
|
/*###### Main Screen routines ##########################################*/
|
|
|
|
|
|
|
|
|
|
/*
|
|
|
|
|
* Process keyboard input during the main loop */
|
|
|
|
|
static void do_key (int ch) {
|
|
|
|
|
static struct {
|
|
|
|
|
void (*func)(int ch);
|
|
|
|
|
char keys[SMLBUFSIZ];
|
|
|
|
|
} key_tab[] = {
|
|
|
|
|
{ keys_global,
|
|
|
|
|
{ '?', 'B', 'd', 'E', 'e', 'F', 'f', 'g', 'H', 'h'
|
|
|
|
|
, 'I', 'k', 'r', 's', 'X', 'Y', 'Z', '0'
|
|
|
|
|
, kbd_ENTER, kbd_SPACE, '\0' } },
|
|
|
|
|
{ keys_summary,
|
|
|
|
|
{ '!', '1', '2', '3', '4', 'C', 'l', 'm', 't', '\0' } },
|
|
|
|
|
{ keys_task,
|
|
|
|
|
{ '#', '<', '>', 'b', 'c', 'i', 'J', 'j', 'n', 'O', 'o'
|
|
|
|
|
, 'R', 'S', 'U', 'u', 'V', 'v', 'x', 'y', 'z'
|
|
|
|
|
, kbd_CtrlO, '\0' } },
|
|
|
|
|
{ keys_window,
|
|
|
|
|
{ '+', '-', '=', '_', '&', 'A', 'a', 'G', 'L', 'w'
|
|
|
|
|
, kbd_UP, kbd_DOWN, kbd_LEFT, kbd_RIGHT, kbd_PGUP, kbd_PGDN
|
|
|
|
|
, kbd_HOME, kbd_END, '\0' } },
|
|
|
|
|
{ keys_xtra,
|
|
|
|
|
{ 'M', 'N', 'P', 'T', '\0'} }
|
|
|
|
|
};
|
|
|
|
|
int i;
|
|
|
|
|
|
|
|
|
|
switch (ch) {
|
|
|
|
|
case 0: // ignored (always)
|
|
|
|
|
case kbd_ESC: // ignored (sometimes)
|
|
|
|
|
goto all_done;
|
|
|
|
|
case 'q': // no return from this guy
|
|
|
|
|
bye_bye(NULL);
|
|
|
|
|
case 'W': // no need for rebuilds
|
|
|
|
|
write_rcfile();
|
|
|
|
|
goto all_done;
|
|
|
|
|
default: // and now, the real work...
|
2020-09-13 10:30:00 +05:30
|
|
|
|
// and just in case 'Monpids' is active but matched no processes ...
|
|
|
|
|
if (!Frame_maxtask && ch != '=') goto all_done;
|
2020-05-21 10:30:00 +05:30
|
|
|
|
for (i = 0; i < MAXTBL(key_tab); ++i)
|
|
|
|
|
if (strchr(key_tab[i].keys, ch)) {
|
|
|
|
|
key_tab[i].func(ch);
|
|
|
|
|
Frames_signal = BREAK_kbd;
|
|
|
|
|
goto all_done;
|
|
|
|
|
}
|
|
|
|
|
};
|
|
|
|
|
/* Frames_signal above will force a rebuild of all column headers and
|
|
|
|
|
the PROC_FILLxxx flags. It's NOT simply lazy programming. Here are
|
|
|
|
|
some keys that COULD require new column headers and/or libproc flags:
|
|
|
|
|
'A' - likely
|
|
|
|
|
'c' - likely when !Mode_altscr, maybe when Mode_altscr
|
|
|
|
|
'F' - likely
|
|
|
|
|
'f' - likely
|
|
|
|
|
'g' - likely
|
|
|
|
|
'H' - likely
|
|
|
|
|
'I' - likely
|
|
|
|
|
'J' - always
|
|
|
|
|
'j' - always
|
|
|
|
|
'Z' - likely, if 'Curwin' changed when !Mode_altscr
|
|
|
|
|
'-' - likely (restricted to Mode_altscr)
|
|
|
|
|
'_' - likely (restricted to Mode_altscr)
|
|
|
|
|
'=' - maybe, but only when Mode_altscr
|
|
|
|
|
'+' - likely (restricted to Mode_altscr)
|
|
|
|
|
PLUS, likely for FOUR of the EIGHT cursor motion keys (scrolled)
|
|
|
|
|
( At this point we have a human being involved and so have all the time )
|
|
|
|
|
( in the world. We can afford a few extra cpu cycles every now & then! )
|
|
|
|
|
*/
|
|
|
|
|
|
|
|
|
|
show_msg(N_txt(UNKNOWN_cmds_txt));
|
|
|
|
|
all_done:
|
|
|
|
|
sysinfo_refresh(1); // let's be more responsive to hot-pluggin'
|
|
|
|
|
putp((Cursor_state = Cap_curs_hide));
|
|
|
|
|
} // end: do_key
|
2002-11-08 06:01:28 +05:30
|
|
|
|
|
|
|
|
|
|
2011-03-31 16:45:12 +05:30
|
|
|
|
/*
|
2011-09-24 19:57:37 +05:30
|
|
|
|
* In support of a new frame:
|
|
|
|
|
* 1) Display uptime and load average (maybe)
|
|
|
|
|
* 2) Display task/cpu states (maybe)
|
|
|
|
|
* 3) Display memory & swap usage (maybe) */
|
2011-08-30 17:35:45 +05:30
|
|
|
|
static void summary_show (void) {
|
2011-03-31 16:45:12 +05:30
|
|
|
|
#define isROOM(f,n) (CHKw(w, f) && Msg_row + (n) < Screen_rows - 1)
|
2011-05-05 15:37:25 +05:30
|
|
|
|
#define anyFLG 0xffffff
|
2011-03-31 16:45:12 +05:30
|
|
|
|
WIN_t *w = Curwin; // avoid gcc bloat with a local copy
|
2013-04-08 12:30:00 +05:30
|
|
|
|
char tmp[MEDBUFSIZ];
|
|
|
|
|
int i;
|
2002-05-30 09:14:46 +05:30
|
|
|
|
|
2004-07-07 00:43:38 +05:30
|
|
|
|
// Display Uptime and Loadavg
|
2011-03-31 16:45:12 +05:30
|
|
|
|
if (isROOM(View_LOADAV, 1)) {
|
|
|
|
|
if (!Rc.mode_altscr)
|
2012-02-22 21:05:12 +05:30
|
|
|
|
show_special(0, fmtmk(LOADAV_line, Myname, sprint_uptime(0)));
|
2011-03-31 16:45:12 +05:30
|
|
|
|
else
|
|
|
|
|
show_special(0, fmtmk(CHKw(w, Show_TASKON)? LOADAV_line_alt : LOADAV_line
|
2012-02-22 21:05:12 +05:30
|
|
|
|
, w->grpname, sprint_uptime(0)));
|
2002-06-19 05:15:30 +05:30
|
|
|
|
Msg_row += 1;
|
2013-04-08 12:30:00 +05:30
|
|
|
|
} // end: View_LOADAV
|
2002-05-30 09:14:46 +05:30
|
|
|
|
|
2004-07-07 00:43:38 +05:30
|
|
|
|
// Display Task and Cpu(s) States
|
2011-03-31 16:45:12 +05:30
|
|
|
|
if (isROOM(View_STATES, 2)) {
|
2011-10-12 00:32:59 +05:30
|
|
|
|
show_special(0, fmtmk(N_unq(STATE_line_1_fmt)
|
|
|
|
|
, Thread_mode ? N_txt(WORD_threads_txt) : N_txt(WORD_process_txt)
|
2011-03-31 16:45:12 +05:30
|
|
|
|
, Frame_maxtask, Frame_running, Frame_sleepin
|
|
|
|
|
, Frame_stopped, Frame_zombied));
|
2002-11-08 06:01:28 +05:30
|
|
|
|
Msg_row += 1;
|
|
|
|
|
|
2017-03-23 10:30:00 +05:30
|
|
|
|
cpus_refresh();
|
2002-11-25 03:34:03 +05:30
|
|
|
|
|
2013-04-25 10:30:00 +05:30
|
|
|
|
if (!Numa_node_tot) goto numa_nope;
|
|
|
|
|
|
2013-04-08 12:30:00 +05:30
|
|
|
|
if (CHKw(w, View_CPUNOD)) {
|
|
|
|
|
if (Numa_node_sel < 0) {
|
|
|
|
|
// display the 1st /proc/stat line, then the nodes (if room)
|
2020-05-21 10:30:00 +05:30
|
|
|
|
Msg_row += cpu_tics(&Cpu_tics[smp_num_cpus], N_txt(WORD_allcpus_txt), 1);
|
2013-04-08 12:30:00 +05:30
|
|
|
|
// display each cpu node's states
|
|
|
|
|
for (i = 0; i < Numa_node_tot; i++) {
|
2017-03-23 10:30:00 +05:30
|
|
|
|
CPU_t *nod_ptr = &Cpu_tics[1 + smp_num_cpus + i];
|
2013-04-08 12:30:00 +05:30
|
|
|
|
if (!isROOM(anyFLG, 1)) break;
|
2014-01-05 11:30:00 +05:30
|
|
|
|
#ifndef OFF_NUMASKIP
|
|
|
|
|
if (nod_ptr->id) {
|
|
|
|
|
#endif
|
2013-04-08 12:30:00 +05:30
|
|
|
|
snprintf(tmp, sizeof(tmp), N_fmt(NUMA_nodenam_fmt), i);
|
2020-05-21 10:30:00 +05:30
|
|
|
|
Msg_row += cpu_tics(nod_ptr, tmp, 1);
|
2014-01-05 11:30:00 +05:30
|
|
|
|
#ifndef OFF_NUMASKIP
|
|
|
|
|
}
|
|
|
|
|
#endif
|
2013-04-08 12:30:00 +05:30
|
|
|
|
}
|
|
|
|
|
} else {
|
|
|
|
|
// display the node summary, then the associated cpus (if room)
|
|
|
|
|
snprintf(tmp, sizeof(tmp), N_fmt(NUMA_nodenam_fmt), Numa_node_sel);
|
2020-05-21 10:30:00 +05:30
|
|
|
|
Msg_row += cpu_tics(&Cpu_tics[1 + smp_num_cpus + Numa_node_sel], tmp, 1);
|
2020-05-30 10:30:00 +05:30
|
|
|
|
#ifdef PRETEND48CPU
|
|
|
|
|
for (i = 0; i < Cpu_true_tot; i++) {
|
|
|
|
|
#else
|
2013-04-08 12:30:00 +05:30
|
|
|
|
for (i = 0; i < Cpu_faux_tot; i++) {
|
2020-05-30 10:30:00 +05:30
|
|
|
|
#endif
|
2017-03-23 10:30:00 +05:30
|
|
|
|
if (Numa_node_sel == Cpu_tics[i].node) {
|
2013-04-08 12:30:00 +05:30
|
|
|
|
if (!isROOM(anyFLG, 1)) break;
|
2017-03-23 10:30:00 +05:30
|
|
|
|
snprintf(tmp, sizeof(tmp), N_fmt(WORD_eachcpu_fmt), Cpu_tics[i].id);
|
2020-05-21 10:30:00 +05:30
|
|
|
|
Msg_row += cpu_tics(&Cpu_tics[i], tmp, 1);
|
2013-04-08 12:30:00 +05:30
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
} else
|
2013-04-25 10:30:00 +05:30
|
|
|
|
numa_nope:
|
2011-03-31 16:45:12 +05:30
|
|
|
|
if (CHKw(w, View_CPUSUM)) {
|
2002-11-25 03:34:03 +05:30
|
|
|
|
// display just the 1st /proc/stat line
|
2020-05-21 10:30:00 +05:30
|
|
|
|
Msg_row += cpu_tics(&Cpu_tics[smp_num_cpus], N_txt(WORD_allcpus_txt), 1);
|
2002-11-25 03:34:03 +05:30
|
|
|
|
} else {
|
2011-03-31 16:45:12 +05:30
|
|
|
|
// display each cpu's states separately, screen height permitting...
|
2020-05-29 10:30:00 +05:30
|
|
|
|
if (w->rc.combine_cpus) {
|
2020-05-21 10:30:00 +05:30
|
|
|
|
for (i = 0; i < Cpu_faux_tot; i++) {
|
|
|
|
|
Msg_row += cpu_unify(&Cpu_tics[i], (i+1 >= Cpu_faux_tot));
|
|
|
|
|
if (!isROOM(anyFLG, 1)) break;
|
|
|
|
|
}
|
|
|
|
|
} else {
|
|
|
|
|
for (i = 0; i < Cpu_faux_tot; i++) {
|
|
|
|
|
snprintf(tmp, sizeof(tmp), N_fmt(WORD_eachcpu_fmt), Cpu_tics[i].id);
|
|
|
|
|
Msg_row += cpu_tics(&Cpu_tics[i], tmp, (i+1 >= Cpu_faux_tot));
|
|
|
|
|
if (!isROOM(anyFLG, 1)) break;
|
|
|
|
|
}
|
2002-11-25 03:34:03 +05:30
|
|
|
|
}
|
2002-11-08 06:01:28 +05:30
|
|
|
|
}
|
2013-04-08 12:30:00 +05:30
|
|
|
|
} // end: View_STATES
|
2002-06-19 05:15:30 +05:30
|
|
|
|
|
2004-07-07 00:43:38 +05:30
|
|
|
|
// Display Memory and Swap stats
|
2018-05-18 10:30:00 +05:30
|
|
|
|
if (isROOM(View_MEMORY, 2)) {
|
2012-12-14 11:30:00 +05:30
|
|
|
|
#define bfT(n) buftab[n].buf
|
|
|
|
|
#define scT(e) scaletab[Rc.summ_mscale]. e
|
|
|
|
|
#define mkM(x) (float)kb_main_ ## x / scT(div)
|
|
|
|
|
#define mkS(x) (float)kb_swap_ ## x / scT(div)
|
|
|
|
|
#define prT(b,z) { if (9 < snprintf(b, 10, scT(fmts), z)) b[8] = '+'; }
|
2018-05-18 10:30:00 +05:30
|
|
|
|
static struct {
|
|
|
|
|
float div;
|
|
|
|
|
const char *fmts;
|
|
|
|
|
const char *label;
|
|
|
|
|
} scaletab[] = {
|
|
|
|
|
{ 1, "%.0f ", NULL }, // kibibytes
|
|
|
|
|
#ifdef BOOST_MEMORY
|
|
|
|
|
{ 1024.0, "%#.3f ", NULL }, // mebibytes
|
|
|
|
|
{ 1024.0*1024, "%#.3f ", NULL }, // gibibytes
|
|
|
|
|
{ 1024.0*1024*1024, "%#.3f ", NULL }, // tebibytes
|
|
|
|
|
{ 1024.0*1024*1024*1024, "%#.3f ", NULL }, // pebibytes
|
|
|
|
|
{ 1024.0*1024*1024*1024*1024, "%#.3f ", NULL } // exbibytes
|
|
|
|
|
#else
|
|
|
|
|
{ 1024.0, "%#.1f ", NULL }, // mebibytes
|
|
|
|
|
{ 1024.0*1024, "%#.1f ", NULL }, // gibibytes
|
|
|
|
|
{ 1024.0*1024*1024, "%#.1f ", NULL }, // tebibytes
|
|
|
|
|
{ 1024.0*1024*1024*1024, "%#.1f ", NULL }, // pebibytes
|
|
|
|
|
{ 1024.0*1024*1024*1024*1024, "%#.1f ", NULL } // exbibytes
|
|
|
|
|
#endif
|
|
|
|
|
};
|
2012-12-18 11:30:00 +05:30
|
|
|
|
struct { // 0123456789
|
|
|
|
|
// snprintf contents of each buf (after SK_Kb): 'nnnn.nnn 0'
|
|
|
|
|
// and prT macro might replace space at buf[8] with: ------> +
|
2012-12-14 11:30:00 +05:30
|
|
|
|
char buf[10]; // MEMORY_lines_fmt provides for 8+1 bytes
|
|
|
|
|
} buftab[8];
|
|
|
|
|
|
|
|
|
|
if (!scaletab[0].label) {
|
|
|
|
|
scaletab[0].label = N_txt(AMT_kilobyte_txt);
|
|
|
|
|
scaletab[1].label = N_txt(AMT_megabyte_txt);
|
|
|
|
|
scaletab[2].label = N_txt(AMT_gigabyte_txt);
|
|
|
|
|
scaletab[3].label = N_txt(AMT_terabyte_txt);
|
2012-12-18 11:30:00 +05:30
|
|
|
|
scaletab[4].label = N_txt(AMT_petabyte_txt);
|
|
|
|
|
scaletab[5].label = N_txt(AMT_exxabyte_txt);
|
2012-12-14 11:30:00 +05:30
|
|
|
|
}
|
2014-06-18 10:30:00 +05:30
|
|
|
|
|
2018-05-18 10:30:00 +05:30
|
|
|
|
if (w->rc.graph_mems) {
|
2018-05-18 10:30:00 +05:30
|
|
|
|
static const struct {
|
2018-05-18 10:30:00 +05:30
|
|
|
|
const char *used, *misc, *swap, *type;
|
|
|
|
|
} gtab[] = {
|
|
|
|
|
{ "%-.*s~7", "%-.*s~8", "%-.*s~8", Graph_bars },
|
|
|
|
|
{ "%-.*s~4", "%-.*s~6", "%-.*s~6", Graph_blks }
|
|
|
|
|
};
|
2014-06-22 10:30:00 +05:30
|
|
|
|
char used[SMLBUFSIZ], util[SMLBUFSIZ], dual[MEDBUFSIZ];
|
2017-08-17 11:41:11 +05:30
|
|
|
|
float pct_used, pct_misc, pct_swap;
|
|
|
|
|
int ix, num_used, num_misc;
|
|
|
|
|
|
|
|
|
|
pct_used = (float)kb_main_used * (100.0 / (float)kb_main_total);
|
2014-07-17 23:43:13 +05:30
|
|
|
|
#ifdef MEMGRAPH_OLD
|
2017-08-17 11:41:11 +05:30
|
|
|
|
pct_misc = (float)(kb_main_buffers + kb_main_cached) * (100.0 / (float)kb_main_total);
|
2014-07-17 23:43:13 +05:30
|
|
|
|
#else
|
2017-08-17 11:41:11 +05:30
|
|
|
|
pct_misc = (float)(kb_main_total - kb_main_available - kb_main_used) * (100.0 / (float)kb_main_total);
|
2014-07-17 23:43:13 +05:30
|
|
|
|
#endif
|
2017-08-17 11:41:11 +05:30
|
|
|
|
if (pct_used + pct_misc > 100.0 || pct_misc < 0) pct_misc = 0;
|
|
|
|
|
pct_swap = kb_swap_total ? (float)kb_swap_used * (100.0 / (float)kb_swap_total) : 0;
|
|
|
|
|
ix = w->rc.graph_mems - 1;
|
2014-08-07 10:30:00 +05:30
|
|
|
|
#ifndef QUICK_GRAPHS
|
2017-08-17 11:41:11 +05:30
|
|
|
|
num_used = (int)((pct_used * Graph_adj) + .5),
|
|
|
|
|
num_misc = (int)((pct_misc * Graph_adj) + .5);
|
2016-12-26 18:37:07 +05:30
|
|
|
|
if (num_used + num_misc > Graph_len) num_misc = Graph_len - num_used;
|
2014-08-07 10:30:00 +05:30
|
|
|
|
snprintf(used, sizeof(used), gtab[ix].used, num_used, gtab[ix].type);
|
|
|
|
|
snprintf(util, sizeof(util), gtab[ix].misc, num_misc, gtab[ix].type);
|
|
|
|
|
#else
|
2017-08-17 11:41:11 +05:30
|
|
|
|
(void)num_used; (void)num_misc;
|
2014-08-08 22:29:59 +05:30
|
|
|
|
snprintf(used, sizeof(used), gtab[ix].used, (int)((pct_used * Graph_adj) + .5), gtab[ix].type);
|
2014-08-07 10:30:00 +05:30
|
|
|
|
snprintf(util, sizeof(util), gtab[ix].misc, (int)((pct_misc * Graph_adj) + .4), gtab[ix].type);
|
|
|
|
|
#endif
|
2014-06-22 10:30:00 +05:30
|
|
|
|
snprintf(dual, sizeof(dual), "%s%s", used, util);
|
2014-06-23 10:30:00 +05:30
|
|
|
|
snprintf(util, sizeof(util), gtab[ix].swap, (int)((pct_swap * Graph_adj) + .5), gtab[ix].type);
|
2014-06-18 10:30:00 +05:30
|
|
|
|
prT(bfT(0), mkM(total)); prT(bfT(1), mkS(total));
|
2014-08-07 10:30:00 +05:30
|
|
|
|
show_special(0, fmtmk( "%s %s:~3%#5.1f~2/%-9.9s~3[~1%-*s]~1\n%s %s:~3%#5.1f~2/%-9.9s~3[~1%-*s]~1\n"
|
|
|
|
|
, scT(label), N_txt(WORD_abv_mem_txt), pct_used + pct_misc, bfT(0), Graph_len +4, dual
|
|
|
|
|
, scT(label), N_txt(WORD_abv_swp_txt), pct_swap, bfT(1), Graph_len +2, util));
|
2014-06-18 10:30:00 +05:30
|
|
|
|
} else {
|
2014-07-30 10:30:00 +05:30
|
|
|
|
unsigned long kb_main_my_misc = kb_main_buffers + kb_main_cached;
|
|
|
|
|
prT(bfT(0), mkM(total)); prT(bfT(1), mkM(free));
|
|
|
|
|
prT(bfT(2), mkM(used)); prT(bfT(3), mkM(my_misc));
|
|
|
|
|
prT(bfT(4), mkS(total)); prT(bfT(5), mkS(free));
|
|
|
|
|
prT(bfT(6), mkS(used)); prT(bfT(7), mkM(available));
|
2014-06-18 10:30:00 +05:30
|
|
|
|
show_special(0, fmtmk(N_unq(MEMORY_lines_fmt)
|
|
|
|
|
, scT(label), N_txt(WORD_abv_mem_txt), bfT(0), bfT(1), bfT(2), bfT(3)
|
|
|
|
|
, scT(label), N_txt(WORD_abv_swp_txt), bfT(4), bfT(5), bfT(6), bfT(7)
|
|
|
|
|
, N_txt(WORD_abv_mem_txt)));
|
|
|
|
|
}
|
2002-11-08 06:01:28 +05:30
|
|
|
|
Msg_row += 2;
|
2012-12-14 11:30:00 +05:30
|
|
|
|
#undef bfT
|
|
|
|
|
#undef scT
|
2011-03-31 16:45:12 +05:30
|
|
|
|
#undef mkM
|
|
|
|
|
#undef mkS
|
2012-12-14 11:30:00 +05:30
|
|
|
|
#undef prT
|
2013-04-08 12:30:00 +05:30
|
|
|
|
} // end: View_MEMORY
|
2002-06-19 05:15:30 +05:30
|
|
|
|
|
2011-03-31 16:45:12 +05:30
|
|
|
|
#undef isROOM
|
2011-05-05 15:37:25 +05:30
|
|
|
|
#undef anyFLG
|
2011-03-31 16:45:12 +05:30
|
|
|
|
} // end: summary_show
|
2002-11-08 06:01:28 +05:30
|
|
|
|
|
|
|
|
|
|
2011-03-31 16:45:12 +05:30
|
|
|
|
/*
|
2011-12-17 01:34:38 +05:30
|
|
|
|
* Build the information for a single task row and
|
|
|
|
|
* display the results or return them to the caller. */
|
2018-06-24 10:30:00 +05:30
|
|
|
|
static const char *task_show (const WIN_t *q, const int idx) {
|
2012-06-30 10:30:00 +05:30
|
|
|
|
#ifndef SCROLLVAR_NO
|
2012-09-19 11:31:01 +05:30
|
|
|
|
#define makeVAR(v) { const char *pv = v; \
|
2012-10-03 23:43:13 +05:30
|
|
|
|
if (!q->varcolbeg) cp = make_str(pv, q->varcolsz, Js, AUTOX_NO); \
|
|
|
|
|
else cp = make_str(q->varcolbeg < (int)strlen(pv) ? pv + q->varcolbeg : "", q->varcolsz, Js, AUTOX_NO); }
|
2017-09-30 12:52:22 +05:30
|
|
|
|
#define varUTF8(v) { const char *pv = v; \
|
|
|
|
|
if (!q->varcolbeg) cp = make_str_utf8(pv, q->varcolsz, Js, AUTOX_NO); \
|
|
|
|
|
else cp = make_str_utf8((q->varcolbeg < ((int)strlen(pv) - utf8_delta(pv))) \
|
|
|
|
|
? pv + utf8_embody(pv, q->varcolbeg) : "", q->varcolsz, Js, AUTOX_NO); }
|
2012-06-30 10:30:00 +05:30
|
|
|
|
#else
|
2012-10-03 23:43:13 +05:30
|
|
|
|
#define makeVAR(v) cp = make_str(v, q->varcolsz, Js, AUTOX_NO)
|
2017-09-30 12:52:22 +05:30
|
|
|
|
#define varUTF8(v) cp = make_str_utf8(v, q->varcolsz, Js, AUTOX_NO)
|
2012-06-30 10:30:00 +05:30
|
|
|
|
#endif
|
2011-05-05 15:37:25 +05:30
|
|
|
|
#define pages2K(n) (unsigned long)( (n) << Pg2K_shft )
|
2012-09-19 11:31:01 +05:30
|
|
|
|
static char rbuf[ROWMINSIZ];
|
|
|
|
|
char *rp;
|
|
|
|
|
int x;
|
2018-06-24 10:30:00 +05:30
|
|
|
|
proc_t *p = q->ppt[idx];
|
2011-03-31 16:45:12 +05:30
|
|
|
|
|
2018-06-19 10:30:00 +05:30
|
|
|
|
/* we're borrowing some pad bytes in the proc_t,
|
|
|
|
|
pad_2: 'x' means a collapsed thread, 'z' means an unseen child
|
|
|
|
|
pad_3: where level number is stored (0 - 100) */
|
|
|
|
|
#ifndef TREE_VWINALL
|
2018-06-23 22:30:00 +05:30
|
|
|
|
if (q == Curwin) // note: the following is NOT indented
|
2018-06-19 10:30:00 +05:30
|
|
|
|
#endif
|
|
|
|
|
if (CHKw(q, Show_FOREST) && p->pad_2 == 'z')
|
|
|
|
|
return "";
|
|
|
|
|
|
2011-03-31 16:45:12 +05:30
|
|
|
|
// we must begin a row with a possible window number in mind...
|
|
|
|
|
*(rp = rbuf) = '\0';
|
2018-05-18 10:30:00 +05:30
|
|
|
|
if (Rc.mode_altscr) rp = scat(rp, " ");
|
2002-11-08 06:01:28 +05:30
|
|
|
|
|
|
|
|
|
for (x = 0; x < q->maxpflgs; x++) {
|
1970-01-01 05:30:00 +05:30
|
|
|
|
const char *cp = NULL;
|
2012-09-19 11:31:01 +05:30
|
|
|
|
FLG_t i = q->procflgs[x];
|
2012-12-20 11:30:00 +05:30
|
|
|
|
#define S Fieldstab[i].scale // these used to be variables
|
|
|
|
|
#define W Fieldstab[i].width // but it's much better if we
|
|
|
|
|
#define Js CHKw(q, Show_JRSTRS) // represent them as #defines
|
|
|
|
|
#define Jn CHKw(q, Show_JRNUMS) // and only exec code if used
|
2004-07-15 06:47:15 +05:30
|
|
|
|
|
2002-11-08 06:01:28 +05:30
|
|
|
|
switch (i) {
|
2011-04-14 02:38:14 +05:30
|
|
|
|
#ifndef USE_X_COLHDR
|
2011-03-31 16:45:12 +05:30
|
|
|
|
// these 2 aren't real procflgs, they're used in column highlighting!
|
2014-02-25 11:30:00 +05:30
|
|
|
|
case EU_XON:
|
|
|
|
|
case EU_XOF:
|
2012-09-19 11:31:01 +05:30
|
|
|
|
cp = NULL;
|
2018-06-20 10:30:00 +05:30
|
|
|
|
if (!CHKw(q, NOPRINT_xxx | NOHIFND_xxx | NOHISEL_xxx)) {
|
2012-09-19 11:31:01 +05:30
|
|
|
|
/* treat running tasks specially - entire row may get highlighted
|
|
|
|
|
so we needn't turn it on and we MUST NOT turn it off */
|
|
|
|
|
if (!('R' == p->state && CHKw(q, Show_HIROWS)))
|
2014-02-25 11:30:00 +05:30
|
|
|
|
cp = (EU_XON == i ? q->capclr_rowhigh : q->capclr_rownorm);
|
2012-09-19 11:31:01 +05:30
|
|
|
|
}
|
|
|
|
|
break;
|
2011-04-14 02:38:14 +05:30
|
|
|
|
#endif
|
2016-07-03 10:30:00 +05:30
|
|
|
|
case EU_CGN:
|
2020-12-24 11:30:00 +05:30
|
|
|
|
varUTF8(p->cgname);
|
2016-07-03 10:30:00 +05:30
|
|
|
|
break;
|
2014-02-25 11:30:00 +05:30
|
|
|
|
case EU_CGR:
|
2020-12-24 11:30:00 +05:30
|
|
|
|
varUTF8(p->cgroup[0]);
|
2012-09-29 03:09:35 +05:30
|
|
|
|
break;
|
2014-02-25 11:30:00 +05:30
|
|
|
|
case EU_CMD:
|
2021-01-01 11:30:00 +05:30
|
|
|
|
if (CHKw(q, Show_CMDLIN))
|
|
|
|
|
varUTF8(forest_display(q, p))
|
|
|
|
|
else
|
|
|
|
|
makeVAR(forest_display(q, p));
|
2002-12-21 19:06:36 +05:30
|
|
|
|
break;
|
2014-02-25 11:30:00 +05:30
|
|
|
|
case EU_COD:
|
top: provide the means to adjust scaled process memory
This commit is an unrequested outgrowth of the earlier
change dealing with summary area memory field scaling.
That user selectable scaling provision is now extended
to include 6 (at present) task oriented memory fields.
The new companion 'e' (lower case) interactive command
has been added and, like the 'E' command, it can cycle
each of the currently displayed memory columns between
KiB through TiB. There are, however, some differences.
Where '+' indicates summary area truncation at a given
radix, task memory fields are automatically scaled for
their column. Thus, not all rows use the same scaling.
And, while summary area field widths were not changed,
the task memory columns were widened in order to offer
more meaningful data when the radix was increased. The
precision is automatically increased in step with each
radix: MiB displays 2 decimal places, GiB 3 and TiB 4.
To compliment that additional precision, both the %CPU
and %MEM fields were widened by 1 column and now offer
precision up to 3 decimal places. But, unique to %CPU,
widening could already have occurred due to the number
of processors in some massively parallel boxes. At any
rate, total extra width for both memory and percentage
fields could amount to twenty (precious) columns more.
So for both the memory and % fields the original width
(along with loss of precision) can be restored via new
compiler conditionals which this commit also provides.
p.s. and it will be rcfile preserved for any restarts!
(now that we know a '.' + 2 spaces is squeezed to one)
(everything's perfectly justified, but it's just luck)
Reference(s):
http://www.freelists.org/post/procps/top-regression-reports
Signed-off-by: Jim Warner <james.warner@comcast.net>
2012-12-14 11:30:00 +05:30
|
|
|
|
cp = scale_mem(S, pages2K(p->trs), W, Jn);
|
2002-11-08 06:01:28 +05:30
|
|
|
|
break;
|
2014-02-25 11:30:00 +05:30
|
|
|
|
case EU_CPN:
|
2016-04-15 10:30:00 +05:30
|
|
|
|
cp = make_num(p->processor, W, Jn, AUTOX_NO, 0);
|
2002-11-08 06:01:28 +05:30
|
|
|
|
break;
|
2014-02-25 11:30:00 +05:30
|
|
|
|
case EU_CPU:
|
top: parent total cpu includes collapsed children, pgm
Now, when a parent's children have been collapsed, the
cpu used by those unseen tasks will disappear no more.
Instead such tics will be added to the parent's total.
[ if one wished a return to the 'land of lost tics', ]
[ the '#define TREE_VCPUOFF' directive is available. ]
------------------------------------------------------
Note: With collapsible parents now displaying children
cpu usage, it will eventually be noticed the cpu stats
for the summary area and task areas often vary widely.
It's worth a reminder that for top's summary area each
individual cpu and the cpu summary is limited to 100%,
regardless of how many tics a linux kernel may export.
An individual task is limited to 100% times the number
of threads. But, in no case will cpu usage ever exceed
100% times total number of processors. Such limits are
further reduced under 'Solaris' mode ('I' toggle off).
In this mode, a task cpu usage will never exceed 100%.
These limits will now also apply to collapsed parents.
In addition to those influences, results are subjected
to kernel timer sampling anomalies and the distortions
inherent in a small sample size, made worse by smaller
delay intervals. Often there is just 1 or 2 tics for a
few tasks at smaller intervals such as: 1/10th second.
Anyway, should questions on this subject arise, a good
starting point, beyond the reminders above, is the 1st
link listed below. Those other links were derivatives.
Reference(s):
. from the kernel documentation
https://www.kernel.org/doc/Documentation/cpu-load.txt
. as mentioned in the above kernel documentation
https://lkml.org/lkml/2007/2/12/6
. from above, with many more links on the subject
https://www.boblycat.org/~malc/apc/
Signed-off-by: Jim Warner <james.warner@comcast.net>
top: parent total cpu includes collapsed children, pgm
2018-06-25 10:30:00 +05:30
|
|
|
|
{ float u = (float)p->pcpu;
|
|
|
|
|
#ifndef TREE_VCPUOFF
|
2018-07-18 10:30:00 +05:30
|
|
|
|
#ifndef TREE_VWINALL
|
|
|
|
|
if (q == Curwin) // note: the following is NOT indented
|
|
|
|
|
#endif
|
2018-07-17 10:30:00 +05:30
|
|
|
|
if (CHKw(q, Show_FOREST)) u += Hide_cpu[idx];
|
top: parent total cpu includes collapsed children, pgm
Now, when a parent's children have been collapsed, the
cpu used by those unseen tasks will disappear no more.
Instead such tics will be added to the parent's total.
[ if one wished a return to the 'land of lost tics', ]
[ the '#define TREE_VCPUOFF' directive is available. ]
------------------------------------------------------
Note: With collapsible parents now displaying children
cpu usage, it will eventually be noticed the cpu stats
for the summary area and task areas often vary widely.
It's worth a reminder that for top's summary area each
individual cpu and the cpu summary is limited to 100%,
regardless of how many tics a linux kernel may export.
An individual task is limited to 100% times the number
of threads. But, in no case will cpu usage ever exceed
100% times total number of processors. Such limits are
further reduced under 'Solaris' mode ('I' toggle off).
In this mode, a task cpu usage will never exceed 100%.
These limits will now also apply to collapsed parents.
In addition to those influences, results are subjected
to kernel timer sampling anomalies and the distortions
inherent in a small sample size, made worse by smaller
delay intervals. Often there is just 1 or 2 tics for a
few tasks at smaller intervals such as: 1/10th second.
Anyway, should questions on this subject arise, a good
starting point, beyond the reminders above, is the 1st
link listed below. Those other links were derivatives.
Reference(s):
. from the kernel documentation
https://www.kernel.org/doc/Documentation/cpu-load.txt
. as mentioned in the above kernel documentation
https://lkml.org/lkml/2007/2/12/6
. from above, with many more links on the subject
https://www.boblycat.org/~malc/apc/
Signed-off-by: Jim Warner <james.warner@comcast.net>
top: parent total cpu includes collapsed children, pgm
2018-06-25 10:30:00 +05:30
|
|
|
|
u *= Frame_etscale;
|
|
|
|
|
if (p->pad_2 != 'x' && u > 100.0 * p->nlwp) u = 100.0 * p->nlwp;
|
|
|
|
|
#else
|
|
|
|
|
u *= Frame_etscale;
|
2012-12-18 11:30:00 +05:30
|
|
|
|
/* process can't use more %cpu than number of threads it has
|
|
|
|
|
( thanks Jaromir Capik <jcapik@redhat.com> ) */
|
|
|
|
|
if (u > 100.0 * p->nlwp) u = 100.0 * p->nlwp;
|
top: parent total cpu includes collapsed children, pgm
Now, when a parent's children have been collapsed, the
cpu used by those unseen tasks will disappear no more.
Instead such tics will be added to the parent's total.
[ if one wished a return to the 'land of lost tics', ]
[ the '#define TREE_VCPUOFF' directive is available. ]
------------------------------------------------------
Note: With collapsible parents now displaying children
cpu usage, it will eventually be noticed the cpu stats
for the summary area and task areas often vary widely.
It's worth a reminder that for top's summary area each
individual cpu and the cpu summary is limited to 100%,
regardless of how many tics a linux kernel may export.
An individual task is limited to 100% times the number
of threads. But, in no case will cpu usage ever exceed
100% times total number of processors. Such limits are
further reduced under 'Solaris' mode ('I' toggle off).
In this mode, a task cpu usage will never exceed 100%.
These limits will now also apply to collapsed parents.
In addition to those influences, results are subjected
to kernel timer sampling anomalies and the distortions
inherent in a small sample size, made worse by smaller
delay intervals. Often there is just 1 or 2 tics for a
few tasks at smaller intervals such as: 1/10th second.
Anyway, should questions on this subject arise, a good
starting point, beyond the reminders above, is the 1st
link listed below. Those other links were derivatives.
Reference(s):
. from the kernel documentation
https://www.kernel.org/doc/Documentation/cpu-load.txt
. as mentioned in the above kernel documentation
https://lkml.org/lkml/2007/2/12/6
. from above, with many more links on the subject
https://www.boblycat.org/~malc/apc/
Signed-off-by: Jim Warner <james.warner@comcast.net>
top: parent total cpu includes collapsed children, pgm
2018-06-25 10:30:00 +05:30
|
|
|
|
#endif
|
2011-03-31 16:45:12 +05:30
|
|
|
|
if (u > Cpu_pmax) u = Cpu_pmax;
|
2012-09-19 11:31:01 +05:30
|
|
|
|
cp = scale_pcnt(u, W, Jn);
|
2002-11-08 06:01:28 +05:30
|
|
|
|
}
|
|
|
|
|
break;
|
2014-02-25 11:30:00 +05:30
|
|
|
|
case EU_DAT:
|
top: provide the means to adjust scaled process memory
This commit is an unrequested outgrowth of the earlier
change dealing with summary area memory field scaling.
That user selectable scaling provision is now extended
to include 6 (at present) task oriented memory fields.
The new companion 'e' (lower case) interactive command
has been added and, like the 'E' command, it can cycle
each of the currently displayed memory columns between
KiB through TiB. There are, however, some differences.
Where '+' indicates summary area truncation at a given
radix, task memory fields are automatically scaled for
their column. Thus, not all rows use the same scaling.
And, while summary area field widths were not changed,
the task memory columns were widened in order to offer
more meaningful data when the radix was increased. The
precision is automatically increased in step with each
radix: MiB displays 2 decimal places, GiB 3 and TiB 4.
To compliment that additional precision, both the %CPU
and %MEM fields were widened by 1 column and now offer
precision up to 3 decimal places. But, unique to %CPU,
widening could already have occurred due to the number
of processors in some massively parallel boxes. At any
rate, total extra width for both memory and percentage
fields could amount to twenty (precious) columns more.
So for both the memory and % fields the original width
(along with loss of precision) can be restored via new
compiler conditionals which this commit also provides.
p.s. and it will be rcfile preserved for any restarts!
(now that we know a '.' + 2 spaces is squeezed to one)
(everything's perfectly justified, but it's just luck)
Reference(s):
http://www.freelists.org/post/procps/top-regression-reports
Signed-off-by: Jim Warner <james.warner@comcast.net>
2012-12-14 11:30:00 +05:30
|
|
|
|
cp = scale_mem(S, pages2K(p->drs), W, Jn);
|
2002-11-08 06:01:28 +05:30
|
|
|
|
break;
|
2014-02-25 11:30:00 +05:30
|
|
|
|
case EU_DRT:
|
top: provide the means to adjust scaled process memory
This commit is an unrequested outgrowth of the earlier
change dealing with summary area memory field scaling.
That user selectable scaling provision is now extended
to include 6 (at present) task oriented memory fields.
The new companion 'e' (lower case) interactive command
has been added and, like the 'E' command, it can cycle
each of the currently displayed memory columns between
KiB through TiB. There are, however, some differences.
Where '+' indicates summary area truncation at a given
radix, task memory fields are automatically scaled for
their column. Thus, not all rows use the same scaling.
And, while summary area field widths were not changed,
the task memory columns were widened in order to offer
more meaningful data when the radix was increased. The
precision is automatically increased in step with each
radix: MiB displays 2 decimal places, GiB 3 and TiB 4.
To compliment that additional precision, both the %CPU
and %MEM fields were widened by 1 column and now offer
precision up to 3 decimal places. But, unique to %CPU,
widening could already have occurred due to the number
of processors in some massively parallel boxes. At any
rate, total extra width for both memory and percentage
fields could amount to twenty (precious) columns more.
So for both the memory and % fields the original width
(along with loss of precision) can be restored via new
compiler conditionals which this commit also provides.
p.s. and it will be rcfile preserved for any restarts!
(now that we know a '.' + 2 spaces is squeezed to one)
(everything's perfectly justified, but it's just luck)
Reference(s):
http://www.freelists.org/post/procps/top-regression-reports
Signed-off-by: Jim Warner <james.warner@comcast.net>
2012-12-14 11:30:00 +05:30
|
|
|
|
cp = scale_num(p->dt, W, Jn);
|
2002-11-08 06:01:28 +05:30
|
|
|
|
break;
|
2014-02-25 11:30:00 +05:30
|
|
|
|
case EU_ENV:
|
2020-12-24 11:30:00 +05:30
|
|
|
|
varUTF8(p->environ[0]);
|
2012-07-01 10:30:22 +05:30
|
|
|
|
break;
|
2014-02-25 11:30:00 +05:30
|
|
|
|
case EU_FL1:
|
top: provide the means to adjust scaled process memory
This commit is an unrequested outgrowth of the earlier
change dealing with summary area memory field scaling.
That user selectable scaling provision is now extended
to include 6 (at present) task oriented memory fields.
The new companion 'e' (lower case) interactive command
has been added and, like the 'E' command, it can cycle
each of the currently displayed memory columns between
KiB through TiB. There are, however, some differences.
Where '+' indicates summary area truncation at a given
radix, task memory fields are automatically scaled for
their column. Thus, not all rows use the same scaling.
And, while summary area field widths were not changed,
the task memory columns were widened in order to offer
more meaningful data when the radix was increased. The
precision is automatically increased in step with each
radix: MiB displays 2 decimal places, GiB 3 and TiB 4.
To compliment that additional precision, both the %CPU
and %MEM fields were widened by 1 column and now offer
precision up to 3 decimal places. But, unique to %CPU,
widening could already have occurred due to the number
of processors in some massively parallel boxes. At any
rate, total extra width for both memory and percentage
fields could amount to twenty (precious) columns more.
So for both the memory and % fields the original width
(along with loss of precision) can be restored via new
compiler conditionals which this commit also provides.
p.s. and it will be rcfile preserved for any restarts!
(now that we know a '.' + 2 spaces is squeezed to one)
(everything's perfectly justified, but it's just luck)
Reference(s):
http://www.freelists.org/post/procps/top-regression-reports
Signed-off-by: Jim Warner <james.warner@comcast.net>
2012-12-14 11:30:00 +05:30
|
|
|
|
cp = scale_num(p->maj_flt, W, Jn);
|
2011-03-31 16:45:12 +05:30
|
|
|
|
break;
|
2014-02-25 11:30:00 +05:30
|
|
|
|
case EU_FL2:
|
top: provide the means to adjust scaled process memory
This commit is an unrequested outgrowth of the earlier
change dealing with summary area memory field scaling.
That user selectable scaling provision is now extended
to include 6 (at present) task oriented memory fields.
The new companion 'e' (lower case) interactive command
has been added and, like the 'E' command, it can cycle
each of the currently displayed memory columns between
KiB through TiB. There are, however, some differences.
Where '+' indicates summary area truncation at a given
radix, task memory fields are automatically scaled for
their column. Thus, not all rows use the same scaling.
And, while summary area field widths were not changed,
the task memory columns were widened in order to offer
more meaningful data when the radix was increased. The
precision is automatically increased in step with each
radix: MiB displays 2 decimal places, GiB 3 and TiB 4.
To compliment that additional precision, both the %CPU
and %MEM fields were widened by 1 column and now offer
precision up to 3 decimal places. But, unique to %CPU,
widening could already have occurred due to the number
of processors in some massively parallel boxes. At any
rate, total extra width for both memory and percentage
fields could amount to twenty (precious) columns more.
So for both the memory and % fields the original width
(along with loss of precision) can be restored via new
compiler conditionals which this commit also provides.
p.s. and it will be rcfile preserved for any restarts!
(now that we know a '.' + 2 spaces is squeezed to one)
(everything's perfectly justified, but it's just luck)
Reference(s):
http://www.freelists.org/post/procps/top-regression-reports
Signed-off-by: Jim Warner <james.warner@comcast.net>
2012-12-14 11:30:00 +05:30
|
|
|
|
cp = scale_num(p->min_flt, W, Jn);
|
2011-03-31 16:45:12 +05:30
|
|
|
|
break;
|
2014-02-25 11:30:00 +05:30
|
|
|
|
case EU_FLG:
|
2013-11-29 11:30:00 +05:30
|
|
|
|
cp = make_str(hex_make(p->flags, 1), W, Js, AUTOX_NO);
|
|
|
|
|
break;
|
2014-02-25 11:30:00 +05:30
|
|
|
|
case EU_FV1:
|
top: provide the means to adjust scaled process memory
This commit is an unrequested outgrowth of the earlier
change dealing with summary area memory field scaling.
That user selectable scaling provision is now extended
to include 6 (at present) task oriented memory fields.
The new companion 'e' (lower case) interactive command
has been added and, like the 'E' command, it can cycle
each of the currently displayed memory columns between
KiB through TiB. There are, however, some differences.
Where '+' indicates summary area truncation at a given
radix, task memory fields are automatically scaled for
their column. Thus, not all rows use the same scaling.
And, while summary area field widths were not changed,
the task memory columns were widened in order to offer
more meaningful data when the radix was increased. The
precision is automatically increased in step with each
radix: MiB displays 2 decimal places, GiB 3 and TiB 4.
To compliment that additional precision, both the %CPU
and %MEM fields were widened by 1 column and now offer
precision up to 3 decimal places. But, unique to %CPU,
widening could already have occurred due to the number
of processors in some massively parallel boxes. At any
rate, total extra width for both memory and percentage
fields could amount to twenty (precious) columns more.
So for both the memory and % fields the original width
(along with loss of precision) can be restored via new
compiler conditionals which this commit also provides.
p.s. and it will be rcfile preserved for any restarts!
(now that we know a '.' + 2 spaces is squeezed to one)
(everything's perfectly justified, but it's just luck)
Reference(s):
http://www.freelists.org/post/procps/top-regression-reports
Signed-off-by: Jim Warner <james.warner@comcast.net>
2012-12-14 11:30:00 +05:30
|
|
|
|
cp = scale_num(p->maj_delta, W, Jn);
|
2012-07-08 14:32:58 +05:30
|
|
|
|
break;
|
2014-02-25 11:30:00 +05:30
|
|
|
|
case EU_FV2:
|
top: provide the means to adjust scaled process memory
This commit is an unrequested outgrowth of the earlier
change dealing with summary area memory field scaling.
That user selectable scaling provision is now extended
to include 6 (at present) task oriented memory fields.
The new companion 'e' (lower case) interactive command
has been added and, like the 'E' command, it can cycle
each of the currently displayed memory columns between
KiB through TiB. There are, however, some differences.
Where '+' indicates summary area truncation at a given
radix, task memory fields are automatically scaled for
their column. Thus, not all rows use the same scaling.
And, while summary area field widths were not changed,
the task memory columns were widened in order to offer
more meaningful data when the radix was increased. The
precision is automatically increased in step with each
radix: MiB displays 2 decimal places, GiB 3 and TiB 4.
To compliment that additional precision, both the %CPU
and %MEM fields were widened by 1 column and now offer
precision up to 3 decimal places. But, unique to %CPU,
widening could already have occurred due to the number
of processors in some massively parallel boxes. At any
rate, total extra width for both memory and percentage
fields could amount to twenty (precious) columns more.
So for both the memory and % fields the original width
(along with loss of precision) can be restored via new
compiler conditionals which this commit also provides.
p.s. and it will be rcfile preserved for any restarts!
(now that we know a '.' + 2 spaces is squeezed to one)
(everything's perfectly justified, but it's just luck)
Reference(s):
http://www.freelists.org/post/procps/top-regression-reports
Signed-off-by: Jim Warner <james.warner@comcast.net>
2012-12-14 11:30:00 +05:30
|
|
|
|
cp = scale_num(p->min_delta, W, Jn);
|
2012-07-08 14:32:58 +05:30
|
|
|
|
break;
|
2014-02-25 11:30:00 +05:30
|
|
|
|
case EU_GID:
|
2016-04-15 10:30:00 +05:30
|
|
|
|
cp = make_num(p->egid, W, Jn, EU_GID, 0);
|
2002-11-08 06:01:28 +05:30
|
|
|
|
break;
|
2014-02-25 11:30:00 +05:30
|
|
|
|
case EU_GRP:
|
2017-09-30 12:52:22 +05:30
|
|
|
|
cp = make_str_utf8(p->egroup, W, Js, EU_GRP);
|
2002-11-08 06:01:28 +05:30
|
|
|
|
break;
|
2015-06-13 10:30:00 +05:30
|
|
|
|
case EU_LXC:
|
|
|
|
|
cp = make_str(p->lxcname, W, Js, EU_LXC);
|
|
|
|
|
break;
|
2014-02-25 11:30:00 +05:30
|
|
|
|
case EU_MEM:
|
2016-08-20 10:30:00 +05:30
|
|
|
|
cp = scale_pcnt((float)pages2K(p->resident) * 100 / kb_main_total, W, Jn);
|
2002-11-08 06:01:28 +05:30
|
|
|
|
break;
|
2014-02-25 11:30:00 +05:30
|
|
|
|
case EU_NCE:
|
2016-04-15 10:30:00 +05:30
|
|
|
|
cp = make_num(p->nice, W, Jn, AUTOX_NO, 1);
|
2013-11-29 11:30:00 +05:30
|
|
|
|
break;
|
2017-05-13 10:33:00 +05:30
|
|
|
|
case EU_NMA:
|
|
|
|
|
cp = make_num(numa_node_of_cpu(p->processor), W, Jn, AUTOX_NO, 0);
|
|
|
|
|
break;
|
2014-02-25 11:30:00 +05:30
|
|
|
|
case EU_NS1: // IPCNS
|
|
|
|
|
case EU_NS2: // MNTNS
|
|
|
|
|
case EU_NS3: // NETNS
|
|
|
|
|
case EU_NS4: // PIDNS
|
|
|
|
|
case EU_NS5: // USERNS
|
|
|
|
|
case EU_NS6: // UTSNS
|
|
|
|
|
{ long ino = p->ns[i - EU_NS1];
|
2016-04-15 10:30:00 +05:30
|
|
|
|
cp = make_num(ino, W, Jn, i, 1);
|
2013-11-11 11:30:00 +05:30
|
|
|
|
}
|
|
|
|
|
break;
|
2014-02-25 11:30:00 +05:30
|
|
|
|
case EU_OOA:
|
2016-04-15 10:30:00 +05:30
|
|
|
|
cp = make_num(p->oom_adj, W, Jn, AUTOX_NO, 1);
|
2011-04-14 02:38:14 +05:30
|
|
|
|
break;
|
2014-02-25 11:30:00 +05:30
|
|
|
|
case EU_OOM:
|
2016-04-15 10:30:00 +05:30
|
|
|
|
cp = make_num(p->oom_score, W, Jn, AUTOX_NO, 1);
|
2011-04-14 02:38:14 +05:30
|
|
|
|
break;
|
2014-02-25 11:30:00 +05:30
|
|
|
|
case EU_PGD:
|
2016-04-15 10:30:00 +05:30
|
|
|
|
cp = make_num(p->pgrp, W, Jn, AUTOX_NO, 0);
|
2002-11-08 06:01:28 +05:30
|
|
|
|
break;
|
2014-02-25 11:30:00 +05:30
|
|
|
|
case EU_PID:
|
2016-04-15 10:30:00 +05:30
|
|
|
|
cp = make_num(p->tid, W, Jn, AUTOX_NO, 0);
|
2002-11-08 06:01:28 +05:30
|
|
|
|
break;
|
2014-02-25 11:30:00 +05:30
|
|
|
|
case EU_PPD:
|
2016-04-15 10:30:00 +05:30
|
|
|
|
cp = make_num(p->ppid, W, Jn, AUTOX_NO, 0);
|
2002-11-08 06:01:28 +05:30
|
|
|
|
break;
|
2014-02-25 11:30:00 +05:30
|
|
|
|
case EU_PRI:
|
2011-03-31 16:45:12 +05:30
|
|
|
|
if (-99 > p->priority || 999 < p->priority) {
|
2012-10-03 23:43:13 +05:30
|
|
|
|
cp = make_str("rt", W, Jn, AUTOX_NO);
|
2002-11-29 04:39:48 +05:30
|
|
|
|
} else
|
2016-04-15 10:30:00 +05:30
|
|
|
|
cp = make_num(p->priority, W, Jn, AUTOX_NO, 0);
|
2002-11-08 06:01:28 +05:30
|
|
|
|
break;
|
2014-02-25 11:30:00 +05:30
|
|
|
|
case EU_RES:
|
2016-08-20 10:30:00 +05:30
|
|
|
|
cp = scale_mem(S, pages2K(p->resident), W, Jn);
|
2002-11-08 06:01:28 +05:30
|
|
|
|
break;
|
2016-04-13 10:30:00 +05:30
|
|
|
|
case EU_RZA:
|
|
|
|
|
cp = scale_mem(S, p->vm_rss_anon, W, Jn);
|
|
|
|
|
break;
|
|
|
|
|
case EU_RZF:
|
|
|
|
|
cp = scale_mem(S, p->vm_rss_file, W, Jn);
|
|
|
|
|
break;
|
|
|
|
|
case EU_RZL:
|
|
|
|
|
cp = scale_mem(S, p->vm_lock, W, Jn);
|
|
|
|
|
break;
|
|
|
|
|
case EU_RZS:
|
|
|
|
|
cp = scale_mem(S, p->vm_rss_shared, W, Jn);
|
|
|
|
|
break;
|
2014-02-25 11:30:00 +05:30
|
|
|
|
case EU_SGD:
|
2012-06-28 10:30:03 +05:30
|
|
|
|
makeVAR(p->supgid);
|
2011-08-01 16:58:46 +05:30
|
|
|
|
break;
|
2014-02-25 11:30:00 +05:30
|
|
|
|
case EU_SGN:
|
2017-09-30 12:52:22 +05:30
|
|
|
|
varUTF8(p->supgrp);
|
2011-08-01 16:58:46 +05:30
|
|
|
|
break;
|
2014-02-25 11:30:00 +05:30
|
|
|
|
case EU_SHR:
|
top: provide the means to adjust scaled process memory
This commit is an unrequested outgrowth of the earlier
change dealing with summary area memory field scaling.
That user selectable scaling provision is now extended
to include 6 (at present) task oriented memory fields.
The new companion 'e' (lower case) interactive command
has been added and, like the 'E' command, it can cycle
each of the currently displayed memory columns between
KiB through TiB. There are, however, some differences.
Where '+' indicates summary area truncation at a given
radix, task memory fields are automatically scaled for
their column. Thus, not all rows use the same scaling.
And, while summary area field widths were not changed,
the task memory columns were widened in order to offer
more meaningful data when the radix was increased. The
precision is automatically increased in step with each
radix: MiB displays 2 decimal places, GiB 3 and TiB 4.
To compliment that additional precision, both the %CPU
and %MEM fields were widened by 1 column and now offer
precision up to 3 decimal places. But, unique to %CPU,
widening could already have occurred due to the number
of processors in some massively parallel boxes. At any
rate, total extra width for both memory and percentage
fields could amount to twenty (precious) columns more.
So for both the memory and % fields the original width
(along with loss of precision) can be restored via new
compiler conditionals which this commit also provides.
p.s. and it will be rcfile preserved for any restarts!
(now that we know a '.' + 2 spaces is squeezed to one)
(everything's perfectly justified, but it's just luck)
Reference(s):
http://www.freelists.org/post/procps/top-regression-reports
Signed-off-by: Jim Warner <james.warner@comcast.net>
2012-12-14 11:30:00 +05:30
|
|
|
|
cp = scale_mem(S, pages2K(p->share), W, Jn);
|
2011-03-31 16:45:12 +05:30
|
|
|
|
break;
|
2014-02-25 11:30:00 +05:30
|
|
|
|
case EU_SID:
|
2016-04-15 10:30:00 +05:30
|
|
|
|
cp = make_num(p->session, W, Jn, AUTOX_NO, 0);
|
2002-11-08 06:01:28 +05:30
|
|
|
|
break;
|
2014-02-25 11:30:00 +05:30
|
|
|
|
case EU_STA:
|
2012-09-19 11:31:01 +05:30
|
|
|
|
cp = make_chr(p->state, W, Js);
|
2002-11-08 06:01:28 +05:30
|
|
|
|
break;
|
2014-02-25 11:30:00 +05:30
|
|
|
|
case EU_SWP:
|
top: provide the means to adjust scaled process memory
This commit is an unrequested outgrowth of the earlier
change dealing with summary area memory field scaling.
That user selectable scaling provision is now extended
to include 6 (at present) task oriented memory fields.
The new companion 'e' (lower case) interactive command
has been added and, like the 'E' command, it can cycle
each of the currently displayed memory columns between
KiB through TiB. There are, however, some differences.
Where '+' indicates summary area truncation at a given
radix, task memory fields are automatically scaled for
their column. Thus, not all rows use the same scaling.
And, while summary area field widths were not changed,
the task memory columns were widened in order to offer
more meaningful data when the radix was increased. The
precision is automatically increased in step with each
radix: MiB displays 2 decimal places, GiB 3 and TiB 4.
To compliment that additional precision, both the %CPU
and %MEM fields were widened by 1 column and now offer
precision up to 3 decimal places. But, unique to %CPU,
widening could already have occurred due to the number
of processors in some massively parallel boxes. At any
rate, total extra width for both memory and percentage
fields could amount to twenty (precious) columns more.
So for both the memory and % fields the original width
(along with loss of precision) can be restored via new
compiler conditionals which this commit also provides.
p.s. and it will be rcfile preserved for any restarts!
(now that we know a '.' + 2 spaces is squeezed to one)
(everything's perfectly justified, but it's just luck)
Reference(s):
http://www.freelists.org/post/procps/top-regression-reports
Signed-off-by: Jim Warner <james.warner@comcast.net>
2012-12-14 11:30:00 +05:30
|
|
|
|
cp = scale_mem(S, p->vm_swap, W, Jn);
|
2011-03-31 16:45:12 +05:30
|
|
|
|
break;
|
2014-02-25 11:30:00 +05:30
|
|
|
|
case EU_TGD:
|
2016-04-15 10:30:00 +05:30
|
|
|
|
cp = make_num(p->tgid, W, Jn, AUTOX_NO, 0);
|
2011-08-17 16:31:35 +05:30
|
|
|
|
break;
|
2014-02-25 11:30:00 +05:30
|
|
|
|
case EU_THD:
|
2016-04-15 10:30:00 +05:30
|
|
|
|
cp = make_num(p->nlwp, W, Jn, AUTOX_NO, 0);
|
2002-11-08 06:01:28 +05:30
|
|
|
|
break;
|
2014-02-25 11:30:00 +05:30
|
|
|
|
case EU_TM2:
|
|
|
|
|
case EU_TME:
|
2002-12-05 04:18:30 +05:30
|
|
|
|
{ TIC_t t = p->utime + p->stime;
|
2011-03-31 16:45:12 +05:30
|
|
|
|
if (CHKw(q, Show_CTIMES)) t += (p->cutime + p->cstime);
|
2012-09-19 11:31:01 +05:30
|
|
|
|
cp = scale_tics(t, W, Jn);
|
2002-11-08 06:01:28 +05:30
|
|
|
|
}
|
|
|
|
|
break;
|
2014-02-25 11:30:00 +05:30
|
|
|
|
case EU_TPG:
|
2016-04-15 10:30:00 +05:30
|
|
|
|
cp = make_num(p->tpgid, W, Jn, AUTOX_NO, 0);
|
2011-03-31 16:45:12 +05:30
|
|
|
|
break;
|
2014-02-25 11:30:00 +05:30
|
|
|
|
case EU_TTY:
|
2011-03-31 16:45:12 +05:30
|
|
|
|
{ char tmp[SMLBUFSIZ];
|
2012-09-19 11:31:01 +05:30
|
|
|
|
dev_to_tty(tmp, W, p->tty, p->tid, ABBREV_DEV);
|
2014-02-25 11:30:00 +05:30
|
|
|
|
cp = make_str(tmp, W, Js, EU_TTY);
|
2002-11-08 06:01:28 +05:30
|
|
|
|
}
|
|
|
|
|
break;
|
2014-02-25 11:30:00 +05:30
|
|
|
|
case EU_UED:
|
2016-04-15 10:30:00 +05:30
|
|
|
|
cp = make_num(p->euid, W, Jn, EU_UED, 0);
|
2002-11-08 06:01:28 +05:30
|
|
|
|
break;
|
2014-02-25 11:30:00 +05:30
|
|
|
|
case EU_UEN:
|
2017-09-30 12:52:22 +05:30
|
|
|
|
cp = make_str_utf8(p->euser, W, Js, EU_UEN);
|
2002-11-08 06:01:28 +05:30
|
|
|
|
break;
|
2014-02-25 11:30:00 +05:30
|
|
|
|
case EU_URD:
|
2016-04-15 10:30:00 +05:30
|
|
|
|
cp = make_num(p->ruid, W, Jn, EU_URD, 0);
|
2011-03-31 16:45:12 +05:30
|
|
|
|
break;
|
2014-02-25 11:30:00 +05:30
|
|
|
|
case EU_URN:
|
2017-09-30 12:52:22 +05:30
|
|
|
|
cp = make_str_utf8(p->ruser, W, Js, EU_URN);
|
2011-03-31 16:45:12 +05:30
|
|
|
|
break;
|
2014-02-25 11:30:00 +05:30
|
|
|
|
case EU_USD:
|
2016-04-15 10:30:00 +05:30
|
|
|
|
cp = make_num(p->suid, W, Jn, EU_USD, 0);
|
2011-03-31 16:45:12 +05:30
|
|
|
|
break;
|
2014-02-25 11:30:00 +05:30
|
|
|
|
case EU_USE:
|
2015-07-31 10:30:00 +05:30
|
|
|
|
cp = scale_mem(S, (p->vm_swap + p->vm_rss), W, Jn);
|
2013-02-28 11:30:00 +05:30
|
|
|
|
break;
|
2014-02-25 11:30:00 +05:30
|
|
|
|
case EU_USN:
|
2017-09-30 12:52:22 +05:30
|
|
|
|
cp = make_str_utf8(p->suser, W, Js, EU_USN);
|
2002-12-06 12:23:29 +05:30
|
|
|
|
break;
|
2014-02-25 11:30:00 +05:30
|
|
|
|
case EU_VRT:
|
top: provide the means to adjust scaled process memory
This commit is an unrequested outgrowth of the earlier
change dealing with summary area memory field scaling.
That user selectable scaling provision is now extended
to include 6 (at present) task oriented memory fields.
The new companion 'e' (lower case) interactive command
has been added and, like the 'E' command, it can cycle
each of the currently displayed memory columns between
KiB through TiB. There are, however, some differences.
Where '+' indicates summary area truncation at a given
radix, task memory fields are automatically scaled for
their column. Thus, not all rows use the same scaling.
And, while summary area field widths were not changed,
the task memory columns were widened in order to offer
more meaningful data when the radix was increased. The
precision is automatically increased in step with each
radix: MiB displays 2 decimal places, GiB 3 and TiB 4.
To compliment that additional precision, both the %CPU
and %MEM fields were widened by 1 column and now offer
precision up to 3 decimal places. But, unique to %CPU,
widening could already have occurred due to the number
of processors in some massively parallel boxes. At any
rate, total extra width for both memory and percentage
fields could amount to twenty (precious) columns more.
So for both the memory and % fields the original width
(along with loss of precision) can be restored via new
compiler conditionals which this commit also provides.
p.s. and it will be rcfile preserved for any restarts!
(now that we know a '.' + 2 spaces is squeezed to one)
(everything's perfectly justified, but it's just luck)
Reference(s):
http://www.freelists.org/post/procps/top-regression-reports
Signed-off-by: Jim Warner <james.warner@comcast.net>
2012-12-14 11:30:00 +05:30
|
|
|
|
cp = scale_mem(S, pages2K(p->size), W, Jn);
|
2002-11-08 06:01:28 +05:30
|
|
|
|
break;
|
2014-02-25 11:30:00 +05:30
|
|
|
|
case EU_WCH:
|
2015-06-18 10:30:00 +05:30
|
|
|
|
cp = make_str(lookup_wchan(p->tid), W, Js, EU_WCH);
|
2002-11-08 06:01:28 +05:30
|
|
|
|
break;
|
2011-03-31 16:45:12 +05:30
|
|
|
|
default: // keep gcc happy
|
2012-09-19 11:31:01 +05:30
|
|
|
|
continue;
|
2002-10-19 02:37:49 +05:30
|
|
|
|
|
2012-09-19 11:31:01 +05:30
|
|
|
|
} // end: switch 'procflag'
|
2002-11-08 06:01:28 +05:30
|
|
|
|
|
2013-03-03 11:30:00 +05:30
|
|
|
|
if (cp) {
|
|
|
|
|
if (q->osel_tot && !osel_matched(q, i, cp)) return "";
|
2018-05-18 10:30:00 +05:30
|
|
|
|
rp = scat(rp, cp);
|
2013-03-03 11:30:00 +05:30
|
|
|
|
}
|
2012-09-19 11:31:01 +05:30
|
|
|
|
#undef S
|
|
|
|
|
#undef W
|
|
|
|
|
#undef Js
|
|
|
|
|
#undef Jn
|
2011-03-31 16:45:12 +05:30
|
|
|
|
} // end: for 'maxpflgs'
|
2002-11-08 06:01:28 +05:30
|
|
|
|
|
2018-06-20 10:30:00 +05:30
|
|
|
|
if (!CHKw(q, NOPRINT_xxx)) {
|
top: highlight all regular search string(s) when found
With the recent inspect search highlight provisions in
place, the lack of highlighting in task based searches
has grown from being only irritating to a real defect.
Thus, this commit introduces parallel functionality to
those searches initiated within a visible task window.
And just as separate inspect searches are possible for
each selection, per window task searches are provided.
However, it should be noted that there are differences
between task based searches and inspect type searches:
* There is no concept of out-of-view data when dealing
. with task rows -- if the data can't bee seen, it has
. not, in fact, been constructed from a proc_t struct.
* While inspect data is output at the character level,
. up to now all task display data was only potentially
. output and it was always based on a complete string.
* With task search highlighting, rows now containing a
. match must be output in pieces and, therefore, can't
. be optimized away like other rows which haven't been
. been altered. This is because top cannot predict the
. the contents of a search string or, how many matches
. might occur in a given row. Short search strings and
. many matches would raise buffer needs geometrically.
(now that we know a '.' + 2 spaces is squeezed to one)
(everything's perfectly justified, but it's just luck)
Signed-off-by: Jim Warner <james.warner@comcast.net>
2012-12-08 11:30:00 +05:30
|
|
|
|
const char *cap = ((CHKw(q, Show_HIROWS) && 'R' == p->state))
|
|
|
|
|
? q->capclr_rowhigh : q->capclr_rownorm;
|
|
|
|
|
char *row = rbuf;
|
|
|
|
|
int ofs;
|
|
|
|
|
/* since we can't predict what the search string will be and,
|
|
|
|
|
considering what a single space search request would do to
|
|
|
|
|
potential buffer needs, when any matches are found we skip
|
|
|
|
|
normal output routing and send all of the results directly
|
|
|
|
|
to the terminal (and we sound asthmatic: poof, putt, puff) */
|
|
|
|
|
if (-1 < (ofs = find_ofs(q, row))) {
|
|
|
|
|
POOF("\n", cap);
|
|
|
|
|
do {
|
|
|
|
|
row[ofs] = '\0';
|
|
|
|
|
PUTT("%s%s%s%s", row, q->capclr_hdr, q->findstr, cap);
|
|
|
|
|
row += (ofs + q->findlen);
|
|
|
|
|
ofs = find_ofs(q, row);
|
|
|
|
|
} while (-1 < ofs);
|
|
|
|
|
PUTT("%s%s", row, Caps_endline);
|
2013-03-25 10:30:00 +05:30
|
|
|
|
// with a corrupted rbuf, ensure row is 'counted' by window_show
|
|
|
|
|
rbuf[0] = '!';
|
top: highlight all regular search string(s) when found
With the recent inspect search highlight provisions in
place, the lack of highlighting in task based searches
has grown from being only irritating to a real defect.
Thus, this commit introduces parallel functionality to
those searches initiated within a visible task window.
And just as separate inspect searches are possible for
each selection, per window task searches are provided.
However, it should be noted that there are differences
between task based searches and inspect type searches:
* There is no concept of out-of-view data when dealing
. with task rows -- if the data can't bee seen, it has
. not, in fact, been constructed from a proc_t struct.
* While inspect data is output at the character level,
. up to now all task display data was only potentially
. output and it was always based on a complete string.
* With task search highlighting, rows now containing a
. match must be output in pieces and, therefore, can't
. be optimized away like other rows which haven't been
. been altered. This is because top cannot predict the
. the contents of a search string or, how many matches
. might occur in a given row. Short search strings and
. many matches would raise buffer needs geometrically.
(now that we know a '.' + 2 spaces is squeezed to one)
(everything's perfectly justified, but it's just luck)
Signed-off-by: Jim Warner <james.warner@comcast.net>
2012-12-08 11:30:00 +05:30
|
|
|
|
} else
|
|
|
|
|
PUFF("\n%s%s%s", cap, row, Caps_endline);
|
2012-09-19 11:31:01 +05:30
|
|
|
|
}
|
|
|
|
|
return rbuf;
|
2011-05-05 15:37:25 +05:30
|
|
|
|
#undef makeVAR
|
2017-09-30 12:52:22 +05:30
|
|
|
|
#undef varUTF8
|
2011-03-31 16:45:12 +05:30
|
|
|
|
#undef pages2K
|
|
|
|
|
} // end: task_show
|
2002-05-30 09:14:46 +05:30
|
|
|
|
|
|
|
|
|
|
2018-06-20 10:30:00 +05:30
|
|
|
|
/*
|
|
|
|
|
* A window_show *Helper* function ensuring that Curwin's 'begtask'
|
|
|
|
|
* represents a visible process (not any hidden/filtered-out task).
|
|
|
|
|
* In reality, this function is called:
|
2018-06-23 22:30:00 +05:30
|
|
|
|
* 1) exclusively for the 'current' window
|
|
|
|
|
* 2) immediately after interacting with the user
|
2018-09-18 10:30:00 +05:30
|
|
|
|
* 3) who struck: up, down, pgup, pgdn, home, end, 'o/O' or 'u/U'
|
2018-06-23 22:30:00 +05:30
|
|
|
|
* 4) or upon the user switching from one window to another window */
|
2018-06-20 10:30:00 +05:30
|
|
|
|
static void window_hlp (void) {
|
|
|
|
|
WIN_t *w = Curwin; // avoid gcc bloat with a local copy
|
2018-06-23 22:30:00 +05:30
|
|
|
|
int i, reversed;
|
2018-06-20 10:30:00 +05:30
|
|
|
|
|
|
|
|
|
SETw(w, NOPRINT_xxx);
|
|
|
|
|
w->begtask += w->begnext;
|
2018-06-23 22:30:00 +05:30
|
|
|
|
// next 'if' will force a forward scan ...
|
|
|
|
|
if (w->begtask <= 0) { w->begtask = 0; w->begnext = +1; }
|
|
|
|
|
else if (w->begtask >= Frame_maxtask) w->begtask = Frame_maxtask - 1;
|
2018-06-20 10:30:00 +05:30
|
|
|
|
|
2018-06-23 22:30:00 +05:30
|
|
|
|
reversed = 0;
|
2018-06-20 10:30:00 +05:30
|
|
|
|
// potentially scroll forward ...
|
|
|
|
|
if (w->begnext > 0) {
|
2018-06-23 22:30:00 +05:30
|
|
|
|
fwd_redux:
|
2018-06-20 10:30:00 +05:30
|
|
|
|
for (i = w->begtask; i < Frame_maxtask; i++) {
|
2018-06-24 10:30:00 +05:30
|
|
|
|
if (wins_usrselect(w, i)
|
|
|
|
|
&& (*task_show(w, i)))
|
2018-06-20 10:30:00 +05:30
|
|
|
|
break;
|
|
|
|
|
}
|
|
|
|
|
if (i < Frame_maxtask) {
|
|
|
|
|
w->begtask = i;
|
|
|
|
|
goto wrap_up;
|
|
|
|
|
}
|
|
|
|
|
// no luck forward, so let's try backward
|
|
|
|
|
w->begtask = Frame_maxtask - 1;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
// potentially scroll backward ...
|
|
|
|
|
for (i = w->begtask; i > 0; i--) {
|
2018-06-24 10:30:00 +05:30
|
|
|
|
if (wins_usrselect(w, i)
|
|
|
|
|
&& (*task_show(w, i)))
|
2018-06-20 10:30:00 +05:30
|
|
|
|
break;
|
|
|
|
|
}
|
2018-06-23 22:30:00 +05:30
|
|
|
|
// reached the top, but maybe this guy ain't visible
|
|
|
|
|
if (!(w->begtask = i) && !reversed) {
|
2018-06-24 10:30:00 +05:30
|
|
|
|
if (!(wins_usrselect(w, 0))
|
|
|
|
|
|| (!(*task_show(w, 0)))) {
|
2018-06-23 22:30:00 +05:30
|
|
|
|
reversed = 1;
|
|
|
|
|
goto fwd_redux;
|
|
|
|
|
}
|
|
|
|
|
}
|
2018-06-20 10:30:00 +05:30
|
|
|
|
|
|
|
|
|
wrap_up:
|
|
|
|
|
w->begnext = 0;
|
|
|
|
|
OFFw(w, NOPRINT_xxx);
|
|
|
|
|
} // end: window_hlp
|
|
|
|
|
|
|
|
|
|
|
2011-03-31 16:45:12 +05:30
|
|
|
|
/*
|
|
|
|
|
* Squeeze as many tasks as we can into a single window,
|
|
|
|
|
* after sorting the passed proc table. */
|
2011-08-30 17:35:45 +05:30
|
|
|
|
static int window_show (WIN_t *q, int wmax) {
|
2011-03-31 16:45:12 +05:30
|
|
|
|
/* the isBUSY macro determines if a task is 'active' --
|
|
|
|
|
it returns true if some cpu was used since the last sample.
|
|
|
|
|
( actual 'running' tasks will be a subset of those selected ) */
|
1970-01-01 05:30:00 +05:30
|
|
|
|
#define isBUSY(x) (0 < (x)->pcpu)
|
|
|
|
|
#define winMIN(a,b) (((a) < (b)) ? (a) : (b))
|
2002-06-19 05:15:30 +05:30
|
|
|
|
int i, lwin;
|
|
|
|
|
|
2004-07-07 00:43:38 +05:30
|
|
|
|
// Display Column Headings -- and distract 'em while we sort (maybe)
|
top: highlight all regular search string(s) when found
With the recent inspect search highlight provisions in
place, the lack of highlighting in task based searches
has grown from being only irritating to a real defect.
Thus, this commit introduces parallel functionality to
those searches initiated within a visible task window.
And just as separate inspect searches are possible for
each selection, per window task searches are provided.
However, it should be noted that there are differences
between task based searches and inspect type searches:
* There is no concept of out-of-view data when dealing
. with task rows -- if the data can't bee seen, it has
. not, in fact, been constructed from a proc_t struct.
* While inspect data is output at the character level,
. up to now all task display data was only potentially
. output and it was always based on a complete string.
* With task search highlighting, rows now containing a
. match must be output in pieces and, therefore, can't
. be optimized away like other rows which haven't been
. been altered. This is because top cannot predict the
. the contents of a search string or, how many matches
. might occur in a given row. Short search strings and
. many matches would raise buffer needs geometrically.
(now that we know a '.' + 2 spaces is squeezed to one)
(everything's perfectly justified, but it's just luck)
Signed-off-by: Jim Warner <james.warner@comcast.net>
2012-12-08 11:30:00 +05:30
|
|
|
|
PUFF("\n%s%s%s", q->capclr_hdr, q->columnhdr, Caps_endline);
|
2020-09-09 10:30:00 +05:30
|
|
|
|
// and just in case 'Monpids' is active but matched no processes ...
|
|
|
|
|
if (!Frame_maxtask) return 1; // 1 for the column header
|
2011-03-31 16:45:12 +05:30
|
|
|
|
|
2011-08-30 17:35:45 +05:30
|
|
|
|
if (CHKw(q, Show_FOREST))
|
|
|
|
|
forest_create(q);
|
|
|
|
|
else {
|
|
|
|
|
if (CHKw(q, Qsrt_NORMAL)) Frame_srtflg = 1; // this is always needed!
|
|
|
|
|
else Frame_srtflg = -1;
|
|
|
|
|
Frame_ctimes = CHKw(q, Show_CTIMES); // this & next, only maybe
|
|
|
|
|
Frame_cmdlin = CHKw(q, Show_CMDLIN);
|
2018-08-08 10:30:00 +05:30
|
|
|
|
qsort(q->ppt, Frame_maxtask, sizeof(proc_t *), Fieldstab[q->rc.sortindx].sort);
|
2011-08-30 17:35:45 +05:30
|
|
|
|
}
|
2011-03-31 16:45:12 +05:30
|
|
|
|
|
2018-06-20 10:30:00 +05:30
|
|
|
|
if (q->begnext) window_hlp();
|
|
|
|
|
else OFFw(q, NOPRINT_xxx);
|
|
|
|
|
|
2011-03-31 16:45:12 +05:30
|
|
|
|
i = q->begtask;
|
2011-08-30 17:35:45 +05:30
|
|
|
|
lwin = 1; // 1 for the column header
|
|
|
|
|
wmax = winMIN(wmax, q->winlines + 1); // ditto for winlines, too
|
2011-03-31 16:45:12 +05:30
|
|
|
|
|
|
|
|
|
/* the least likely scenario is also the most costly, so we'll try to avoid
|
|
|
|
|
checking some stuff with each iteration and check it just once... */
|
|
|
|
|
if (CHKw(q, Show_IDLEPS) && !q->usrseltyp)
|
2011-08-30 17:35:45 +05:30
|
|
|
|
while (i < Frame_maxtask && lwin < wmax) {
|
2018-06-24 10:30:00 +05:30
|
|
|
|
if (*task_show(q, i++))
|
2013-03-03 11:30:00 +05:30
|
|
|
|
++lwin;
|
2002-05-30 09:14:46 +05:30
|
|
|
|
}
|
2011-03-31 16:45:12 +05:30
|
|
|
|
else
|
2011-08-30 17:35:45 +05:30
|
|
|
|
while (i < Frame_maxtask && lwin < wmax) {
|
|
|
|
|
if ((CHKw(q, Show_IDLEPS) || isBUSY(q->ppt[i]))
|
2018-06-24 10:30:00 +05:30
|
|
|
|
&& wins_usrselect(q, i)
|
|
|
|
|
&& *task_show(q, i))
|
2011-03-31 16:45:12 +05:30
|
|
|
|
++lwin;
|
|
|
|
|
++i;
|
|
|
|
|
}
|
2002-05-30 09:14:46 +05:30
|
|
|
|
|
2011-03-31 16:45:12 +05:30
|
|
|
|
return lwin;
|
|
|
|
|
#undef isBUSY
|
2018-07-04 10:30:00 +05:30
|
|
|
|
#undef winMIN
|
2011-03-31 16:45:12 +05:30
|
|
|
|
} // end: window_show
|
|
|
|
|
|
2002-11-08 06:01:28 +05:30
|
|
|
|
/*###### Entry point plus two ##########################################*/
|
|
|
|
|
|
2011-03-31 16:45:12 +05:30
|
|
|
|
/*
|
|
|
|
|
* This guy's just a *Helper* function who apportions the
|
|
|
|
|
* remaining amount of screen real estate under multiple windows */
|
2012-02-07 22:41:11 +05:30
|
|
|
|
static void frame_hlp (int wix, int max) {
|
2011-10-27 03:23:55 +05:30
|
|
|
|
int i, size, wins;
|
2002-06-19 05:15:30 +05:30
|
|
|
|
|
2011-10-27 03:23:55 +05:30
|
|
|
|
// calc remaining number of visible windows
|
|
|
|
|
for (i = wix, wins = 0; i < GROUPSMAX; i++)
|
|
|
|
|
if (CHKw(&Winstk[i], Show_TASKON))
|
2002-06-19 05:15:30 +05:30
|
|
|
|
++wins;
|
2011-10-27 03:23:55 +05:30
|
|
|
|
|
2002-06-19 05:15:30 +05:30
|
|
|
|
if (!wins) wins = 1;
|
2011-10-27 03:23:55 +05:30
|
|
|
|
// deduct 1 line/window for the columns heading
|
2002-06-19 05:15:30 +05:30
|
|
|
|
size = (max - wins) / wins;
|
|
|
|
|
|
2011-03-31 16:45:12 +05:30
|
|
|
|
/* for subject window, set WIN_t winlines to either the user's
|
|
|
|
|
maxtask (1st choice) or our 'foxized' size calculation
|
|
|
|
|
(foxized adj. - 'fair and balanced') */
|
|
|
|
|
Winstk[wix].winlines =
|
|
|
|
|
Winstk[wix].rc.maxtasks ? Winstk[wix].rc.maxtasks : size;
|
2012-02-07 22:41:11 +05:30
|
|
|
|
} // end: frame_hlp
|
2002-05-30 09:14:46 +05:30
|
|
|
|
|
2002-06-19 05:15:30 +05:30
|
|
|
|
|
2011-03-31 16:45:12 +05:30
|
|
|
|
/*
|
|
|
|
|
* Initiate the Frame Display Update cycle at someone's whim!
|
|
|
|
|
* This routine doesn't do much, mostly he just calls others.
|
|
|
|
|
*
|
|
|
|
|
* (Whoa, wait a minute, we DO caretake those row guys, plus)
|
|
|
|
|
* (we CALCULATE that IMPORTANT Max_lines thingy so that the)
|
|
|
|
|
* (*subordinate* functions invoked know WHEN the user's had)
|
|
|
|
|
* (ENOUGH already. And at Frame End, it SHOULD be apparent)
|
|
|
|
|
* (WE am d'MAN -- clearing UNUSED screen LINES and ensuring)
|
top: inoculated against a window manager like 'screen'
If top were invoked under the 'screen' window manager,
writing the terminfo string 'exit_ca_mode' at top exit
would not restore the display to the state existing at
the time top was started. That's what occurs normally.
The net result of that failure was a corrupted screen.
However, there is a 'screen' configuration option that
will produce proper 'rmcup' behavior, but it is off by
default. That screencr option is known as 'altscreen'.
I stumbled across this provision by cloning the screen
git repository then searching for references to 'cup'.
If 'altscreen on' had been in either the /etc/screenrc
or the $HOME/.screenrc configuration file, my poor old
top would never have been accused of such corruptions.
Of course, the Programming Gods decree that any simple
solution for our problem must always be revealed last.
So before discovering that rc option, another approach
was taken involving top only. With just a little extra
refactoring of top display logic he was made immune to
any such quirk in the implementation of 'smcup/rmcup'.
I always feel good about any enhancement that actually
reduces the total number of lines of code. Even though
this change involved mostly rearranging some logic, it
yielded one less line (can't judge by diffstat because
of braces & notes). Anyway, rather than requiring some
change to a screenrc file, now we are self-sufficient.
Reference(s):
procps ---------------------------------------------
https://bugzilla.redhat.com/show_bug.cgi?id=962022
http://www.freelists.org/post/procps/top-procpsng337-no-screen-cleaning-at-exit,3
. top : disable tty scrollback buffer to improve SIGWINCH
commit dedaf6e1a81738ff08ee8e8523871e12f555ad6d
screen ---------------------------------------------
git://git.sv.gnu.org/screen.git
. Improve cursor store/restore on smcup/rmcup.
commit f95352946080be803b794c9f2733d8c809c1a39a
. Fix using alternate screen buffers in some cases.
commit ad56f746c6243d45124485d198d577bdbb78071c
http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=558724
Signed-off-by: Jim Warner <james.warner@comcast.net>
2013-05-18 10:30:00 +05:30
|
|
|
|
* (that those auto-sized columns are addressed, know what I)
|
2011-03-31 16:45:12 +05:30
|
|
|
|
* (mean? Huh, "doesn't DO MUCH"! Never, EVER think or say)
|
|
|
|
|
* (THAT about THIS function again, Ok? Good that's better.)
|
|
|
|
|
*
|
|
|
|
|
* (ps. we ARE the UNEQUALED justification KING of COMMENTS!)
|
|
|
|
|
* (No, I don't mean significance/relevance, only alignment.)
|
|
|
|
|
*/
|
|
|
|
|
static void frame_make (void) {
|
|
|
|
|
WIN_t *w = Curwin; // avoid gcc bloat with a local copy
|
2002-06-19 05:15:30 +05:30
|
|
|
|
int i, scrlins;
|
|
|
|
|
|
2020-01-01 10:30:00 +05:30
|
|
|
|
// check auto-sized width increases from the last iteration...
|
|
|
|
|
if (AUTOX_MODE && Autox_found)
|
|
|
|
|
widths_resize();
|
|
|
|
|
|
2013-01-16 11:30:00 +05:30
|
|
|
|
// deal with potential signal(s) since the last time around...
|
2013-06-30 10:30:00 +05:30
|
|
|
|
if (Frames_signal)
|
2013-01-16 11:30:00 +05:30
|
|
|
|
zap_fieldstab();
|
2013-01-29 11:30:00 +05:30
|
|
|
|
|
2012-01-09 22:56:45 +05:30
|
|
|
|
// whoa either first time or thread/task mode change, (re)prime the pump...
|
|
|
|
|
if (Pseudo_row == PROC_XTRA) {
|
2017-03-23 10:30:00 +05:30
|
|
|
|
cpus_refresh();
|
2011-08-30 17:35:45 +05:30
|
|
|
|
procs_refresh();
|
|
|
|
|
usleep(LIB_USLEEP);
|
2012-01-09 22:56:45 +05:30
|
|
|
|
putp(Cap_clr_scr);
|
2011-08-30 17:35:45 +05:30
|
|
|
|
} else
|
|
|
|
|
putp(Batch ? "\n\n" : Cap_home);
|
2011-03-31 16:45:12 +05:30
|
|
|
|
|
2011-08-30 17:35:45 +05:30
|
|
|
|
sysinfo_refresh(0);
|
2014-05-27 10:30:00 +05:30
|
|
|
|
procs_refresh();
|
2011-08-30 17:35:45 +05:30
|
|
|
|
|
|
|
|
|
Tree_idx = Pseudo_row = Msg_row = scrlins = 0;
|
|
|
|
|
summary_show();
|
2002-06-19 05:15:30 +05:30
|
|
|
|
Max_lines = (Screen_rows - Msg_row) - 1;
|
top: inoculated against a window manager like 'screen'
If top were invoked under the 'screen' window manager,
writing the terminfo string 'exit_ca_mode' at top exit
would not restore the display to the state existing at
the time top was started. That's what occurs normally.
The net result of that failure was a corrupted screen.
However, there is a 'screen' configuration option that
will produce proper 'rmcup' behavior, but it is off by
default. That screencr option is known as 'altscreen'.
I stumbled across this provision by cloning the screen
git repository then searching for references to 'cup'.
If 'altscreen on' had been in either the /etc/screenrc
or the $HOME/.screenrc configuration file, my poor old
top would never have been accused of such corruptions.
Of course, the Programming Gods decree that any simple
solution for our problem must always be revealed last.
So before discovering that rc option, another approach
was taken involving top only. With just a little extra
refactoring of top display logic he was made immune to
any such quirk in the implementation of 'smcup/rmcup'.
I always feel good about any enhancement that actually
reduces the total number of lines of code. Even though
this change involved mostly rearranging some logic, it
yielded one less line (can't judge by diffstat because
of braces & notes). Anyway, rather than requiring some
change to a screenrc file, now we are self-sufficient.
Reference(s):
procps ---------------------------------------------
https://bugzilla.redhat.com/show_bug.cgi?id=962022
http://www.freelists.org/post/procps/top-procpsng337-no-screen-cleaning-at-exit,3
. top : disable tty scrollback buffer to improve SIGWINCH
commit dedaf6e1a81738ff08ee8e8523871e12f555ad6d
screen ---------------------------------------------
git://git.sv.gnu.org/screen.git
. Improve cursor store/restore on smcup/rmcup.
commit f95352946080be803b794c9f2733d8c809c1a39a
. Fix using alternate screen buffers in some cases.
commit ad56f746c6243d45124485d198d577bdbb78071c
http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=558724
Signed-off-by: Jim Warner <james.warner@comcast.net>
2013-05-18 10:30:00 +05:30
|
|
|
|
|
2018-06-20 10:30:00 +05:30
|
|
|
|
// we're now on Msg_row so clear out any residual messages ...
|
|
|
|
|
putp(Cap_clr_eol);
|
2002-06-19 05:15:30 +05:30
|
|
|
|
|
2002-12-05 04:18:30 +05:30
|
|
|
|
if (!Rc.mode_altscr) {
|
2002-11-08 06:01:28 +05:30
|
|
|
|
// only 1 window to show so, piece o' cake
|
2011-03-31 16:45:12 +05:30
|
|
|
|
w->winlines = w->rc.maxtasks ? w->rc.maxtasks : Max_lines;
|
2011-08-30 17:35:45 +05:30
|
|
|
|
scrlins = window_show(w, Max_lines);
|
2002-06-19 05:15:30 +05:30
|
|
|
|
} else {
|
2002-11-08 06:01:28 +05:30
|
|
|
|
// maybe NO window is visible but assume, pieces o' cakes
|
2002-06-19 05:15:30 +05:30
|
|
|
|
for (i = 0 ; i < GROUPSMAX; i++) {
|
2011-03-31 16:45:12 +05:30
|
|
|
|
if (CHKw(&Winstk[i], Show_TASKON)) {
|
2012-02-07 22:41:11 +05:30
|
|
|
|
frame_hlp(i, Max_lines - scrlins);
|
2011-08-30 17:35:45 +05:30
|
|
|
|
scrlins += window_show(&Winstk[i], Max_lines - scrlins);
|
2002-06-19 05:15:30 +05:30
|
|
|
|
}
|
|
|
|
|
if (Max_lines <= scrlins) break;
|
|
|
|
|
}
|
2002-05-30 09:14:46 +05:30
|
|
|
|
}
|
2011-03-31 16:45:12 +05:30
|
|
|
|
|
2013-07-04 10:30:00 +05:30
|
|
|
|
/* clear to end-of-screen - critical if last window is 'idleps off'
|
2011-03-31 16:45:12 +05:30
|
|
|
|
(main loop must iterate such that we're always called before sleep) */
|
|
|
|
|
if (scrlins < Max_lines) {
|
|
|
|
|
putp(Cap_nl_clreos);
|
|
|
|
|
PSU_CLREOS(Pseudo_row);
|
|
|
|
|
}
|
2018-06-20 10:30:00 +05:30
|
|
|
|
|
|
|
|
|
if (CHKw(w, View_SCROLL) && VIZISw(Curwin))
|
|
|
|
|
show_scroll();
|
2002-06-19 05:15:30 +05:30
|
|
|
|
fflush(stdout);
|
2002-05-30 09:14:46 +05:30
|
|
|
|
|
2011-03-31 16:45:12 +05:30
|
|
|
|
/* we'll deem any terminal not supporting tgoto as dumb and disable
|
|
|
|
|
the normal non-interactive output optimization... */
|
|
|
|
|
if (!Cap_can_goto) PSU_CLREOS(0);
|
|
|
|
|
} // end: frame_make
|
2002-05-30 09:14:46 +05:30
|
|
|
|
|
2011-03-31 16:45:12 +05:30
|
|
|
|
|
|
|
|
|
/*
|
|
|
|
|
* duh... */
|
|
|
|
|
int main (int dont_care_argc, char **argv) {
|
2002-10-12 09:55:57 +05:30
|
|
|
|
(void)dont_care_argc;
|
2002-08-26 06:25:30 +05:30
|
|
|
|
before(*argv);
|
2002-11-08 06:01:28 +05:30
|
|
|
|
// +-------------+
|
2011-03-31 16:45:12 +05:30
|
|
|
|
wins_stage_1(); // top (sic) slice
|
2018-05-18 10:30:00 +05:30
|
|
|
|
configs_reads(); // > spread etc, <
|
2002-11-08 06:01:28 +05:30
|
|
|
|
parse_args(&argv[1]); // > lean stuff, <
|
|
|
|
|
whack_terminal(); // > onions etc. <
|
2011-03-31 16:45:12 +05:30
|
|
|
|
wins_stage_2(); // as bottom slice
|
2002-11-08 06:01:28 +05:30
|
|
|
|
// +-------------+
|
2002-05-30 09:14:46 +05:30
|
|
|
|
|
2002-10-21 10:20:41 +05:30
|
|
|
|
for (;;) {
|
2013-01-16 11:30:00 +05:30
|
|
|
|
struct timespec ts;
|
2011-03-31 16:45:12 +05:30
|
|
|
|
|
2003-03-18 05:12:00 +05:30
|
|
|
|
frame_make();
|
2002-05-30 09:14:46 +05:30
|
|
|
|
|
2011-03-31 16:45:12 +05:30
|
|
|
|
if (0 < Loops) --Loops;
|
|
|
|
|
if (!Loops) bye_bye(NULL);
|
2002-05-30 09:14:46 +05:30
|
|
|
|
|
2013-01-16 11:30:00 +05:30
|
|
|
|
ts.tv_sec = Rc.delay_time;
|
|
|
|
|
ts.tv_nsec = (Rc.delay_time - (int)Rc.delay_time) * 1000000000;
|
2003-03-18 05:12:00 +05:30
|
|
|
|
|
2011-03-31 16:45:12 +05:30
|
|
|
|
if (Batch)
|
2013-01-16 11:30:00 +05:30
|
|
|
|
pselect(0, NULL, NULL, NULL, &ts, NULL);
|
2011-03-31 16:45:12 +05:30
|
|
|
|
else {
|
2013-01-16 11:30:00 +05:30
|
|
|
|
if (ioa(&ts))
|
2013-02-15 11:30:00 +05:30
|
|
|
|
do_key(iokey(1));
|
2002-05-30 09:14:46 +05:30
|
|
|
|
}
|
2013-01-29 11:30:00 +05:30
|
|
|
|
/* note: that above ioa routine exists to consolidate all logic
|
|
|
|
|
which is susceptible to signal interrupt and must then
|
|
|
|
|
produce a screen refresh. in this main loop frame_make
|
|
|
|
|
assumes responsibility for such refreshes. other logic
|
|
|
|
|
in contact with users must deal more obliquely with an
|
2013-06-30 10:30:00 +05:30
|
|
|
|
interrupt/refresh (hint: Frames_signal + return code)!
|
2013-01-29 11:30:00 +05:30
|
|
|
|
|
|
|
|
|
(everything is perfectly justified plus right margins)
|
|
|
|
|
(are completely filled, but of course it must be luck)
|
|
|
|
|
*/
|
2002-10-21 10:20:41 +05:30
|
|
|
|
}
|
2002-05-30 09:14:46 +05:30
|
|
|
|
return 0;
|
2011-03-31 16:45:12 +05:30
|
|
|
|
} // end: main
|