xnu-1228.tar.gz

[apple/xnu.git] / osfmk / mach / processor_info.h

diff --git a/osfmk/mach/processor_info.h b/osfmk/mach/processor_info.h
index 8ab6322eb4450a896d7ef9f08e71f9e7f56f0258..bd1f7405602e69098ce7be9995ccae2468536005 100644 (file)
--- a/osfmk/mach/processor_info.h
+++ b/osfmk/mach/processor_info.h
@@ -1,16 +1,19 @@
 /*
- * Copyright (c) 2000 Apple Computer, Inc. All rights reserved.
+ * Copyright (c) 2000-2005 Apple Computer, Inc. All rights reserved.
  *
- * @APPLE_LICENSE_HEADER_START@
- * 
- * Copyright (c) 1999-2003 Apple Computer, Inc.  All Rights Reserved.
+ * @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
@@ -20,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@
  */
 /*
  * @OSF_COPYRIGHT@
@@ -64,6 +67,7 @@
 #ifndef        _MACH_PROCESSOR_INFO_H_
 #define _MACH_PROCESSOR_INFO_H_
 
+#include <mach/message.h>
 #include <mach/machine.h>
 #include <mach/machine/processor_info.h>
 
@@ -101,17 +105,17 @@ struct processor_basic_info {
 
 typedef        struct processor_basic_info     processor_basic_info_data_t;
 typedef struct processor_basic_info    *processor_basic_info_t;
-#define PROCESSOR_BASIC_INFO_COUNT \
-               (sizeof(processor_basic_info_data_t)/sizeof(natural_t))
+#define PROCESSOR_BASIC_INFO_COUNT     ((mach_msg_type_number_t) \
+               (sizeof(processor_basic_info_data_t)/sizeof(natural_t)))
 
 struct processor_cpu_load_info {             /* number of ticks while running... */
-        unsigned long   cpu_ticks[CPU_STATE_MAX]; /* ... in the given mode */
+        unsigned int   cpu_ticks[CPU_STATE_MAX]; /* ... in the given mode */
 }; 
 
 typedef        struct processor_cpu_load_info  processor_cpu_load_info_data_t;
 typedef struct processor_cpu_load_info *processor_cpu_load_info_t;
-#define PROCESSOR_CPU_LOAD_INFO_COUNT \
-               (sizeof(processor_cpu_load_info_data_t)/sizeof(natural_t))
+#define PROCESSOR_CPU_LOAD_INFO_COUNT  ((mach_msg_type_number_t) \
+               (sizeof(processor_cpu_load_info_data_t)/sizeof(natural_t)))
 
 /*
  *     Scaling factor for load_average, mach_factor.
@@ -128,8 +132,8 @@ struct processor_set_basic_info {
 
 typedef        struct processor_set_basic_info processor_set_basic_info_data_t;
 typedef struct processor_set_basic_info        *processor_set_basic_info_t;
-#define PROCESSOR_SET_BASIC_INFO_COUNT \
-               (sizeof(processor_set_basic_info_data_t)/sizeof(natural_t))
+#define PROCESSOR_SET_BASIC_INFO_COUNT ((mach_msg_type_number_t) \
+               (sizeof(processor_set_basic_info_data_t)/sizeof(natural_t)))
 
 #define PROCESSOR_SET_LOAD_INFO                4       /* scheduling statistics */
 
@@ -142,16 +146,14 @@ struct processor_set_load_info {
 
 typedef struct processor_set_load_info processor_set_load_info_data_t;
 typedef struct processor_set_load_info *processor_set_load_info_t;
-#define PROCESSOR_SET_LOAD_INFO_COUNT  \
-                (sizeof(processor_set_load_info_data_t)/sizeof(natural_t))
+#define PROCESSOR_SET_LOAD_INFO_COUNT  ((mach_msg_type_number_t) \
+                (sizeof(processor_set_load_info_data_t)/sizeof(natural_t)))
 
+#ifdef PRIVATE
 
-/*
- *      New scheduling control interface
- */
 #define PROCESSOR_SET_ENABLED_POLICIES                   3
-#define PROCESSOR_SET_ENABLED_POLICIES_COUNT   \
-               (sizeof(policy_t)/sizeof(natural_t))
+#define PROCESSOR_SET_ENABLED_POLICIES_COUNT ((mach_msg_type_number_t) \
+               (sizeof(policy_t)/sizeof(natural_t)))
 
 #define PROCESSOR_SET_TIMESHARE_DEFAULT                 10
 #define PROCESSOR_SET_TIMESHARE_LIMITS                  11
@@ -162,4 +164,6 @@ typedef struct processor_set_load_info *processor_set_load_info_t;
 #define PROCESSOR_SET_FIFO_DEFAULT                      30
 #define PROCESSOR_SET_FIFO_LIMITS                       31
 
+#endif /* PRIVATE */
+
 #endif /* _MACH_PROCESSOR_INFO_H_ */