X-Git-Url: https://git.saurik.com/apple/system_cmds.git/blobdiff_plain/2fc1e207eccd68aee093ed29dae719e77bac17dd..c40d5e067506b677a9941a31cf3fadf56025c9a7:/hostinfo.tproj/hostinfo.c

diff --git a/hostinfo.tproj/hostinfo.c b/hostinfo.tproj/hostinfo.c
index 86c4e42..1828583 100644
--- a/hostinfo.tproj/hostinfo.c
+++ b/hostinfo.tproj/hostinfo.c
@@ -1,8 +1,8 @@
 /*
- * Copyright (c) 1999 Apple Computer, Inc. All rights reserved.
+ * Copyright (c) 1999-2016 Apple Inc. All rights reserved.
  *
  * @APPLE_LICENSE_HEADER_START@
- * 
+ *
  * "Portions Copyright (c) 1999 Apple Computer, Inc.  All Rights
  * Reserved.  This file contains Original Code and/or Modifications of
  * Original Code as defined in and that are subject to the Apple Public
@@ -10,7 +10,7 @@
  * except in compliance with the License.  Please obtain a copy of the
  * License at http://www.apple.com/publicsource 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,
@@ -18,10 +18,10 @@
  * FITNESS FOR A PARTICULAR PURPOSE OR NON-INFRINGEMENT.  Please see the
  * License for the specific language governing rights and limitations
  * under the License."
- * 
+ *
  * @APPLE_LICENSE_HEADER_END@
  */
-/* 
+/*
  * Mach Operating System
  * Copyright (c) 1990 Carnegie-Mellon University
  * All rights reserved.  The CMU software License Agreement specifies
@@ -48,13 +48,13 @@ struct host_basic_info	hi;
 kernel_version_t	version;
 int			slots[1024];
 
-int main(int argc, char *argv[])
+int
+main(int argc, char *argv[])
 {
 	kern_return_t		ret;
-	int			size;
+	unsigned int		size, count;
 	char			*cpu_name, *cpu_subname;
-	int			i, count;
-	int 			mib[2];
+	int			mib[2];
 	size_t			len;
 	uint64_t		memsize;
 	processor_set_name_port_t		default_pset;
@@ -98,6 +98,19 @@ int main(int argc, char *argv[])
                 exit(EXIT_FAILURE);
 	}
 
+	unsigned int cpu_count = 0;
+	unsigned int data_count = 0;
+	struct processor_basic_info *processor_basic_infop = NULL;
+	ret = host_processor_info(host,
+	                          PROCESSOR_BASIC_INFO,
+	                          &cpu_count,
+	                          (processor_info_array_t *)&processor_basic_infop,
+	                          &data_count);
+	if (ret != KERN_SUCCESS) {
+		mach_error(argv[0], ret);
+		exit(EXIT_FAILURE);
+	}
+
 	mib[0] = CTL_HW;
 	mib[1] = HW_MEMSIZE;
 	len = sizeof(memsize);
@@ -108,22 +121,27 @@ int main(int argc, char *argv[])
 	    exit(EXIT_FAILURE);
 	}
 
-	
 	if (hi.max_cpus > 1)
 		printf("Kernel configured for up to %d processors.\n",
 			hi.max_cpus);
 	else
 		printf("Kernel configured for a single processor only.\n");
-	printf("%d processor%s physically available.\n", hi.avail_cpus,
-		(hi.avail_cpus > 1) ? "s are" : " is");
+	printf("%d processor%s physically available.\n", hi.physical_cpu,
+		(hi.physical_cpu > 1) ? "s are" : " is");
+
+	printf("%d processor%s logically available.\n", hi.logical_cpu,
+		(hi.logical_cpu > 1) ? "s are" : " is");
 
 	printf("Processor type:");
 	slot_name(hi.cpu_type, hi.cpu_subtype, &cpu_name, &cpu_subname);
 	printf(" %s (%s)\n", cpu_name, cpu_subname);
 
 	printf("Processor%s active:", (hi.avail_cpus > 1) ? "s" : "");
-	for (i = 0; i < hi.avail_cpus; i++) 
-		printf(" %d", i);
+	for (int i = 0; i < cpu_count; i++) {
+		if (processor_basic_infop[i].running) {
+			printf(" %d", i);
+		}
+	}
 	printf("\n");
 
 	if (((float)memsize / (1024.0 * 1024.0)) >= 1024.0)
@@ -132,7 +150,7 @@ int main(int argc, char *argv[])
 	else
 	    printf("Primary memory available: %.2f megabytes\n",
 	      (float)memsize/(1024.0*1024.0));
-	
+
 	printf("Default processor set: %d tasks, %d threads, %d processors\n",
 		load_info.task_count, load_info.thread_count, basic_info.processor_count);
 	printf("Load average: %d.%02d, Mach factor: %d.%02d\n",
@@ -143,4 +161,3 @@ int main(int argc, char *argv[])
 
 	exit(0);
 }
-