xnu-1486.2.11.tar.gz

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

diff --git a/osfmk/kern/processor_data.h b/osfmk/kern/processor_data.h
index c497974a8052f1e0d02467a52f2d4762d6e73ea7..200ec35f3a6681406f88f35471f48e614c010b2f 100644 (file)
--- a/osfmk/kern/processor_data.h
+++ b/osfmk/kern/processor_data.h
@@ -1,14 +1,19 @@
 /*
- * Copyright (c) 2003 Apple Computer, Inc. All rights reserved.
+ * Copyright (c) 2003-2009 Apple Inc. All rights reserved.
  *
- * @APPLE_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
- * compliance with the License. Please obtain a copy of the License at
- * http://www.opensource.apple.com/apsl/ and read it before using this
- * file.
+ * compliance with the License. The rights granted to you under the License
+ * may not be used to create, or enable the creation or redistribution of,
+ * 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.
  * 
  * The Original Code and all software distributed under the License are
  * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
@@ -18,7 +23,7 @@
  * Please see the License for the specific language governing rights and
  * limitations under the License.
  * 
- * @APPLE_LICENSE_HEADER_END@
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_END@
  */
 /*
  * Machine independent per processor data.
@@ -38,13 +43,15 @@
 
 struct processor_data {
        /* Processor state statistics */
-       integer_t                               cpu_ticks[CPU_STATE_MAX];
+       timer_data_t                    idle_state;
+       timer_data_t                    system_state;
+       timer_data_t                    user_state;
+
+       timer_t                                 current_state;
 
-#if !STAT_TIME
-       /* Current execution timer */
-       timer_t                                 current_timer;
-       timer_data_t                    offline_timer;
-#endif /* STAT_TIME */
+       /* Thread execution timers */
+       timer_t                                 thread_timer;
+       timer_t                                 kernel_timer;
 
        /* Kernel stack cache */
        struct stack_cache {
@@ -52,11 +59,8 @@ struct processor_data {
                unsigned int                    count;
        }                                               stack_cache;
 
-       /* Pending timer callouts */
-       queue_head_t                    timer_call_queue;
-
        /* VM event counters */
-       vm_statistics_data_t    vm_stat;
+       vm_statistics64_data_t  vm_stat;
 
        /* IPC free message cache */
        struct ikm_cache {
@@ -65,7 +69,9 @@ struct processor_data {
                unsigned int                    avail;
        }                                               ikm_cache;
 
-       int                                             slot_num;
+       unsigned long                   page_grab_count;
+       int                                             start_color;
+       void                                    *free_pages;
 };
 
 typedef struct processor_data  processor_data_t;