xnu-1228.tar.gz

[apple/xnu.git] / osfmk / chud / chud_cpu.c

diff --git a/osfmk/chud/chud_cpu.c b/osfmk/chud/chud_cpu.c
index 4b7f8bdb7093423f4958151d8df04db20988619b..9652dcf92897a66b99f9a35e0ba5dd4c9d597ef1 100644 (file)
--- a/osfmk/chud/chud_cpu.c
+++ b/osfmk/chud/chud_cpu.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003-2004 Apple Computer, Inc. All rights reserved.
+ * Copyright (c) 2003-2007 Apple Inc. All rights reserved.
  *
  * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
  * 
@@ -25,32 +25,25 @@
  * 
  * @APPLE_OSREFERENCE_LICENSE_HEADER_END@
  */
+
+
 #include <mach/mach_types.h>
 #include <mach/mach_host.h>
 
 #include <kern/host.h>
 #include <kern/processor.h>
 #include <kern/cpu_data.h>
-
+#include <kern/machine.h>
 #include <machine/machine_routines.h>
 
 #include <chud/chud_xnu.h>
 
 #pragma mark **** cpu count ****
 
-__private_extern__ int
-chudxnu_avail_cpu_count(void)
+__private_extern__ int 
+chudxnu_logical_cpu_count(void)
 {
-    host_basic_info_data_t hinfo;
-    kern_return_t kr;
-    mach_msg_type_number_t count = HOST_BASIC_INFO_COUNT;
-
-    kr = host_info(host_self(), HOST_BASIC_INFO, (integer_t *)&hinfo, &count);
-    if(kr == KERN_SUCCESS) {
-        return hinfo.avail_cpus;
-    } else {
-        return 0;
-    }
+       return machine_info.logical_cpu_max;
 }
 
 __private_extern__ int
@@ -64,29 +57,16 @@ chudxnu_phys_cpu_count(void)
     if(kr == KERN_SUCCESS) {
         return hinfo.max_cpus;
     } else {
-        return 0;
+        return 1;  // fall back to 1, 0 doesn't make sense at all
     }
 }
 
-__private_extern__
-int chudxnu_cpu_number(void)
+__private_extern__ int
+chudxnu_cpu_number(void)
 {
     return cpu_number();
 }
 
-#pragma mark **** branch trace buffer ****
-
-extern int pc_trace_buf[1024];
-
-__private_extern__ uint32_t *
-chudxnu_get_branch_trace_buffer(uint32_t *entries)
-{
-    if(entries) {
-        *entries = sizeof(pc_trace_buf)/sizeof(int);
-    }
-    return pc_trace_buf;
-}
-
 #pragma mark **** interrupts enable/disable ****
 
 __private_extern__ boolean_t
@@ -132,3 +112,13 @@ chudxnu_get_preemption_level(void)
 {
        return get_preemption_level();
 }
+
+#pragma mark *** deprecated ***
+
+//DEPRECATED
+__private_extern__ int
+chudxnu_avail_cpu_count(void)
+{
+       return machine_info.logical_cpu;
+}
+