mirror of
https://github.com/opnsense/src.git
synced 2026-04-21 22:27:47 -04:00
57e5da2c98
This change updates the systat(1) -swap display to use libprocstat to
obtain and display per-process swap space usage infomation following its
existing swap devise/file statistics. It also incorporates the disk I/O
information from the -vmstat display.
The new screen looks like below with 'systat -swap':
/0 /1 /2 /3 /4 /5 /6 /7 /8 /9 /10
Load Average |
Device/Path Size Used |0% /10 /20 /30 /40 / 60\ 70\ 80\ 90\ 100|
ada0s1b 2048M 2034M
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
zvol/sys/tempora 1024M 1015M
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
zvol/sys/swap 1024M 1014M
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
Total 4096M 4063M
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
Pid Username Command Swap/Total Per-Process Per-System
24153 hiro seamonkey 98M / 1G 7% 2%
23677 hiro xfce4-pane 28M / 81M 34% XXX 0%
23629 hiro xfce4-sess 25M / 118M 21% XX 0%
23681 hiro xfdesktop 20M / 58M 34% XXX 0%
23678 hiro thunar 15M / 43M 36% XXX 0%
23658 hiro at-spi-bus 14M / 23M 63% XXXXXX 0%
23660 hiro gvfsd 12M / 21M 56% XXXXX 0%
Disks ada0 ada1 ada2 cd0 pass0 pass1 pass2 pass3
KB/t 8.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00
tps 0 0 0 0 1 0 0 0
MB/s 0.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00
%busy 0 0 0 0 0 0 0 0
Submitted by: Yoshihiro Ota
MFC after: 1 week
Differential revision: https://reviews.freebsd.org/D29754
112 lines
3.1 KiB
C
112 lines
3.1 KiB
C
/*-
|
|
* SPDX-License-Identifier: BSD-2-Clause-FreeBSD
|
|
*
|
|
* Copyright (c) 2019, 2020 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.
|
|
*
|
|
* THIS SOFTWARE IS PROVIDED BY THE AUTHOR 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 AUTHOR 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 <err.h>
|
|
#include <inttypes.h>
|
|
#include <libutil.h>
|
|
#include <machine/param.h>
|
|
#include <string.h>
|
|
|
|
#include "systat.h"
|
|
#include "extern.h"
|
|
|
|
void
|
|
sysputspaces(WINDOW *wd, int row, int col, int width)
|
|
{
|
|
static char str60[] = " "
|
|
" ";
|
|
|
|
mvwaddstr(wd, row, col, str60 + sizeof(str60) - width - 1);
|
|
}
|
|
|
|
void
|
|
sysputstrs(WINDOW *wd, int row, int col, int width)
|
|
{
|
|
static char str60[] = "********************"
|
|
"****************************************";
|
|
|
|
mvwaddstr(wnd, row, col, str60 + sizeof(str60) - width - 1);
|
|
}
|
|
|
|
void
|
|
sysputXs(WINDOW *wd, int row, int col, int width)
|
|
{
|
|
static char str60[] = "XXXXXXXXXXXXXXXXXXXX"
|
|
"XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX";
|
|
|
|
mvwaddstr(wnd, row, col, str60 + sizeof(str60) - 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);
|
|
}
|
|
|
|
void
|
|
sysputpage(WINDOW *wd, int row, int col, int width, uint64_t pages, int flags)
|
|
{
|
|
|
|
sysputuint64(wd, row, col, width, ptoa(pages), flags);
|
|
}
|