xnu-6153.121.1.tar.gz

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

diff --git a/osfmk/kern/counters.h b/osfmk/kern/counters.h
index 2b4a3d5638d409d156d7c9357355737c67f063e9..e0f9aaea6a87eb676b1d7cdc82415073448f80d2 100644 (file)
--- a/osfmk/kern/counters.h
+++ b/osfmk/kern/counters.h
@@ -1,8 +1,8 @@
 /*
 /*

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

  *
  * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
  *
  * @APPLE_OSREFERENCE_LICENSE_HEADER_START@

- * 
+ *

  * 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


@@ -11,10 +11,10 @@
  * unlawful or unlicensed copies of an Apple operating system, or to
  * circumvent, violate, or enable the circumvention or violation of, any
  * terms of an Apple operating system software license agreement.
  * unlawful or unlicensed copies of an Apple operating system, or to
  * circumvent, violate, or enable the circumvention or violation of, any
  * terms of an Apple operating system software license agreement.

- * 
+ *

  * Please obtain a copy of the License at
  * http://www.opensource.apple.com/apsl/ and read it before using this file.
  * Please obtain a copy of the License at
  * http://www.opensource.apple.com/apsl/ and read it before using this file.

- * 
+ *

  * The Original Code and all software distributed under the License are
  * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
  * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
  * The Original Code and all software distributed under the License are
  * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
  * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,


@@ -22,42 +22,42 @@
  * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
  * Please see the License for the specific language governing rights and
  * limitations under the License.
  * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
  * Please see the License for the specific language governing rights and
  * limitations under the License.

- * 
+ *

  * @APPLE_OSREFERENCE_LICENSE_HEADER_END@
  */
 /*
  * @OSF_COPYRIGHT@
  */
  * @APPLE_OSREFERENCE_LICENSE_HEADER_END@
  */
 /*
  * @OSF_COPYRIGHT@
  */

-/* 
+/*

  * Mach Operating System
  * Copyright (c) 1991,1990,1989,1988,1987 Carnegie Mellon University
  * All Rights Reserved.
  * Mach Operating System
  * Copyright (c) 1991,1990,1989,1988,1987 Carnegie Mellon University
  * All Rights Reserved.

- * 
+ *

  * Permission to use, copy, modify and distribute this software and its
  * documentation is hereby granted, provided that both the copyright
  * notice and this permission notice appear in all copies of the
  * software, derivative works or modified versions, and any portions
  * thereof, and that both notices appear in supporting documentation.
  * Permission to use, copy, modify and distribute this software and its
  * documentation is hereby granted, provided that both the copyright
  * notice and this permission notice appear in all copies of the
  * software, derivative works or modified versions, and any portions
  * thereof, and that both notices appear in supporting documentation.

- * 
+ *

  * CARNEGIE MELLON ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
  * CONDITION.  CARNEGIE MELLON DISCLAIMS ANY LIABILITY OF ANY KIND FOR
  * ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
  * CARNEGIE MELLON ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
  * CONDITION.  CARNEGIE MELLON DISCLAIMS ANY LIABILITY OF ANY KIND FOR
  * ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.

- * 
+ *

  * Carnegie Mellon requests users of this software to return to
  * Carnegie Mellon requests users of this software to return to

- * 
+ *

  *  Software Distribution Coordinator  or  Software.Distribution@CS.CMU.EDU
  *  School of Computer Science
  *  Carnegie Mellon University
  *  Pittsburgh PA 15213-3890
  *  Software Distribution Coordinator  or  Software.Distribution@CS.CMU.EDU
  *  School of Computer Science
  *  Carnegie Mellon University
  *  Pittsburgh PA 15213-3890

- * 
+ *

  * any improvements or extensions that they make and grant Carnegie Mellon
  * the rights to redistribute these changes.
  */
 /*
  */
 
  * any improvements or extensions that they make and grant Carnegie Mellon
  * the rights to redistribute these changes.
  */
 /*
  */
 

-#ifndef        _KERN_COUNTERS_
-#define        _KERN_COUNTERS_
+#ifndef _KERN_COUNTERS_
+#define _KERN_COUNTERS_

 
 #include <mach_counters.h>
 
 
 #include <mach_counters.h>
 


@@ -69,17 +69,17 @@
  *     Use counter_always() for non-conditional counters.
  */
 
  *     Use counter_always() for non-conditional counters.
  */
 

