Commit Graph

66 Commits

Author SHA1 Message Date
brucec
11b8361778 Since top displays the uptime including seconds, there is no need to add 30
onto it, which may have been used for rounding purposes in other utilities.

PR:	bin/147934
Submitted by:	Janne Snabb <snabb at epipe.com>
Approved by:	rrs (mentor)
MFC after:	2 weeks
2010-08-17 09:51:08 +00:00
rpaulo
19435b2958 Make these files compile with clang.
Submitted by:	Dimitry Andric <dimitry at andric.com>
2010-07-22 18:52:29 +00:00
nwhitehorn
9e69ae693d Fix brokenness in top on big-endian 32-bit systems introduced when
changing format_k2 to take a long long. Because itoa is defined as a K&R
C function, without prototyping its arguments, format_k2 passed a 64-bit
value, but itoa() received only the first word, showing '0' in all memory
fields.
2010-04-19 14:34:44 +00:00
brucec
ce9748d41d Specify the parameter in the format_k2 prototype.
This fixes top on ARM, which assumes that format_k2 takes an int.

Approved by:	rrs (mentor)
2010-04-01 21:20:19 +00:00
brucec
9d0c668a14 Change the 'amt' parameter in format_k2 from int to unsigned long long
to match the values passed in and prevent the SIZE field being corrupted
when more than 2TB is allocated.

PR:		bin/129706
Approved by:	rrs (mentor)
MFC after:	1 week
2010-03-13 11:17:39 +00:00
ed
8f467b7b0f Let top(1) use MAXLOGNAME instead of UT_NAMESIZE.
The maximum user login length should have nothing to do with <utmp.h>.
2009-12-25 09:02:41 +00:00
jhb
f67f7744c1 Explicitly line up the CPU state labels with the calculated starting column
that takes into account the width of the largest CPU ID.  On systems with
> 10 CPUs the labels for the first 10 CPUs were not lined up properly
otherwise.

Approved by:	re (kib)
MFC after:	1 week
2009-08-19 15:17:13 +00:00
rwatson
40428b7066 Merge r183430 from vendor/top/dist to head/contrib/top, although with
record-only mergeinfo because an automated merge is confused by the
flattening that took place:

  Move install to install-sh to prevent name-clashes.

