Files
Michael Tuexen 72b42d209f MFC r340361:
Fix printing of 64-bit counters on 32-bit ppc platforms.

Several statistic counters are uint64_t values and are printed by systat
using %lu. This results in displaying wrong numbers. Use PRIu64 instead.
While there, print variables of size_t using %zd.

Approved by:		re (gjb@)
Differential Revision:	https://reviews.freebsd.org/D17838

(cherry picked from commit 45e9405ea4)

systat: use and correctly display 64bit counters.

Following struct vmtotal changes, make systat use and correctly
display 64-bit counters.  Switch to humanize_number(3) to overcome
homegrown arithmetics limits in pretty printing large numbers.  Use
1024 as a divisor for memory fields to make it consistent with other
tools and users expectations.

Submitted by:	Pawel Biernacki <[email protected]>
Sponsored by:	Mysterious Code Ltd.
PR:	2137
Differential revision:	https://reviews.freebsd.org/D13105

(cherry picked from commit 90dd3e79cc)

Order declarations alphabetically.
Match signess of the format and the value.

Noted by:	bde
Sponsored by:	The FreeBSD Foundation

(cherry picked from commit 1b7a3d1f5f)

MFC r340361, r345804: catch up on systat in head/

[Neither of these originally mine, but the latter commit referenced
fixes an -fno-common issue and the former is a bugfix]

r340361:
Fix printing of 64-bit counters on 32-bit ppc platforms.

Several statistic counters are uint64_t values and are printed by systat
using %lu. This results in displaying wrong numbers. Use PRIu64 instead.
While there, print variables of size_t using %zd.

r345804:
systat -zarc to display disk activities like -vm

PR:		213310
(cherry picked from commit a70af2507f)

MFC r360919,r360929,r361084:

Patch systat -zarc to display cumulative rate and round down large numbers by SI units

Introduce sysputpage() to display large page size with human readable format.
  Using UI units allows to fit larger numbers in columns.
  Stop calling v_page_size - this is a value that doesn't change at runtime.
  Renamed WINDOW *wnd to *wd to avoid conflict with global *wnd variable.
  Use bit-shift to convert page size to byte.

PR:		237664, 246458
Submitted by:	[email protected]

(cherry picked from commit 65d1fd13ac)

MFC r363095:
Handle device removal and removal+add cases to fix infinity rate.

PR:		219829
Submitted by:	[email protected]
Reported by:	[email protected]
Differential Revision:	https://reviews.freebsd.org/D25226

(cherry picked from commit 7a446028ce)

PR:		219829, 237664, 246458, 213310, 2137
2021-01-03 17:29:50 +01:00

119 lines
3.2 KiB
C

/*-
* Copyright (c) 2019 Yoshihiro Ota
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
* 1. Redistributions of source code must retain the above copyright
* notice, this list of conditions and the following disclaimer.
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
* 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
* THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
* ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
* ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
* FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
* DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
* OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
* HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
* LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*/
#include <sys/cdefs.h>
__FBSDID("$FreeBSD$");
#include <sys/types.h>
#include <sys/sysctl.h>
#include <inttypes.h>
#include <string.h>
#include <err.h>
#include <libutil.h>
#include "systat.h"
#include "extern.h"
void
sysputspaces(WINDOW *wd, int row, int col, int width)
{
static char str40[] = " ";
mvwaddstr(wd, row, col, str40 + sizeof(str40) - width - 1);
}
void
sysputstrs(WINDOW *wd, int row, int col, int width)
{
static char str40[] = "****************************************";
mvwaddstr(wnd, row, col, str40 + sizeof(str40) - width - 1);
}
void
sysputuint64(WINDOW *wd, int row, int col, int width, uint64_t val, int flags)
{
char unit, *ptr, *start, wrtbuf[width + width + 1];
int len;
unit = 0;
start = wrtbuf;
flags |= HN_NOSPACE;
if (val > INT64_MAX)
goto error;
else
len = humanize_number(&wrtbuf[width], width + 1, val, "",
HN_AUTOSCALE, flags);
if (len < 0)
goto error;
else if (len < width)
memset(wrtbuf + len, ' ', width - len);
start += len;
mvwaddstr(wd, row, col, start);
return;
error:
sysputstrs(wd, row, col, width);
}
void
sysputwuint64(WINDOW *wd, int row, int col, int width, uint64_t val, int flags)
{
if(val == 0)
sysputspaces(wd, row, col, width);
else
sysputuint64(wd, row, col, width, val, flags);
}
static int
calc_page_shift()
{
u_int page_size;
int shifts;
shifts = 0;
GETSYSCTL("vm.stats.vm.v_page_size", page_size);
for(; page_size > 1; page_size >>= 1)
shifts++;
return shifts;
}
void
sysputpage(WINDOW *wd, int row, int col, int width, uint64_t pages, int flags)
{
static int shifts = 0;
if (shifts == 0)
shifts = calc_page_shift();
pages <<= shifts;
sysputuint64(wd, row, col, width, pages, flags);
}