After satisfying increased buffer size in the previous
patch, I decided to improve the highlight accuracy for
both the command lines plus the environment variables.
Since they both may contain elements which themselves
include embedded spaces, to accomplish this goal, one
must trade vanilla strings for string vectors instead.
[ at last such library items have now been justified ]
Signed-off-by: Jim Warner <james.warner@comcast.net>
As it turns out, some of the 'environ' strings are big
enough to overrun the initial buffer sizes. And, while
no real harm was done (other than to silently truncate
the output), this patch will increase the buffer size.
While we're at it. we will normalize a few more buffer
declarations along with correcting a couple typos too.
Signed-off-by: Jim Warner <james.warner@comcast.net>
[ and along the way, those 2 newest namespace fields ]
[ are now mentioned under that same 'X' command part ]
[ this commit already changed for improved response. ]
[ they should have been included in the patch below. ]
Reference(s):
commit 6e78355d4d
Signed-off-by: Jim Warner <james.warner@comcast.net>
[ along the way we will restore '^R' to keys summary ]
[ plus correct a leftover reference to 'Ctrl-V' too. ]
Signed-off-by: Jim Warner <james.warner@comcast.net>
This commit adds a prototype for a potential extension
of that tabbed bottom window capability. It introduces
a 'menu' which then provides for users' selections. It
does not actually do anything meaningful and will only
be enabled with the new #define called 'BOT_PICK_YES'.
[ since it's just a proof of concept, no attempt has ]
[ been made to add the usual NLS translation support ]
Signed-off-by: Jim Warner <james.warner@comcast.net>
This commit introduces the 'tab' key which can be used
to highlight individual elements in that bottom 'Ctrl'
window. This can really help when reviewing such data.
[ note, normal ongoing monitoring continues unabated ]
Signed-off-by: Jim Warner <james.warner@comcast.net>
This commit adds support for displaying the namespaces
in top's separate bottom 'Ctrl' window. Along the way,
the plumbing is now in place to extend this capability
to other data (if we don't run out of '^' keystrokes).
Signed-off-by: Jim Warner <james.warner@comcast.net>
This patch will just set the stage for the next commit
where we'll be adding the capability to display things
that sometimes may necessitate multiple library items.
In that effort we will be adding several new routines.
Signed-off-by: Jim Warner <james.warner@comcast.net>
In that commit shown below, the concept of a corrupted
display was introduced so that 'Ctrl' windows could be
redrawn now that they were made more persistent. Well,
it turns out there is another case where redrawing was
necessary. That is when transitioning between task and
thread modes. So this patch addresses those occasions.
Reference(s):
. May, 2022 - introduced Frames_signal BREAK_screen
commit d66c1f39b5
Signed-off-by: Jim Warner <james.warner@comcast.net>
In the patch referenced below the bottom 'Ctrl' window
was made to remain until it was dismissed by the user.
As such, it required abandoning a 'Cap_nl_clreos' used
when all the terminal rows had not been drawn. Instead
each line had to be cleared individually until the row
reserved for that 'Ctrl' window area had been reached.
Unfortunately, while a 'Cap_nl_clreos' didn't create a
problem for 'batch' mode, a 'Cap_clr_eol' used instead
yielded an unending loop if those rows were limitless.
So, now we will only clear that area when top isn't in
'batch' mode (which should have always been the case).
Reference(s):
. May, 2022 - bottom window made sticky
commit 0f2a755b0b
Signed-off-by: Jim Warner <james.warner@comcast.net>
Well darn it, whoever wrote that new library caught me
with my pants down (again?). Shoot, they were not just
down but somehow missing altogether. Here's the story.
Any item from that library supported by dynamic memory
can only be represented in user's stacks exactly once.
Should any string based enumerator be duplicated among
the items array, for any instance beyond the first the
library will return '[ duplicate ENUM ]' for a result.
That's where I lost my pants. While command lines were
given special handling (and never duplicated) I failed
to turn on CGROUPS, SUPGRPS & ENVIRON when testing the
Ctrl-G, Ctrl-U & Ctrl-N keys. If any of those 3 are on
that's when a Ctrl window sees a 'duplicate' notation.
[ and who runs top with such fields displayed anyway ]
In responding to this oops, the internals were changed
quite dramatically & vastly simplified in the process.
More importantly, the 'duplicate' results are no more.
Signed-off-by: Jim Warner <james.warner@comcast.net>
Change the default name to cons%d
ctty can be used by other systems not just Cygwin so create a define
separate to cygwin for using the ctty function. The autoconf will need
to be updated to check for these specific systems in future.
Thanks to Achim of the Cygwin project for the patches.
Signed-off-by: Craig Small <csmall@dropbear.xyz>
I'm not sure why you would roll your own macros for major and minor
while the standard includes have these defined. Using our versions
causes two problems:
- Some systems don't use this format for their minor/major
- If the kernel proc interface becomes a 64-bit number, like
dev_t is in the library, then our macro will need to be changed.
autoconf already had the check and as a bonus for anyone that
puts these definitions in sys/mkdev.h it handles that too.
So this is now the standard way of getting a minor/major number out of a
device id. Examining bits/sysmacros.h showed that their defines are
close to what devname.c had, except it can handle 64-bit numbers.
Signed-off-by: Craig Small <csmall@dropbear.xyz>
Stops the compilier (correctly) complaining:
lib/test_shm.c: In function ‘main’:
lib/test_shm.c:65:23: warning: format ‘%llx’ expects argument of type ‘long long unsigned int’, but argument 2 has type ‘int’ [-Wformat=]
65 | printf("SHMID: %llx\n", shm_id);
| ~~~^ ~~~~~~
| | |
| | int
| long long unsigned int
shm_id is an int which is what shmget() returns.
Strangely pmap has always scanned this in as a llx even though the maps
"inode" column is the same number that shmget() returns.
Signed-off-by: Craig Small <csmall@dropbear.xyz>
Previously the match for shmid was \d+ but the variable is printed
as a hex number, updated the regex to suit.
Added some changes for pmap test so if the test_shm process fails
we just skip past it.
Signed-off-by: Craig Small <csmall@dropbear.xyz>
To complete the implementation of this new feature, we
must address the problem created by any commands which
offer their own full replacement displays. Should that
'Ctrl' bottom window be active, a return from any such
command leaves that lower portion of a terminal blank.
While we could issue a 'TAGGED_TOSS' macro right after
invoking any of those 4 (currently) affected commands,
it is wrong to make them aware of this 'tagged' stuff.
So, I'll opt for a more generalized solution whereby a
notice regarding a corrupted screen is broadcast. Then
the logic already aware of 'tagging' can deal with it.
Signed-off-by: Jim Warner <james.warner@comcast.net>
After making that new bottom window more persistent, I
decided to offer a build choice for somebody who might
prefer to have the rug pulled out from under him while
reviewing window contents should some target task end.
If 'TAGGED_BRIEF' is defined old behavior is restored.
[ it should be noted, however, that when this define ]
[ is active we'll lose any benefit of onetime update ]
[ for the bottom window. just like with the original ]
[ behavior, it is repainted with every update cycle. ]
Signed-off-by: Jim Warner <james.warner@comcast.net>
I grew tired of inadvertently causing a premature exit
from top when all I wanted was to review some process'
environment variables. That 'V' key was just too close
to the 'C' key so the '^V' attempt became one of '^C'.
Well, not any more. Should a user wish to see a task's
environment, it will now require the '^N' combination.
[ it also now places G/U & N/K on a similar diagonal ]
Along the way, lower case Ctrl key combinations on the
help screen were all changed into upper case versions.
Signed-off-by: Jim Warner <james.warner@comcast.net>
After using this new feature for awhile, I encountered
numerous times when that 'Ctrl' window would disappear
as I was studying the contents. This was caused by the
death of the target task but it made me think that the
window could/should persist until dismissed by a user.
Well, now it will persist until that same Ctrl key has
been struck a 2nd time or a different Ctrl key used to
target another process after positioning it on row #1.
So now, instead of that former 'moving target' type of
approach, this window is more of a 'snapshot' in time.
[ even more significant, perhaps, is the fact that a ]
[ Ctrl window will now be drawn exactly 1 time only, ]
[ instead of being repainted after each delay cycle. ]
[ this will remain true no matter how many intervals ]
[ might elapse while its contents were under review. ]
Signed-off-by: Jim Warner <james.warner@comcast.net>
When support for the 'LIBPROC_HIDE_KERNEL' environment
variable was introduced, a deficiency was present that
allowed any rejected proc_t (i.e. a kworker thread) to
preserve the strdup'd 'cmd' value. That residual value
would prevent stat2proc or status2proc from updating a
cmd field with the proper program name for some tasks.
This patch just ensures a proc_t is freshened whenever
it has been rejected due to an active PT->hide_kernel.
[ again thanks to Björn for initiating the extension ]
Reference(s):
. original hide_kernel implementation
commit 2a7ec67ac8
. original hide_kernel proposal
https://gitlab.com/procps-ng/procps/-/merge_requests/147
Signed-off-by: Jim Warner <james.warner@comcast.net>
This minor addition to that new 'Ctrl' feature is more
important than it seems. It's responsible for alerting
yours truly to the 'LIBPROC_HIDE_KERNEL' bug addressed
in the very next commit. All this while, program names
for some tasks would be mysteriously replaced with the
kernel 'kworker' names. However, customary clutter for
the top process display tended to obscure such a fact.
[ and, of course, to notice the problem in the first ]
[ place required one to have the command line toggle ]
[ 'off' or perhaps to toggle its state 'on' & 'off'. ]
Signed-off-by: Jim Warner <james.warner@comcast.net>
There are times when one might want to see some task's
particular variable width data. However, prior to this
commit, the only way was to first turn on a field then
scroll through it via repeated right arrow keystrokes.
[ this also required that field to be displayed last ]
Needless to say, given the potential length of some of
that variable data this could be extremely cumbersome.
Now with this patch, a Ctrl keystroke combination will
create a separate window at the bottom of the terminal
screen where such variable width data is seen in full.
[ the targeted task is the 1st task displayed, which ]
[ is a convention employed in some existing commands ]
[ the targeted data was determined by these Ctrl key ]
[ combinations: CtrlG = ctrl group; CtrlK = cmdline; ]
[ CtrlU = supplementary groups; plus CtrlV = environ ]
Signed-off-by: Jim Warner <james.warner@comcast.net>
Created a test process test_shm that allocates a shared memory
segment and prints the segment ID. pmap testsuite runs pmap to
check that the segment is found.
The value returned by shmget() is the same value that is printed
in the fifth column /proc/<PID>/maps
Signed-off-by: Craig Small <csmall@dropbear.xyz>
pmap uses freopen to read /proc/self/maps. There doesn't
seem to be a good reason to do this and if pmap has its
stdin previously closed then it fails.
Signed-off-by: Craig Small <csmall@dropbear.xyz>
Call trace:
#0 __lll_lock_wait_private () at
../nptl/sysdeps/unix/sysv/linux/x86_64/lowlevellock.S:95
#1 0x00007f95c059f9d7 in _L_lock_638 () from /lib64/libc.so.6
#2 0x00007f95c059f8b6 in _nl_expand_alias
#3 0x00007f95c059dad8 in _nl_find_domain
#4 0x00007f95c059d22e in __dcigettext
#5 0x00007f95c059c05f in __GI___dcgettext
#6 0x00000000004032b3 in signal_handler (signo=15) at display.c:54
#7 <signal handler called>
#8 __memcpy_sse2 () at ../sysdeps/x86_64/memcpy.S:104
#9 0x00007f95c05d9934 in __GI__IO_getline_info
#10 0x00007f95c05d99b8 in __GI__IO_getline
#11 0x00007f95c05e2a5d in __GI_fgets_unlocked
#12 0x00007f95c059f478 in read_alias_file
#13 0x00007f95c059f97a in _nl_expand_alias
#14 0x00007f95c059dad8 in _nl_find_domain
#15 0x00007f95c059d22e in __dcigettext
#16 0x00007f95c059c05f in __GI___dcgettext
#17 0x0000000000403a8d in reset_global () at global.c:410
#18 0x0000000000402605 in main at display.c:650
The above call trace happens when the ps process is suspending, and the
signal SIGTERM is sent to the ps process at the same time.
Just cancel the SIGTERM and SIGHUP handler when suspending to prevent
the problem.
Signed-off-by: liutie <liutie4@huawei.com>
Signed-off-by: fu.lin <fulin10@huawei.com>
When autogroups are active programs such as renice and
nice are basically useless because the nice value will
only affect the target task priority relative to other
processes in the same autogroup. So to accomplish what
we thought of as renice, /proc/<pid>/autogroup must be
changed. Altering a single member in an autogroup will
also affect every other member of that same autogroup.
Since top's renice provision ('r') suffers constraints
like those of the stand alone nice/renice programs, we
will now provide a means to manipulate that nice value
found within some process' /proc/<pid>/autogroup file.
[ to alter this file for other user's tasks requires ]
[ root privileges, as does setting a negative value. ]
[ however, unlike that 'r' command, this new command ]
[ allows raising *and* lowering all positive values. ]
Reference(s):
. Aug 2021, autogroups added to librady
commit 631e5d91f3
. Aug 2021, autogroups added to top
commit b789b46f84
Signed-off-by: Jim Warner <james.warner@comcast.net>
To avoid potential user confusion, like that reflected
in the previous commit message, a short narrative will
be included in the header file as programmer comments,
Signed-off-by: Jim Warner <james.warner@comcast.net>
With openSUSE's tumbleweed release of procps-ng-4.0.0,
their source rpm contained a questionable patch. It is
ostensibly devoted to increasing the accuracy for %cpu
calculations in the ps program. However, in my opinion
it goes too far and is quite flawed for these reasons:
1. Six separate files were impacted instead of just 1.
2. While ps was the object, libproc-2 was changed too.
3. A header file's alphabetic item order was violated.
4. The library API and ABI were altered unnecessarily.
It should be noted that all the <pids> TIME items were
made 'real' when representing seconds so that they can
be converted into jiffies/tics if multiplied by hertz.
Thus, there was absolutely no justification for adding
a new PIDS_TICS_ELAPSED ull_int item to the interface.
As an example, assuming a hertz value of 100, there is
enough capacity in all of those 'TIME' seconds to hold
nearly 3 million years worth of tics without a loss of
precision whenever they are changed back into jiffies.
[ that's nine quadrillion seven trillion one hundred ]
[ ninety-nine billion two hundred fifty-four million ]
[ seven hundred forty thousand nine hundred ninety + ]
[ one! or more concisely, as: 9,007,199,254,740,991. ]
So, any need for increased accuracy in that ps program
can be realized within the single output.c file alone.
That's what will be accomplished with this new commit.
And for any doubters here's a 'double' capacity proof:
beg ------ 9007199254740991.000000000000000000000 tic|
d /= 100, 90071992547409.90625000000000000000000 sec
d /= 60, 1501199875790.165039062500000000000000 min
d /= 60, 25019997929.83608245849609375000000000 hrs
d /= 24, 1042499913.743170142173767089843750000 day
d /= 7, 148928559.1061671674251556396484375000 wks
d /= 52, 2864010.752041676081717014312744140625 yrs
d *= 52, 148928559.1061671674251556396484375000 wks
d *= 7, 1042499913.743170142173767089843750000 day
d *= 24, 25019997929.83608245849609375000000000 hrs
d *= 60, 1501199875790.165039062500000000000000 min
d *= 60, 90071992547409.90625000000000000000000 sec
d *= 100, 9007199254740991.000000000000000000000 tic
end ------ 9007199254740991.000000000000000000000 " |
[ who knows, maybe we'll even convince openSUSE that ]
[ the original sledgehammer 'dif' should be dropped. ]
Reference(s):
. openSUSE equivalent: 'procps-ng-4.0.0-accuracy.dif'
Signed-off-by: Jim Warner <james.warner@comcast.net>
This patch trades some recurring per-task calculations
for calculations performed once at get, select or reap
time. It was prompted by the openSUSE dif named below.
[ my next commit will deal more thoroughly with that ]
Reference(s)
. openSUSE patch named: 'procps-ng-4.0.0-accuracy.dif'
Signed-off-by: Jim Warner <james.warner@comcast.net>
With the memset to zero of a 'new' meminfo_data struct
near the beginning of the meminfo_read_failed function
there's never a need to later set anything in it to 0.
[ who knows, our patch might even coax opensuse into ]
[ reevaluating that 4.0.0 'overflow' guy named below ]
Reference(s):
. overflow: 'procps-ng-4.0.0-integer-overflow.patch'
Signed-off-by: Jim Warner <james.warner@comcast.net>
Now that this 'c' variable initial assignment has been
moved outside the looping code, there is no longer any
need to specifically check for space/comma when 'c' is
not '%'. So, let us eliminate those two lines of code.
[ i promise not to change this algorithm ever again! ]
Signed-off-by: Jim Warner <james.warner@comcast.net>
On occasion, even as the top author, I wonder why that
'x' toggle has stopped working. Of course, it actually
was working but a locate request ('L') or other filter
('O') operation was active and thus temporarily turned
if off. Such behavior is documented in top's man page.
Well, with this patch that 'x' suppression is no more.
[ the original justification, however, remains true. ]
[ but there's really only one character which causes ]
[ any potential trouble & i'm gonna' keep it secret. ]
[ besides, if a display is corrupted, there's always ]
[ that '=' key which restores things back to normal. ]
Signed-off-by: Jim Warner <james.warner@comcast.net>
On Cygwin systems use a different file and format to get the
OS version.
Thanks to procps Cygwin maintainer Achim!
Signed-off-by: Craig Small <csmall@dropbear.xyz>
While the previous commit checked for a GNU environment so Hurd
compilied ok, this tripped up Cygwin. configure now explicitly tests
for the structure field rather than trying to guess through compilier
flags about what the environment tells us about signals.h
References:
commit d39d9db079
Signed-off-by: Craig Small <csmall@dropbear.xyz>
