Remove svn:mergeinfo from the releng/10.0 branch.

After branch creation from stable/10, the stable/10 branch mergeinfo
was moved to the root of the branch.

Since there have not been any merges from stable/10 to releng/10.0
yet, we do not need to track any of the existing mergeinfo here.

Merges to releng/10.0 should now be done to the root of the branch.

For future branches during the release cycle, unless otherwise noted,
this change will be done as part of the stable/ and releng/ branch
creation.

Discussed with: peter
Approved by: re (implicit)
Sponsored by: The FreeBSD Foundation

- Copy stable/10 (r259064) to releng/10.0 as part of the
10.0-RELEASE cycle.
- Update __FreeBSD_version [1]
- Set branch name to -RC1

[1] 10.0-CURRENT __FreeBSD_version value ended at '55', so
start releng/10.0 at '100' so the branch is started with
a value ending in zero.

Approved by: re (implicit)
Sponsored by: The FreeBSD Foundation

Copy head (r256279) to stable/10 as part of the 10.0-RELEASE cycle.

Approved by: re (implicit)
Sponsored by: The FreeBSD Foundation

Bump MAX_COLS to 512 to take advantage of wider terminals.

Add "pid" to the help menu (sort keys section).

Add a new line to top that provides a brief summary of the ZFS ARC memory
usage on hosts using ZFS. The new line displays the total amount of RAM
used by the ARC along with the size of MFU, MRU, anonymous (in flight),
headers, and other (miscellaneous) sub-categories. The line is not
displayed on systems that are not using ZFS.

Reviewed by: avg, fs@
MFC after: 3 days

In batch mode, exit after receiving SIGINT, instead of immediate
output of the next display.

Submitted by: Andrey Zonov <andrey zonov org>
MFC after: 1 week

Fix a race in top non-interactive mode. Use plain sleep(3) call instead
of arming timer and then pausing. If SIGALRM is delivered before pause(3)
is entered, top hangs.

Submitted by: Andrey Zonov <andrey zonov org>
MFC after: 1 week

Rework the dynamic per-CPU stats code a bit. Always set 'statics->ncpus'
to the maximum number of CPUs to ensure that lcpustates[] array is always
allocated to the maximum size. Previously, if top was started without
per-CPU stats it would allocate a smaller lcpustates[] array. When
per-CPU stats were then enabled, it would overflow the array and trash
the cpustates_columns[] array causing the CPU stats to be printed in the
wrong locations.

Approved by: re (kib)
MFC after: 1 week

Tweak the interactive description of CPU vs WCPU.

PR: bin/158819
Submitted by: arundel
Approved by: re (kib)

Add a leading space to the status messages output after toggling the
'C' and 'H' flags at runtime. This matches messages output for other
toggles which leave the first column in the message blank to hold the
cursor.

PR: bin/158775
Submitted by: arundel
MFC after: 3 days

Allow per-CPU statistics to be toggled at runtime via the 'P' key.
While here, make -P a toggle similar to other options such as -I.

Reviewed by: arundel
MFC after: 1 week

Note that -a, -C, -H, -j, and -z are also toggles.

PR: bin/158682
Reported by: arundel
MFC after: 3 days

With retirement of cpumask_t and usage of cpuset_t for representing a
mask of CPUs, pc_other_cpus and pc_cpumask become highly inefficient.

Remove them and replace their usage with custom pc_cpuid magic (as,
atm, pc_cpumask can be easilly represented by (1 << pc_cpuid) and
pc_other_cpus by (all_cpus & ~(1 << pc_cpuid))).

This change is not targeted for MFC because of struct pcpu members
removal and dependency by cpumask_t retirement.

MD review by: marcel, marius, alc
Tested by: pluknet
MD testing by: marcel, marius, gonzo, andreast

Revert r214857 pursudant to 9.0-RELEASE cycle.

Requested by: jh

etire the cpumask_t type and replace it with cpuset_t usage.

This is intended to fix the bug where cpu mask objects are
capped to 32. MAXCPU, then, can now arbitrarely bumped to whatever
value. Anyway, as long as several structures in the kernel are
statically allocated and sized as MAXCPU, it is suggested to keep it
as low as possible for the time being.

