D53008.id163879.diff
No OneTemporary
Actions

Size

1 KB

Referenced Files

None

Subscribers

None

D53008.id163879.diff
View Options

	diff --git a/sys/sys/user.h b/sys/sys/user.h
	--- a/sys/sys/user.h
	+++ b/sys/sys/user.h
	@@ -617,7 +617,8 @@
	} kvo_type_spec; /* Type-specific union */
	uint64_t kvo_me; /* Uniq handle for anon obj */
	uint64_t kvo_laundry; /* Number of laundry pages. */
	- uint64_t _kvo_qspare[5];
	+ uint64_t kvo_wired; /* Number of wired pages. */
	+ uint64_t _kvo_qspare[4];
	uint32_t kvo_swapped; /* Number of swapped pages */
	uint32_t kvo_flags;
	uint32_t _kvo_ispare[6];
	diff --git a/sys/vm/vm_object.c b/sys/vm/vm_object.c
	--- a/sys/vm/vm_object.c
	+++ b/sys/vm/vm_object.c
	@@ -2547,6 +2547,9 @@
	kvo->kvo_inactive++;
	else if (vm_page_in_laundry(m))
	kvo->kvo_laundry++;
	+
	+ if (vm_page_wired(m))
	+ kvo->kvo_wired++;
	}
	}

	diff --git a/usr.bin/vmstat/vmstat.c b/usr.bin/vmstat/vmstat.c
	--- a/usr.bin/vmstat/vmstat.c
	+++ b/usr.bin/vmstat/vmstat.c
	@@ -1465,6 +1465,7 @@
	xo_emit("{:active/%5ju} ", (uintmax_t)kvo->kvo_active);
	xo_emit("{:inactive/%5ju} ", (uintmax_t)kvo->kvo_inactive);
	xo_emit("{:laundry/%5ju} ", (uintmax_t)kvo->kvo_laundry);
	+ xo_emit("{:wired/%5ju} ", (uintmax_t)kvo->kvo_wired);
	xo_emit("{:refcount/%3d} ", kvo->kvo_ref_count);
	xo_emit("{:shadowcount/%3d} ", kvo->kvo_shadow_count);

	@@ -1568,7 +1569,8 @@
	return;
	}
	xo_emit("{T:RES/%5s} {T:ACT/%5s} {T:INACT/%5s} {T:LAUND/%5s} "
	- "{T:REF/%3s} {T:SHD/%3s} {T:CM/%2s} {T:TP/%3s} {T:PATH/%s}\n");
	+ "{T:WIRED/%5s} {T:REF/%3s} {T:SHD/%3s} {T:CM/%2s} {T:TP/%3s} "
	+ "{T:PATH/%s}\n");
	xo_open_list("object");
	for (i = 0; i < cnt; i++)
	display_object(&kvo[i]);