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
81 lines
3.2 KiB
C
81 lines
3.2 KiB
C
/*-
|
|
* SPDX-License-Identifier: BSD-3-Clause
|
|
*
|
|
* Copyright (c) 1980, 1989, 1992, 1993
|
|
* The Regents of the University of California. All rights reserved.
|
|
*
|
|
* 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.
|
|
*
|
|
* From: @(#)systat.h 8.1 (Berkeley) 6/6/93
|
|
* $FreeBSD$
|
|
*/
|
|
|
|
#include <sys/stdint.h>
|
|
#include <curses.h>
|
|
|
|
struct cmdtab {
|
|
const char *c_name; /* command name */
|
|
void (*c_refresh)(void); /* display refresh */
|
|
void (*c_fetch)(void); /* sets up data structures */
|
|
void (*c_label)(void); /* label display */
|
|
int (*c_init)(void); /* initialize namelist, etc. */
|
|
WINDOW *(*c_open)(void); /* open display */
|
|
void (*c_close)(WINDOW *); /* close display */
|
|
int (*c_cmd)(const char *, const char *); /* display command interpreter */
|
|
void (*c_reset)(void); /* reset ``mode since'' display */
|
|
char c_flags; /* see below */
|
|
};
|
|
|
|
/*
|
|
* If we are started with privileges, use a kmem interface for netstat handling,
|
|
* otherwise use sysctl.
|
|
* In case of many open sockets, the sysctl handling might become slow.
|
|
*/
|
|
extern int use_kvm;
|
|
|
|
#define CF_INIT 0x1 /* been initialized */
|
|
#define CF_LOADAV 0x2 /* display w/ load average */
|
|
#define CF_ZFSARC 0x4 /* display w/ ZFS cache usage */
|
|
|
|
#define TCP 0x1
|
|
#define UDP 0x2
|
|
|
|
#define MAINWIN_ROW 3 /* top row for the main/lower window */
|
|
|
|
#define GETSYSCTL(name, var) getsysctl(name, &(var), sizeof(var))
|
|
#define KREAD(addr, buf, len) kvm_ckread((addr), (buf), (len))
|
|
#define NVAL(indx) namelist[(indx)].n_value
|
|
#define NPTR(indx) (void *)NVAL((indx))
|
|
#define NREAD(indx, buf, len) kvm_ckread(NPTR((indx)), (buf), (len))
|
|
|
|
extern void putint(int, int, int, int);
|
|
extern void putfloat(double, int, int, int, int, int);
|
|
extern void putlongdouble(long double, int, int, int, int, int);
|
|
|
|
int procinit(void);
|
|
void procgetinfo(void);
|
|
void proclabel(int col);
|
|
void procshow(int col, int hight, uint64_t totalswappages);
|