Technical notes on this commit itself:
- More functions to handle with cpuset_t objects are introduced.
The most notable are cpusetobj_ffs() (which calculates a ffs(3)
for a cpuset_t object), cpusetobj_strprint() (which prepares a string
representing a cpuset_t object) and cpusetobj_strscan() (which
creates a valid cpuset_t starting from a string representation).
- pc_cpumask and pc_other_cpus are target to be removed soon.
With the moving from cpumask_t to cpuset_t they are now inefficient
and not really useful. Anyway, for the time being, please note that
access to pcpu datas is protected by sched_pin() in order to avoid
migrating the CPU while reading more than one (possible) word
- Please note that size of cpuset_t objects may differ between kernel
and userland. While this is not directly related to the patch itself,
it is good to understand that concept and possibly use the patch
as a reference on how to deal with cpuset_t objects in userland, when
accessing kernland members.
- KTR_CPUMASK is changed and now is represented through a string, to be
set as the example reported in NOTES.

Please additively note that no MAXCPU is bumped in this patch, but
private testing has been done until to MAXCPU=128 on a real 8x8x2(htt)
machine (amd64).

Please note that the FreeBSD version is not yet bumped because of
the upcoming pcpu changes. However, note that this patch is not
targeted for MFC.

People to thank for the time spent on this patch:
- sbruno, pluknet and Nicholas Esborn (nick AT desert DOT net) tested
several revision of the patches and really helped in improving
stability of this work.
- marius fixed several bugs in the sparc64 implementation and reviewed
patches related to ktr.
- jeff and jhb discussed the basic approach followed.
- kib and marcel made targeted review on some specific part of the
patch.
- marius, art, nwhitehorn and andreast reviewed MD specific part of
the patch.
- marius, andreast, gonzo, nwhitehorn and jceel tested MD specific
implementations of the patch.
- Other people have made contributions on other patches that have been
already committed and have been listed separately.

Companies that should be mentioned for having participated at several
degrees:
- Yahoo! for having offered the machines used for testing on big
count of CPUs.
- The FreeBSD Foundation for having sponsored my devsummit attendance,
which has been instrumental.
- Sandvine for having offered offices and infrastructure during
development.

(I really hope I didn't forget anyone, if it happened I apologize in
advance).

- Document the -H option and 'H' key alongside other options and keys
rather than at the bottom of the manpage.
- Remove an obsolete comment about SWAIT being a stale state. It was
resurrected for a different purpose in FreeBSD 5 to mark idle ithreads.
- Add a comment documenting that the SLEEP and LOCK states typically
display the name of the event being waited on with lock names being
prefixed with an asterisk and sleep event names not having a prefix.

MFC after: 1 week

Add a new option to toggle the display of the system idle process (per-CPU
idle threads). The process is displayed by default (subject to whether or
not system processes are displayed) to preserve existing behavior. The
system idle process can be hidden via the '-z' command line argument or the
'z' key while top is running. When it is hidden, top more closely matches
the behavior of FreeBSD <= 4.x where idle time was not accounted to any
process.

MFC after: 2 weeks

Output an appropriate amount of padding to line up per-CPU state columns
rather than using a terminal sequence to move the cursor when drawing the
initial screen.

Requested by: arundel
MFC after: 3 days

Add 'jid' as a possible sort order to the help screen.

PR: bin/150992
Submitted by: Frederic Culot <frederic at culot dot org>
Approved by: avg (mentor)
MFC after: 5 days

Inverse display of top(1)'s table header when running in inactive mode.

MFC after: 2 weeks

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

Make these files compile with clang.

Submitted by: Dimitry Andric <dimitry at andric.com>

Merger of the quota64 project into head.

This joint work of Dag-Erling Smørgrav and myself updates the
FFS quota system to support both traditional 32-bit and new 64-bit
quotas (for those of you who want to put 2+Tb quotas on your users).

By default quotas are not compiled into the kernel. To include them
in your kernel configuration you need to specify:

options QUOTA # Enable FFS quotas

If you are already running with the current 32-bit quotas, they
should continue to work just as they have in the past. If you
wish to convert to using 64-bit quotas, use `quotacheck -c 64';
if you wish to revert from 64-bit quotas back to 32-bit quotas,
use `quotacheck -c 32'.

