Commit Graph

67 Commits

Author SHA1 Message Date
Rebecca Cran
2ab8e45eb8 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
Rui Paulo
247cd15268 Make these files compile with clang.
Submitted by:	Dimitry Andric <dimitry at andric.com>
2010-07-22 18:52:29 +00:00
Nathan Whitehorn
3560b8af1f 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
Rebecca Cran
c4103be40d 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
Rebecca Cran
e9db446223 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 Schouten
2d86428bba 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
John Baldwin
fcaeaff4b6 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
Robert Watson
5643f3fc50 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
Edwin Groothuis
3e0c556084 Move install to install-sh to prevent name-clashes. 2008-09-28 08:11:11 +00:00
Ruslan Ermilov
cd83aa9707 Removed the no-op -p; documented -P.
MFC after:	3 days
2008-06-21 15:48:16 +00:00
Ruslan Ermilov
d3bf3b9a7a 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 Wemm
031175705e Add a -P flag to display per-cpu cpu usage stats. 2008-01-18 01:43:14 +00:00
David E. O'Brien
dbb2956620 Improve -u (limit uid lookups) behavior.
Submitted by:	David Frascone <dave@frascone.com>
PR:		119490
2008-01-09 18:06:24 +00:00
Rong-En Fan
d3abf70e1b - 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
Stanislav Sedov
679420161d - 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
Rong-En Fan
926a99d402 - 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
Rong-En Fan
6000ced11b - 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
Stanislav Sedov
faac60c8fc - 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
Giorgos Keramidas
d2d6d8d537 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
Giorgos Keramidas
d9c49a535a 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
Ruslan Ermilov
c8e1eaa0a4 Re-add option -C to usage(). 2006-04-19 12:19:06 +00:00
Giorgos Keramidas
4ced3fbbf1 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
Ruslan Ermilov
7734a577e3 Bring SYNOPSIS in line with usage(). 2006-04-18 15:26:58 +00:00
Giorgos Keramidas
5967e9a271 Typo.
PR:		docs/88015
Submitted by:	Marian Cerny <jojo@matfyz.cz>
MFC after:	3 days
2005-10-26 12:07:23 +00:00
Giorgos Keramidas
3c2ab2b0ec 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
Giorgos Keramidas
cd660671ce 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
Giorgos Keramidas
bbf750fbff 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
Giorgos Keramidas
32efd26355 - 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
Christian Brueffer
28d223bdcb Correct macro usage.
Submitted by:	Christoph Mallon <christoph.mallon@gmx.de>
MFC after:	3 days
2005-03-13 13:37:02 +00:00
Alfred Perlstein
5d320d4b95 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 Perlstein
67fd4fce29 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 Perlstein
3911ee527b Make 'S' in interactive mode toggle display of system processes. 2004-07-12 03:00:50 +00:00
Giorgos Keramidas
26b2243ae7 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
Dag-Erling Smørgrav
ba2396cd27 Correct a misleading (cut'n'pasted) comment. 2004-07-05 12:19:53 +00:00
Alfred Perlstein
db6bb7fc01 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 Eklund
c898f3db07 Replace a reference to /kernel with /boot/kernel/kernel 2003-08-26 15:37:19 +00:00
Julian Elischer
e27d79bb28 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
David Malone
1b39d8a298 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 Barcroft
6a85a2d149 Don't depend on <pwd.h> to bogusly include <sys/types.h>. 2002-06-09 19:29:55 +00:00
David Malone
337fd7a891 Resolve conflicts. 2002-01-24 17:58:42 +00:00
David Malone
db6a108dbf Resolve conflicts (our -t option, we'd fixed a bug in a slightly different way). 2002-01-24 17:55:40 +00:00
David Malone
bc2856b282 Resolve conflicts (we have a -t option). 2002-01-24 17:54:04 +00:00
David Malone
73e3ae1c4e 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
David Malone
4f4f23c131 import top_3_5beta12 2002-01-24 17:24:16 +00:00
David Malone
30be5b1b49 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
David Malone
3d08935d6a 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 Kennaway
26d889d4ff 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
Warner Losh
70cf0d7ec3 Fix another possible bufer overflow in top.
PR: bin/22496
2000-11-03 22:00:10 +00:00
Warner Losh
1e3661ab60 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 Wemm
a1e753fa30 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