xnu-1228.15.4.tar.gz

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

diff --git a/osfmk/mach/host_info.h b/osfmk/mach/host_info.h
index 9cd243a215ce7342ba30d9a4062d40c71de29c7a..003f75101a07029b312115d3c2f5e52016337e56 100644 (file)
--- a/osfmk/mach/host_info.h
+++ b/osfmk/mach/host_info.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000-2005 Apple Computer, Inc. All rights reserved.
+ * Copyright (c) 2000-2006 Apple Computer, Inc. All rights reserved.
  *
  * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
  * 
@@ -102,7 +102,7 @@ typedef     integer_t       host_flavor_t;
 #ifdef MACH_KERNEL_PRIVATE
 struct host_basic_info_old {
        integer_t       max_cpus;       /* max number of cpus possible */
-       integer_t       avail_cpus;     /* number of cpus now available */
+       uint32_t        avail_cpus;     /* number of cpus now available */
        natural_t       memory_size;    /* size of memory in bytes */
        cpu_type_t      cpu_type;       /* cpu type */
        cpu_subtype_t   cpu_subtype;    /* cpu subtype */
@@ -114,9 +114,7 @@ typedef struct host_basic_info_old  *host_basic_info_old_t;
                (sizeof(host_basic_info_data_old_t)/sizeof(integer_t)))
 #endif
 
-#if __DARWIN_ALIGN_POWER
-#pragma options align=power
-#endif
+#pragma pack(4)
 
 struct host_basic_info {
        integer_t               max_cpus;               /* max number of CPUs possible */
@@ -132,9 +130,7 @@ struct host_basic_info {
        uint64_t                max_mem;                /* actual size of physical memory */
 };
 
-#if __DARWIN_ALIGN_POWER
-#pragma options align=reset
-#endif
+#pragma pack()
 
 typedef        struct host_basic_info  host_basic_info_data_t;
 typedef struct host_basic_info *host_basic_info_t;
@@ -198,8 +194,17 @@ typedef struct host_load_info      *host_load_info_t;
 /* in <mach/vm_statistics.h> */
 #define        HOST_VM_INFO_COUNT ((mach_msg_type_number_t) \
                (sizeof(vm_statistics_data_t)/sizeof(integer_t)))
-#define        HOST_VM_INFO_REV0_COUNT ((mach_msg_type_number_t) \
-               (sizeof(vm_statistics_rev0_data_t)/sizeof(integer_t)))
+
+/* size of the latest version of the structure */
+#define HOST_VM_INFO_LATEST_COUNT HOST_VM_INFO_COUNT
+#define HOST_VM_INFO_REV2_COUNT        HOST_VM_INFO_LATEST_COUNT
+/* previous versions: adjust the size according to what was added each time */
+#define        HOST_VM_INFO_REV1_COUNT /* added "speculative_count" (1 int) */ \
+       ((mach_msg_type_number_t) \
+        (HOST_VM_INFO_REV2_COUNT - 1))
+#define        HOST_VM_INFO_REV0_COUNT /* added "purgable" info (2 ints) */    \
+       ((mach_msg_type_number_t) \
+        (HOST_VM_INFO_REV1_COUNT - 2))
 
 struct host_cpu_load_info {            /* number of ticks while running... */
        natural_t       cpu_ticks[CPU_STATE_MAX]; /* ... in the given mode */