rtems/rtems-libbsd
1
0
Fork 0
mirror of https://git.rtems.org/rtems-libbsd/ synced 2025-10-18 15:42:15 +08:00
Code Issues Packages Projects Releases Wiki Activity

Update to FreeBSD head 2017-12-01

Browse Source 
Git mirror commit e724f51f811a4b2bd29447f8b85ab5c2f9b88266.

Update #3472.
This commit is contained in:
Sebastian Huber
2018-08-09 14:02:09 +02:00
parent e4a8065910
commit bb80d9df8b
1197 changed files with 6535 additions and 2527 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
freebsd/usr.bin/vmstat/vmstat.c
View File

@@ -1,6 +1,8 @@
#include <machine/rtems-bsd-user-space.h>
/*
/*-
* SPDX-License-Identifier: BSD-3-Clause
*
* Copyright (c) 1980, 1986, 1991, 1993
* The Regents of the University of California. All rights reserved.
*
@@ -719,7 +721,7 @@ getcpuinfo(u_long *maskp, int *maxidp)
static void
prthuman(const char *name, u_int64_t val, int size)
prthuman(const char *name, uint64_t val, int size)
{
char buf[10];
int flags;
@@ -871,22 +873,22 @@ dovmstat(unsigned int interval, int reps)
total.t_rq - 1, total.t_dw + total.t_pw, total.t_sw);
xo_close_container("processes");
xo_open_container("memory");
#define vmstat_pgtok(a) ((a) * (sum.v_page_size >> 10))
#define vmstat_pgtok(a) ((uintmax_t)(a) * (sum.v_page_size >> 10))
#define rate(x) (((x) * rate_adj + halfuptime) / uptime) /* round */
if (hflag) {
xo_emit("");
prthuman("available-memory",
total.t_avm * (u_int64_t)sum.v_page_size, 5);
total.t_avm * (uint64_t)sum.v_page_size, 5);
xo_emit(" ");
prthuman("free-memory",
total.t_free * (u_int64_t)sum.v_page_size, 5);
total.t_free * (uint64_t)sum.v_page_size, 5);
xo_emit(" ");
} else {
xo_emit(" ");
xo_emit("{:available-memory/%7d}",
xo_emit("{:available-memory/%7ju}",
vmstat_pgtok(total.t_avm));
xo_emit(" ");
xo_emit("{:free-memory/%7d}",
xo_emit("{:free-memory/%7ju}",
vmstat_pgtok(total.t_free));
xo_emit(" ");
}
@@ -1115,7 +1117,7 @@ dosum(void)
sum.v_vnodepgsin);
xo_emit("{:vnode-page-outs/%9u} {N:vnode pager pageouts}\n",
sum.v_vnodeout);
xo_emit("{:vnode-page-outs/%9u} {N:vnode pager pages paged out}\n",
xo_emit("{:vnode-page-out-pages/%9u} {N:vnode pager pages paged out}\n",
sum.v_vnodepgsout);
xo_emit("{:page-daemon-wakeups/%9u} {N:page daemon wakeups}\n",
sum.v_pdwakeups);
@@ -1618,9 +1620,9 @@ display_object(struct kinfo_vmobject *kvo)
const char *str;
xo_open_instance("object");
xo_emit("{:resident/%5jd} ", (uintmax_t)kvo->kvo_resident);
xo_emit("{:active/%5jd} ", (uintmax_t)kvo->kvo_active);
xo_emit("{:inactive/%5jd} ", (uintmax_t)kvo->kvo_inactive);
xo_emit("{:resident/%5ju} ", (uintmax_t)kvo->kvo_resident);
xo_emit("{:active/%5ju} ", (uintmax_t)kvo->kvo_active);
xo_emit("{:inactive/%5ju} ", (uintmax_t)kvo->kvo_inactive);
xo_emit("{:refcount/%3d} ", kvo->kvo_ref_count);
xo_emit("{:shadowcount/%3d} ", kvo->kvo_shadow_count);
switch (kvo->kvo_memattr) {