-#define counter_always(code)   code
+#define counter_always(code)    code

 
 

-#if    MACH_COUNTERS
+#if     MACH_COUNTERS

 
 

-#define counter(code)          counter_always(code)
+#define counter(code)           counter_always(code)

 
 

-#else  /* MACH_COUNTERS */
+#else   /* MACH_COUNTERS */

 
 #define counter(code)
 
 
 #define counter(code)
 

-#endif /* MACH_COUNTERS */
+#endif  /* MACH_COUNTERS */

 
 /*
  *     We define the counters with individual integers,
 
 /*
  *     We define the counters with individual integers,


@@ -89,23 +89,14 @@
 
 typedef unsigned int mach_counter_t;
 
 
 typedef unsigned int mach_counter_t;
 

-extern mach_counter_t c_thread_invoke_csw;
-extern mach_counter_t c_thread_invoke_same;
-extern mach_counter_t c_thread_invoke_same_cont;
-extern mach_counter_t c_thread_invoke_misses;
-extern mach_counter_t c_thread_invoke_hits;
-extern mach_counter_t c_incoming_interrupts;
-extern mach_counter_t c_syscalls_unix;
-extern mach_counter_t c_syscalls_mach;
-
-#if    MACH_COUNTERS
+#if     MACH_COUNTERS

 extern mach_counter_t c_action_thread_block;
 extern mach_counter_t c_ast_taken_block;
 extern mach_counter_t c_action_thread_block;
 extern mach_counter_t c_ast_taken_block;

-extern mach_counter_t c_clock_ticks;

 extern mach_counter_t c_dev_io_blocks;
 extern mach_counter_t c_dev_io_tries;
 extern mach_counter_t c_idle_thread_block;
 extern mach_counter_t c_idle_thread_handoff;
 extern mach_counter_t c_dev_io_blocks;
 extern mach_counter_t c_dev_io_tries;
 extern mach_counter_t c_idle_thread_block;
 extern mach_counter_t c_idle_thread_handoff;

+extern mach_counter_t c_incoming_interrupts;

 extern mach_counter_t c_io_done_thread_block;
 extern mach_counter_t c_ipc_mqueue_receive_block_kernel;
 extern mach_counter_t c_ipc_mqueue_receive_block_user;
 extern mach_counter_t c_io_done_thread_block;
 extern mach_counter_t c_ipc_mqueue_receive_block_kernel;
 extern mach_counter_t c_ipc_mqueue_receive_block_user;


@@ -118,6 +109,13 @@ extern mach_counter_t c_stacks_max;
 extern mach_counter_t c_stacks_min;
 extern mach_counter_t c_swtch_block;
 extern mach_counter_t c_swtch_pri_block;
 extern mach_counter_t c_stacks_min;
 extern mach_counter_t c_swtch_block;
 extern mach_counter_t c_swtch_pri_block;

+extern mach_counter_t c_syscalls_unix;
+extern mach_counter_t c_syscalls_mach;
+extern mach_counter_t c_thread_invoke_csw;
+extern mach_counter_t c_thread_invoke_same;
+extern mach_counter_t c_thread_invoke_same_cont;
+extern mach_counter_t c_thread_invoke_misses;
+extern mach_counter_t c_thread_invoke_hits;

 extern mach_counter_t c_thread_switch_block;
 extern mach_counter_t c_thread_switch_handoff;
 extern mach_counter_t c_vm_fault_page_block_backoff_kernel;
 extern mach_counter_t c_thread_switch_block;
 extern mach_counter_t c_thread_switch_handoff;
 extern mach_counter_t c_vm_fault_page_block_backoff_kernel;


@@ -130,7 +128,6 @@ extern mach_counter_t c_vm_map_simplify_entry_called;
 extern mach_counter_t c_vm_page_wait_block;
 extern mach_counter_t c_vm_pageout_block;
 extern mach_counter_t c_vm_pageout_scan_block;
 extern mach_counter_t c_vm_page_wait_block;
 extern mach_counter_t c_vm_pageout_block;
 extern mach_counter_t c_vm_pageout_scan_block;

-#endif /* MACH_COUNTERS */
-
-#endif /* _KERN_COUNTERS_ */
+#endif  /* MACH_COUNTERS */

 
 

+#endif  /* _KERN_COUNTERS_ */