MFC after:	3 days
2009-03-10 11:46:41 +00:00
ru
58967561b9 Removed the no-op -p; documented -P.
MFC after:	3 days
2008-06-21 15:48:16 +00:00
ru
1d29dab182 system_info.cpustates isn't sparse, so a bitmask of available CPU states
is redundant (I think it's a leftover from an older implementation).
2008-04-11 11:39:26 +00:00
peter
368d76456b Add a -P flag to display per-cpu cpu usage stats. 2008-01-18 01:43:14 +00:00
obrien
2678039b69 Improve -u (limit uid lookups) behavior.
Submitted by:	David Frascone <dave@frascone.com>
PR:		119490
2008-01-09 18:06:24 +00:00
rafan
747bdd6a18 - s/jail id/jail ID/, acronyms should be in uppercase in general. Also,
it is written this way in jail(8).

Suggested by:	brueffer
Approved by:	delphij (mentor, implicit)
2007-05-04 15:42:58 +00:00
stas
55daa60ccc - Add documentation notes for the 'a' option, forgotten in the previous
commit.

  commands.c [1]
  top.X

Suggested by:	rafan [1]
2007-05-03 22:17:35 +00:00
rafan
c654468e48 - Add new 'a' and 'j' options into usage
Approved by:	delphij (mentor, implicit)
Forgotten by:	stas ('a') and rafan ('j')
2007-04-19 14:24:54 +00:00
rafan
3306a8a299 - Add a new 'j' switch and runtime option to toggle display jail id for
each process.
- While I'm here, keep help message sorted by keys

PR:		98489, 98975
Submitted by:	clsung
Approved by:	delphij (mentor)
MFC after:	2 weeks
2007-04-17 03:12:39 +00:00
stas
b2e4c77a02 - Add new 'a' switch and runtime option that allows 'top' to display process
titles extracted from argv vector instead of the real executable names.
  This is useful when you want to watch applications that set their status
  information via setproctitle(3).

Approved by:	alfred
MFC after:	2 weeks
2007-04-14 10:16:52 +00:00
keramida
b9438a6636 The sigconv.awk script generates a sigdesc.h header file, which
contains a sigdec[] vector of structures, but the generated output is
missing braces around the initializer of each struct, which
triggers warnings in WARNS=3:

src/usr.bin/top/sigdesc.h:10: warning: missing braces around initializer
src/usr.bin/top/sigdesc.h:10: warning: (near initialization for `sigdesc[0]')

  * Fix the sigconv.awk script to generate a header with initializers
    which look better.

  * Add rules to usr.bin/top/Makefile that rebuilds a new sigconv.h
    header which matches the correct signal set from the build-time
    version of `${DESTDIR}/usr/include/signal.h' (so sigconv.h doesn't
    get stale once changes are made to the header).

  * Remove the old sigconv.h header, now that it is autoupdated at
    build time.

  * Various Makefile style fixes (the committed Makefile was kindly
    submitted by Ruslan):

    - Reorder .PATH, PROG, SRCS and CFLAGS to match style.Makefile(5)
    - Split off the generated sources (sigdesc.h top.local.h) in an
      SRCS+= line of their own.
    - Add entries to CLEANFILES near the rules that generate the
      respective files.
    - Move the explicit rule which builds top.1 after the implicit
      rules which generate its dependencies.

Reviewed by:	ru, bde
Submitted by:	ru (Makefile)
MFC after:	2 weeks
2006-12-01 07:01:19 +00:00
keramida
3937232b20 Update the description of the `STATE' column for SMP systems,
and add the missing `C' SMP-only column.

PR:		docs/29245
Submitted by:	ada@bsd.org
Patch by:	Pawel Worach <pawel.worach@telia.com>
MFC after:	3 days
2006-05-16 15:27:43 +00:00
ru
b8c014aae7 Re-add option -C to usage(). 2006-04-19 12:19:06 +00:00
keramida
0fb9a8f112 Document the -C option of top(1), which has been added to the source
and the usage message of top, but not to the manpage.

Pointy hat to:  keramida
Reminded by:    ru
MFC after:      1 week
2006-04-19 11:47:51 +00:00
ru
cb88fa831f Bring SYNOPSIS in line with usage(). 2006-04-18 15:26:58 +00:00
keramida
189f76a3bd Typo.
PR:		docs/88015
Submitted by:	Marian Cerny <jojo@matfyz.cz>
MFC after:	3 days
2005-10-26 12:07:23 +00:00
keramida
acf4c33aac The 'text' argument of u_header() is not used, so we don't need to
trim_header() it.

Noticed by:	bde
2005-05-19 13:34:19 +00:00
keramida
c355fa8659 Properly trim the header line too, to fix wrap-around problems that
have been noticed by running top(1) in terminals that are too narrow
(or on systems with usernames that were too long, pushing everything
too far to the right).

Note that this does *not* solve the wrap-around problem of the system
statistics, which is an entirely different matter :-/

Tested on:	i386, sparc64 (panther), amd64 (sledge)
Approved by:	davidxu (in principle)
2005-05-18 13:48:33 +00:00
keramida
0f9725e09b Merge the CPU and WCPU columns in a single %6.2f column, add a new 'C'
command that toggles between the two and update the ORDER_PCTCPU()
macro to sort correctly by the visible "cpu" value.

This saves 6 more columns in 80-column terminals, making things a lot
better for the COMMAND column.

Tested on:	i386, sparc64 (panther), amd64 (sledge)
Approved by:	davidxu (in principle)
2005-05-18 13:30:08 +00:00
keramida
eae5910982 - Add a THR column to the process listing, that shows the number of
threads a process has.  The THR column is disabled and disappears
  when 'H' is hit, because then every thread gets its own output line.
- Allow sorting processes by "threads".

Approved by:	davidxu
Inspired by:	Jiawei Ye <leafy7382@gmail.com>
2005-04-14 15:02:03 +00:00
brueffer
3af8d3beb5 Correct macro usage.
Submitted by:	Christoph Mallon <christoph.mallon@gmx.de>
MFC after:	3 days
2005-03-13 13:37:02 +00:00
alfred
2e978add60 This patch merges the sort fields for both pages, so you can (for
example) view io stats while sorting by process size.  Also adds
voluntary and involuntary context-switch stats to the io page because
there was lots of room.

Submitted by: Dan Nelson dnelson at allantgroup.com
2004-08-16 07:51:22 +00:00
alfred
fae9d5166b document the 'I' and 't' commands in the help screen in top(1).
Submitted by: Alex Vasylenko lxv omut.org
2004-07-12 15:22:44 +00:00
alfred
943cc11b6d Make 'S' in interactive mode toggle display of system processes. 2004-07-12 03:00:50 +00:00
keramida
600bdc3b55 Build upon the nice work of Alfred and add sorting capabilities to
the -m "io" mode of top.

Approved by:	alfred
2004-07-08 16:45:55 +00:00
des
ca58cbd339 Correct a misleading (cut'n'pasted) comment. 2004-07-05 12:19:53 +00:00
alfred
bf711ae9b2 New feature, provide a display that shows the amount of IO processes
are doing.  Toggle this mode by hitting "m" or passing the command line
option "-m io" to top(1).  This allows one to identify disk bandwidth
hogs much easier.
2004-07-01 09:12:38 +00:00
eivind
52619ee2c2 Replace a reference to /kernel with /boot/kernel/kernel 2003-08-26 15:37:19 +00:00
julian
788547d4cf Changes to allow top to decide whether or not to show multiple threads per
process. Option -H enables it and it is toggled at the interactive
screen by 'H'.

Submitted by:	Jung-uk Kim <jkim@niksun.com>
2003-07-17 23:56:40 +00:00
dwmalone
a74d142778 Fix a bug where you couldn't start top in a very small window. Now
you can start it in a small window, but it doesn't always display
anything sensible. Resizing the window does work though.

The patch is a slightly simpler one than Sheldon's in the PR.

PR:		21075
2002-08-11 18:37:25 +00:00
mike
c1a6b37593 Don't depend on <pwd.h> to bogusly include <sys/types.h>. 2002-06-09 19:29:55 +00:00
dwmalone
c48987263d Resolve conflicts. 2002-01-24 17:58:42 +00:00
dwmalone
37a39754f4 Resolve conflicts (our -t option, we'd fixed a bug in a slightly different way). 2002-01-24 17:55:40 +00:00
dwmalone
3e1b7588c4 Resolve conflicts (we have a -t option). 2002-01-24 17:54:04 +00:00
dwmalone
9785b3935a Resolve conflict: We made a fix renaming a structure member error,
but it was renamed errnum on the vendor branch.
2002-01-24 17:52:26 +00:00
dwmalone
9db2b84363 This commit was generated by cvs2svn to compensate for changes in r89750,
which included commits to RCS files with non-trunk default branches.
2002-01-24 17:24:16 +00:00
dwmalone
6d85e91806 import top_3_5beta12 2002-01-24 17:24:16 +00:00
dwmalone
2650f9ea14 Make top exit if its tty vanishes.
PR:		30939, 30581
Submitted by:	Edwin Groothuis <edwin@mavetju.org>
Submitted by: 	Andrew L. Neporada <andr@dgap.mipt.ru>
MFC after:	2 weeks
2001-11-04 21:15:52 +00:00
kris
fbb6cc4454 Don't do unsafe activities inside signal handlers. Just set a flag and
return.

Obtained from:	OpenBSD
Reviewed by:	audit
2001-08-06 03:19:22 +00:00
imp
9b7d83c384 Fix another possible bufer overflow in top.
PR: bin/22496
2000-11-03 22:00:10 +00:00
imp
7790e40295 display.c: sprintf -> snprintf
top.c: fix from NetBSD/OpenBSD: make sure that new_message() is called
with a format.

Add $FreeBSD$ While I'm here.

These files are already off the vendor branch.
2000-10-04 23:34:16 +00:00
peter
27fb7bdf09 Don't declare ospeed as a common - and it happens to be incorrect as well.
top doesn't use it and it causes a linker warning.
2000-09-16 19:36:18 +00:00
phantom
7fa5173def Correct default value for -s option.
PR:           bin/12946
Submitted by: Matthew D. Fuller <fullermd@over-yonder.net>
2000-07-20 13:27:58 +00:00