xnu-792.6.56.tar.gz

[apple/xnu.git] / osfmk / kern / counters.c

diff --git a/osfmk/kern/counters.c b/osfmk/kern/counters.c
index 2b1fbf18fa41421d557ea003de8249a0f68e222e..bdf73a3ad24aac77699ab6cac48449104006b56a 100644 (file)
--- a/osfmk/kern/counters.c
+++ b/osfmk/kern/counters.c
@@ -1,10 +1,8 @@
 /*
 /*

- * Copyright (c) 2000 Apple Computer, Inc. All rights reserved.
+ * Copyright (c) 2000-2004 Apple Computer, Inc. All rights reserved.

  *
  * @APPLE_LICENSE_HEADER_START@
  * 
  *
  * @APPLE_LICENSE_HEADER_START@
  * 

- * Copyright (c) 1999-2003 Apple Computer, Inc.  All Rights Reserved.
- * 

  * This file contains Original Code and/or Modifications of Original Code
  * as defined in and that are subject to the Apple Public Source License
  * Version 2.0 (the 'License'). You may not use this file except in
  * This file contains Original Code and/or Modifications of Original Code
  * as defined in and that are subject to the Apple Public Source License
  * Version 2.0 (the 'License'). You may not use this file except in


@@ -25,73 +23,6 @@
 /*
  * @OSF_COPYRIGHT@
  */
 /*
  * @OSF_COPYRIGHT@
  */

-/*
- * HISTORY
- * 
- * Revision 1.1.1.1  1998/09/22 21:05:35  wsanchez
- * Import of Mac OS X kernel (~semeria)
- *
- * Revision 1.1.1.1  1998/03/07 02:25:54  wsanchez
- * Import of OSF Mach kernel (~mburg)
- *
- * Revision 1.1.13.7  1995/02/24  15:19:11  alanl
- *     Merge with DIPC2_SHARED.
- *     [1995/02/22  20:31:50  alanl]
- *
- * Revision 1.1.21.1  1994/11/04  10:06:28  dwm
- *     mk6 CR668 - 1.3b26 merge
- *     remove unused counters
- *     * Revision 1.1.2.4  1994/01/06  17:53:55  jeffc
- *     CR9854 -- Missing exception_raise_state counters
- *     CR10394 -- instrument vm_map_simplify
- *     * End1.3merge
- *     [1994/11/04  09:20:23  dwm]
- * 
- * Revision 1.1.13.5  1994/09/23  02:15:57  ezf
- *     change marker to not FREE
- *     [1994/09/22  21:32:09  ezf]
- * 
- * Revision 1.1.13.4  1994/09/16  06:29:22  dwm
- *     mk6 CR551 - remove unused SAFE_VM_FAULT pseudo-continuation,
- *     remove unused args from vm_page_wait, vm_fault(_page).
- *     Also, fix vm_page_wait counters.
- *     [1994/09/16  06:23:24  dwm]
- * 
- * Revision 1.1.13.3  1994/09/10  21:45:51  bolinger
- *     Merge up to NMK17.3
- *     [1994/09/08  19:57:27  bolinger]
- * 
- * Revision 1.1.13.2  1994/06/21  17:28:40  dlb
- *     Add two vm_fault counters from latest NMK17 version.
- *     [94/06/17            dlb]
- * 
- * Revision 1.1.13.1  1994/06/14  16:59:58  bolinger
- *     Merge up to NMK17.2.
- *     [1994/06/14  16:53:39  bolinger]
- * 
- * Revision 1.1.8.2  1994/03/17  22:40:02  dwm
- *     dead code removal:  thread swapping.
- *     [1994/03/17  21:29:18  dwm]
- * 
- * Revision 1.1.8.1  1993/11/18  18:14:54  dwm
- *     Coloc: remove continuations entirely;
- *     [1993/11/18  18:09:54  dwm]
- * 
- * Revision 1.1.2.3  1993/06/07  22:12:34  jeffc
- *     CR9176 - ANSI C violations: trailing tokens on CPP
- *     directives, extra semicolons after decl_ ..., asm keywords
- *     [1993/06/07  19:04:06  jeffc]
- * 
- * Revision 1.1.2.2  1993/06/02  23:35:48  jeffc
- *     Added to OSF/1 R1.3 from NMK15.0.
- *     [1993/06/02  21:12:06  jeffc]
- * 
- * Revision 1.1  1992/09/30  02:08:53  robert
- *     Initial revision
- * 
- * $EndLog$
- */
-/* CMU_HIST */

 /*
  * Revision 2.3  91/05/14  16:40:19  mrt
  *     Correcting copyright
 /*
  * Revision 2.3  91/05/14  16:40:19  mrt
  *     Correcting copyright


@@ -173,11 +104,9 @@ mach_counter_t c_thread_switch_block = 0;
 mach_counter_t c_thread_switch_handoff = 0;
 mach_counter_t c_vm_fault_page_block_backoff_kernel = 0;
 mach_counter_t c_vm_fault_page_block_busy_kernel = 0;
 mach_counter_t c_thread_switch_handoff = 0;
 mach_counter_t c_vm_fault_page_block_backoff_kernel = 0;
 mach_counter_t c_vm_fault_page_block_busy_kernel = 0;

-mach_counter_t c_vm_fault_retry_on_w_prot;
-mach_counter_t c_vm_fault_wait_on_unlock;
-mach_counter_t c_vm_map_simplified_lower = 0;
-mach_counter_t c_vm_map_simplified_upper = 0;
+mach_counter_t c_vm_map_simplified = 0;

 mach_counter_t c_vm_map_simplify_called = 0;
 mach_counter_t c_vm_map_simplify_called = 0;

+mach_counter_t c_vm_map_simplify_entry_called = 0;

 mach_counter_t c_vm_page_wait_block = 0;
 mach_counter_t c_vm_pageout_block = 0;
 mach_counter_t c_vm_pageout_scan_block = 0;
 mach_counter_t c_vm_page_wait_block = 0;
 mach_counter_t c_vm_pageout_block = 0;
 mach_counter_t c_vm_pageout_scan_block = 0;