X-Git-Url: https://git.saurik.com/apple/xnu.git/blobdiff_plain/cf7d32b81c573a0536dc4da4157f9c26f8d0bed3..d41d1dae2cd00cc08c7982087d1c445180cad9f5:/osfmk/kern/processor.h?ds=inline

diff --git a/osfmk/kern/processor.h b/osfmk/kern/processor.h
index 5cb479cd1..342a90081 100644
--- a/osfmk/kern/processor.h
+++ b/osfmk/kern/processor.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000-2008 Apple Inc. All rights reserved.
+ * Copyright (c) 2000-2009 Apple Inc. All rights reserved.
  *
  * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
  * 
@@ -84,12 +84,14 @@
 struct processor_set {
 	queue_head_t		active_queue;	/* active processors */
 	queue_head_t		idle_queue;		/* idle processors */
-	int					idle_count;
 
-	processor_t			low_pri;
+	processor_t			low_pri, low_count;
 
 	int					processor_count;
 
+	int					cpu_set_low, cpu_set_hi;
+	int					cpu_set_count;
+
 	decl_simple_lock_data(,sched_lock)	/* lock for above */
 
 	struct ipc_port	*	pset_self;		/* port for operations */
@@ -114,7 +116,15 @@ extern struct pset_node	pset_node0;
 
 extern queue_head_t		tasks, threads;
 extern int				tasks_count, threads_count;
-decl_mutex_data(extern,tasks_threads_lock)
+decl_lck_mtx_data(extern,tasks_threads_lock)
+
+struct processor_meta {
+	queue_head_t		idle_queue;
+	processor_t			primary;
+};
+
+typedef struct processor_meta	*processor_meta_t;
+#define PROCESSOR_META_NULL		((processor_meta_t) 0)
 
 struct processor {
 	queue_chain_t		processor_queue;/* idle/active queue link,
@@ -128,6 +138,7 @@ struct processor {
 	processor_set_t		processor_set;	/* assigned set */
 
 	int					current_pri;	/* priority of current thread */
+	int					cpu_id;			/* platform numeric id */
 
 	timer_call_data_t	quantum_timer;	/* timer for quantum expiration */
 	uint64_t			quantum_end;	/* time when current quantum ends */
@@ -137,9 +148,9 @@ struct processor {
 	int					timeslice;		/* quanta before timeslice ends */
 
 	struct run_queue	runq;			/* runq for this processor */
+	processor_meta_t	processor_meta;
 
 	struct ipc_port *	processor_self;	/* port for operations */
-	decl_simple_lock_data(,lock)
 
 	processor_t			processor_list;	/* all existing processors */
 	processor_data_t	processor_data;	/* per-processor data */
@@ -149,7 +160,9 @@ extern processor_t		processor_list;
 extern unsigned int		processor_count;
 decl_simple_lock_data(extern,processor_list_lock)
 
-extern processor_t	master_processor;
+extern uint32_t			processor_avail_count;
+
+extern processor_t		master_processor;
 
 /*
  *	Processor state is accessed by locking the scheduling lock
@@ -158,9 +171,10 @@ extern processor_t	master_processor;
 #define PROCESSOR_OFF_LINE		0	/* Not available */
 #define PROCESSOR_SHUTDOWN		1	/* Going off-line */
 #define PROCESSOR_START			2	/* Being started */
-#define	PROCESSOR_IDLE			3	/* Idle */
-#define PROCESSOR_DISPATCHING	4	/* Dispatching (idle -> running) */
-#define	PROCESSOR_RUNNING		5	/* Normal execution */
+#define PROCESSOR_INACTIVE		3	/* Inactive (unavailable) */
+#define	PROCESSOR_IDLE			4	/* Idle (available) */
+#define PROCESSOR_DISPATCHING	5	/* Dispatching (idle -> active) */
+#define	PROCESSOR_RUNNING		6	/* Normal execution */
 
 extern processor_t	current_processor(void);
 
@@ -173,10 +187,6 @@ extern processor_t	cpu_to_processor(
 #define pset_unlock(p)			simple_unlock(&(p)->sched_lock)
 #define pset_lock_init(p)		simple_lock_init(&(p)->sched_lock, 0)
 
-#define processor_lock(p)		simple_lock(&(p)->lock)
-#define processor_unlock(p)		simple_unlock(&(p)->lock)
-#define processor_lock_init(p)	simple_lock_init(&(p)->lock, 0)
-
 /* Update hints */
 
 #define pset_pri_hint(ps, p, pri)		\
@@ -184,6 +194,20 @@ MACRO_BEGIN												\
 	if ((p) != (ps)->low_pri) {							\
 		if ((pri) < (ps)->low_pri->current_pri)			\
 			(ps)->low_pri = (p);						\
+		else											\
+		if ((ps)->low_pri->state < PROCESSOR_IDLE)		\
+			(ps)->low_pri = (p);						\
+	}													\
+MACRO_END
+
+#define pset_count_hint(ps, p, cnt)		\
+MACRO_BEGIN												\
+	if ((p) != (ps)->low_count) {						\
+		if ((cnt) < (ps)->low_count->runq.count)		\
+			(ps)->low_count = (p);						\
+		else											\
+		if ((ps)->low_count->state < PROCESSOR_IDLE)	\
+			(ps)->low_count = (p);						\
 	}													\
 MACRO_END
 
@@ -191,9 +215,13 @@ extern void		processor_bootstrap(void) __attribute__((section("__TEXT, initcode"
 
 extern void		processor_init(
 					processor_t		processor,
-					int				slot_num,
+					int				cpu_id,
 					processor_set_t	processor_set) __attribute__((section("__TEXT, initcode")));
 
+extern void		processor_meta_init(
+					processor_t		processor,
+					processor_t		primary);
+
 extern kern_return_t	processor_shutdown(
 							processor_t		processor);
 
@@ -219,6 +247,16 @@ extern kern_return_t	processor_info_count(
 #define pset_deallocate(x)
 #define pset_reference(x)
 
+extern void				machine_run_count(
+							uint32_t	count);
+
+extern boolean_t		machine_processor_is_inactive(
+							processor_t			processor);
+
+extern processor_t		machine_choose_processor(
+							processor_set_t		pset,
+							processor_t			processor);
+
 #else	/* MACH_KERNEL_PRIVATE */
 
 __BEGIN_DECLS
@@ -233,9 +271,4 @@ __END_DECLS
 
 #endif	/* MACH_KERNEL_PRIVATE */
 
-#ifdef	XNU_KERNEL_PRIVATE
-
-extern uint32_t		processor_avail_count;
-
-#endif
 #endif	/* _KERN_PROCESSOR_H_ */