Provide basic page cache statistics

* Makefrag.am (EXTRA_DIST): Add kern/gnumach.srv.
(include_mach_HEADERS): Add include/mach/gnumach.defs and
include/mach/vm_cache_statistics.h
(nodist_libkernel_a_SOURCES): Add kern/gnumach.server.defs.c,
kern/gnumach.server.h, kern/gnumach.server.c, kern/gnumach.server.msgids,
kern/gnumach.server.defs.
* include/mach/mach_types.h: Add #include <mach/vm_cache_statistics.h>.
* kern/ipc_kobject.c (ipc_kobject_server): Declare and call
gnumach_server_routine.
* vm/vm_object.c (vm_object_cached_pages): New variable.
(vm_object_cached_pages_lock_data): Likewise.
(vm_object_deallocate): Update number of cached pages.
(vm_object_lookup): Likewise.
(vm_object_lookup_name): Likewise.
(vm_object_destroy): Likewise.
(vm_object_enter): Likewise.
* vm/vm_object.h (ref_count): Declare as int.
(resident_page_count): Likewise.
(vm_object_cached_count): Add extern declaration.
(vm_object_cached_pages): Likewise.
(vm_object_cached_pages_lock_data): Likewise.
(vm_object_cached_pages_update): New macro.
* vm/vm_resident.c (vm_page_insert): Assert resident page count doesn't
overflow, update number of cached pages as appropriate.
(vm_page_replace): Likewise.
(vm_page_remove): Update number of cached pages as appropriate.
* vm/vm_user.c: Add #include <mach/vm_cache_statistics.h>.
(vm_cache_statistics): New function.
* vm/vm_user.h: Add #include <mach/mach_types.h>.
(vm_cache_statistics): New declaration.
* include/mach/gnumach.defs: New file.

1 files changed, 14 insertions, 0 deletions

diff --git a/vm/vm_object.c b/vm/vm_object.c
index f101708..7eae3d7 100644
--- a/vm/vm_object.c
+++ b/vm/vm_object.c
@@ -192,6 +192,15 @@ decl_simple_lock_data(,vm_object_cached_lock_data)
 		simple_unlock(&vm_object_cached_lock_data)
 
 /*
+ *	Number of physical pages referenced by cached objects.
+ *	This counter is protected by its own lock to work around
+ *	lock ordering issues.
+ */
+int		vm_object_cached_pages;
+
+decl_simple_lock_data(,vm_object_cached_pages_lock_data)
+
+/*
  *	Virtual memory objects are initialized from
  *	a template (see vm_object_allocate).
  *
@@ -410,6 +419,7 @@ void vm_object_deallocate(
 			queue_enter(&vm_object_cached_list, object,
 				vm_object_t, cached_list);
 			overflow = (++vm_object_cached_count > vm_object_cached_max);
+			vm_object_cached_pages_update(object->resident_page_count);
 			vm_object_cache_unlock();
 
 			vm_object_deactivate_pages(object);
@@ -1860,6 +1870,7 @@ vm_object_t vm_object_lookup(
 				queue_remove(&vm_object_cached_list, object,
 					     vm_object_t, cached_list);
 				vm_object_cached_count--;
+				vm_object_cached_pages_update(-object->resident_page_count);
 			}
 
 			object->ref_count++;
@@ -1891,6 +1902,7 @@ vm_object_t vm_object_lookup_name(
 				queue_remove(&vm_object_cached_list, object,
 					     vm_object_t, cached_list);
 				vm_object_cached_count--;
+				vm_object_cached_pages_update(-object->resident_page_count);
 			}
 
 			object->ref_count++;
@@ -1927,6 +1939,7 @@ void vm_object_destroy(
 		queue_remove(&vm_object_cached_list, object,
 				vm_object_t, cached_list);
 		vm_object_cached_count--;
+		vm_object_cached_pages_update(-object->resident_page_count);
 	}
 	object->ref_count++;
 
@@ -2080,6 +2093,7 @@ restart:
 			queue_remove(&vm_object_cached_list, object,
 					vm_object_t, cached_list);
 			vm_object_cached_count--;
+			vm_object_cached_pages_update(-object->resident_page_count);
 		}
 		object->ref_count++;
 		vm_object_unlock(object);