There is a new library of functions to simplify the use of the
quota system, do `man quotafile' for details. If your application
is currently using the quotactl(2), it is highly recommended that
you convert your application to use the quotafile interface.
Note that existing binaries will continue to work.

Special thanks to John Kozubik of rsync.net for getting me
interested in pursuing 64-bit quota support and for funding
part of my development time on this project.

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.

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)

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

Let top(1) use MAXLOGNAME instead of UT_NAMESIZE.

The maximum user login length should have nothing to do with <utmp.h>.

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

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

Bootstrap the merge history for vendor/top and contrib/top.

Removed the no-op -p; documented -P.

MFC after: 3 days

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).

Add a -P flag to display per-cpu cpu usage stats.

Improve -u (limit uid lookups) behavior.

Submitted by: David Frascone <dave@frascone.com>
PR: 119490

- 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)

- Add documentation notes for the 'a' option, forgotten in the previous
commit.

commands.c [1]
top.X

Suggested by: rafan [1]

- Add new 'a' and 'j' options into usage

Approved by: delphij (mentor, implicit)
Forgotten by: stas ('a') and rafan ('j')

- 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

- 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

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

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

Re-add option -C to usage().

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

Bring SYNOPSIS in line with usage().

Typo.

PR: docs/88015
Submitted by: Marian Cerny <jojo@matfyz.cz>
MFC after: 3 days

The 'text' argument of u_header() is not used, so we don't need to
trim_header() it.

Noticed by: bde

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)

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)

- 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>

Correct macro usage.

Submitted by: Christoph Mallon <christoph.mallon@gmx.de>
MFC after: 3 days

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

document the 'I' and 't' commands in the help screen in top(1).

Submitted by: Alex Vasylenko lxv omut.org

Make 'S' in interactive mode toggle display of system processes.

Build upon the nice work of Alfred and add sorting capabilities to
the -m "io" mode of top.

Approved by: alfred

Correct a misleading (cut'n'pasted) comment.

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.

Replace a reference to /kernel with /boot/kernel/kernel

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>

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

Don't depend on <pwd.h> to bogusly include <sys/types.h>.

Resolve conflicts.

Resolve conflicts (our -t option, we'd fixed a bug in a slightly different way).

Resolve conflicts (we have a -t option).

Resolve conflict: We made a fix renaming a structure member error,
but it was renamed errnum on the vendor branch.

This commit was generated by cvs2svn to compensate for changes in r89750,
which included commits to RCS files with non-trunk default branches.

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

Don't do unsafe activities inside signal handlers. Just set a flag and
return.

Obtained from: OpenBSD
Reviewed by: audit

Fix another possible bufer overflow in top.

PR: bin/22496

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.

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.

Correct default value for -s option.

PR: bin/12946
Submitted by: Matthew D. Fuller <fullermd@over-yonder.net>

uptime display more in style with original code

Display uptime in upper right corner.

Submitted by: Andy Farkas <andyf@speednet.com.au>
Obtained from: freebsd-current list

Port top to the alpha.

Submitted by: Hidetoshi Shimokawa <simokawa@sat.t.u-tokyo.ac.jp>

Add missing .TP in "INTERACTIVE MODE" section.

Merge from stable: support for the o, order, command

Add -t option ('t' in interactive mode) to make top(1) ignore itself.
Attempts to contact the author of top(1) (William LeFebvre) have so
far been unsuccessful.

PR: 7253
Submitted by: Yours Truly

Fixed printf format errors.

Declared version_string() properly (1970's style).

vmunix -> kernel

PR: 5484
Submitted by: Vasily V. Grechishnikov <bazilio@ns1.ied-vorstu.ac.ru>

Reviewed by: William LeFebvre <wnl@groupsys.com>
Change errno -> error in local structure to avoid a clash with the
thread-aware version of errno which is required for a thread-safe libc.

Have discussed this with the author and he has agreed to this change. 8-)

Buffer overflow from bitblt's commit to OpenBSD. Committed here for lack
of a better place to do it.

Reviewed by: joerge
Obtained from: OpenBSD

spelling corrections.

PR: docs/4450
Submitted by: josh@quick.net

fix a few spelling changes

Submitted by: Josh Gilliam

Closes PR's: 4429, 4431-4438

PS: He has agreed to submit all contrib fixes back to the original author.

Use UT_NAMESIZE instead of hardcoded user names length

Apply the FreeBSD-local patches.

Obtained from: The ports collection.

This commit was generated by cvs2svn to compensate for changes in r24139,
which included commits to RCS files with non-trunk default branches.