X-Git-Url: https://git.saurik.com/apple/xnu.git/blobdiff_plain/d7e50217d7adf6e52786a38bcaa4cd698cb9a79e..b0d623f7f2ae71ed96e60569f61f9a9a27016e80:/osfmk/ddb/db_task_thread.c?ds=sidebyside

diff --git a/osfmk/ddb/db_task_thread.c b/osfmk/ddb/db_task_thread.c
index e01b03f2f..7e7420c14 100644
--- a/osfmk/ddb/db_task_thread.c
+++ b/osfmk/ddb/db_task_thread.c
@@ -1,16 +1,19 @@
 /*
- * Copyright (c) 2000 Apple Computer, Inc. All rights reserved.
+ * Copyright (c) 2000-2007 Apple 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@
@@ -72,8 +75,8 @@
 #define DB_MAX_THREADID	0x10000		/* max # of threads in a task */
 #define DB_MAX_PSETS	0x10000		/* max # of processor sets */
 
-task_t		db_default_task;	/* default target task */
-thread_act_t	db_default_act;		/* default target thr_act */
+task_t		db_default_task = TASK_NULL;	/* default target task */
+thread_t	db_default_act = THREAD_NULL;		/* default target thr_act */
 
 
 
@@ -81,7 +84,7 @@ thread_act_t	db_default_act;		/* default target thr_act */
  */
 task_t db_lookup_task_id(register int task_id);
 
-static thread_act_t db_lookup_act_id(
+static thread_t db_lookup_act_id(
 	task_t	 task,
 	register int thread_id);
 
@@ -95,15 +98,11 @@ db_lookup_task(task_t target_task)
 {
 	register task_t task;
 	register int task_id;
-	register processor_set_t pset = &default_pset;
-	register int npset = 0;
 
 	task_id = 0;
-	if (npset++ >= DB_MAX_PSETS)
-		return(-1);
-	if (queue_first(&pset->tasks) == 0)
+	if (queue_first(&tasks) == 0)
 		return(-1);
-	queue_iterate(&pset->tasks, task, task_t, pset_tasks) {
+	queue_iterate(&tasks, task, task_t, tasks) {
 		if (target_task == task)
 		    return(task_id);
 		if (task_id++ >= DB_MAX_TASKID)
@@ -118,15 +117,15 @@ db_lookup_task(task_t target_task)
 int
 db_lookup_task_act(
 	task_t		task,
-	thread_act_t	target_act)
+	thread_t	target_act)
 {
-	register thread_act_t thr_act;
+	register thread_t thr_act;
 	register int act_id;
 
 	act_id = 0;
-	if (queue_first(&task->thr_acts) == 0)
+	if (queue_first(&task->threads) == 0)
 	    return(-1);
-	queue_iterate(&task->thr_acts, thr_act, thread_act_t, thr_acts) {
+	queue_iterate(&task->threads, thr_act, thread_t, task_threads) {
 	    if (target_act == thr_act)
 		return(act_id);
 	    if (act_id++ >= DB_MAX_THREADID)
@@ -140,22 +139,18 @@ db_lookup_task_act(
  * as the thread id.
  */
 int
-db_lookup_act(thread_act_t target_act)
+db_lookup_act(thread_t target_act)
 {
 	register int act_id;
 	register task_t task;
-	register processor_set_t pset = &default_pset;
 	register int ntask = 0;
-	register int npset = 0;
 
-	if (npset++ >= DB_MAX_PSETS)
+	if (queue_first(&tasks) == 0)
 		return(-1);
-	if (queue_first(&pset->tasks) == 0)
-		return(-1);
-	queue_iterate(&pset->tasks, task, task_t, pset_tasks) {
+	queue_iterate(&tasks, task, task_t, tasks) {
 		if (ntask++ > DB_MAX_TASKID)
 		    return(-1);
-		if (task->thr_act_count == 0)
+		if (task->thread_count == 0)
 		    continue;
 		act_id = db_lookup_task_act(task, target_act);
 		if (act_id >= 0)
@@ -169,7 +164,7 @@ db_lookup_act(thread_act_t target_act)
  */
 int force_act_lookup = 0;
 boolean_t
-db_check_act_address_valid(thread_act_t thr_act)
+db_check_act_address_valid(thread_t thr_act)
 {
 	if (!force_act_lookup && db_lookup_act(thr_act) < 0) {
 	    db_printf("Bad thr_act address 0x%x\n", thr_act);
@@ -183,19 +178,15 @@ db_check_act_address_valid(thread_act_t thr_act)
  * convert task_id(queue postion) to task address
  */
 task_t
-db_lookup_task_id(register task_id)
+db_lookup_task_id(int task_id)
 {
 	register task_t task;
-	register processor_set_t pset = &default_pset;
-	register int npset = 0;
 
 	if (task_id > DB_MAX_TASKID)
 	    return(TASK_NULL);
-	if (npset++ >= DB_MAX_PSETS)
-		return(TASK_NULL);
-	if (queue_first(&pset->tasks) == 0)
+	if (queue_first(&tasks) == 0)
 		return(TASK_NULL);
-	queue_iterate(&pset->tasks, task, task_t, pset_tasks) {
+	queue_iterate(&tasks, task, task_t, tasks) {
 		if (task_id-- <= 0)
 			return(task);
 	}
@@ -205,23 +196,23 @@ db_lookup_task_id(register task_id)
 /*
  * convert (task_id, act_id) pair to thr_act address
  */
-static thread_act_t
+static thread_t
 db_lookup_act_id(
 	task_t	 task,
 	register int act_id)
 {
-	register thread_act_t thr_act;
+	register thread_t thr_act;
 
 	
 	if (act_id > DB_MAX_THREADID)
-	    return(THR_ACT_NULL);
-	if (queue_first(&task->thr_acts) == 0)
-	    return(THR_ACT_NULL);
-	queue_iterate(&task->thr_acts, thr_act, thread_act_t, thr_acts) {
+	    return(THREAD_NULL);
+	if (queue_first(&task->threads) == 0)
+	    return(THREAD_NULL);
+	queue_iterate(&task->threads, thr_act, thread_t, task_threads) {
 	    if (act_id-- <= 0)
 		return(thr_act);
 	}
-	return(THR_ACT_NULL);
+	return(THREAD_NULL);
 }
 
 /*
@@ -230,15 +221,15 @@ db_lookup_act_id(
  */
 boolean_t
 db_get_next_act(
-	thread_act_t	*actp,
+	thread_t	*actp,
 	int		position)
 {
 	db_expr_t	value;
-	thread_act_t	thr_act;
+	thread_t	thr_act;
 
-	*actp = THR_ACT_NULL;
+	*actp = THREAD_NULL;
 	if (db_expression(&value)) {
-	    thr_act = (thread_act_t) value;
+	    thr_act = (thread_t)(unsigned long)value;
 	    if (!db_check_act_address_valid(thr_act)) {
 		db_flush_lex();
 		return(FALSE);
@@ -259,7 +250,7 @@ void
 db_init_default_act(void)
 {
 	if (db_lookup_act(db_default_act) < 0) {
-	    db_default_act = THR_ACT_NULL;
+	    db_default_act = THREAD_NULL;
 	    db_default_task = TASK_NULL;
 	} else
 	    db_default_task = db_default_act->task;
@@ -270,13 +261,10 @@ db_init_default_act(void)
  * in the command line
  */
 int
-db_set_default_act(
-	struct db_variable	*vp,
-	db_expr_t		*valuep,
-	int			flag,
-	db_var_aux_param_t	ap)			/* unused */
+db_set_default_act(__unused struct db_variable *vp, db_expr_t *valuep,
+		   int flag, __unused db_var_aux_param_t ap)
 {
-	thread_act_t	thr_act;
+	thread_t	thr_act;
 	int		task_id;
 	int		act_id;
 
@@ -293,11 +281,11 @@ db_set_default_act(
 	}
 
 	if (flag != DB_VAR_SET) {
-	    *valuep = (db_expr_t) db_default_act;
+	    *valuep = (db_expr_t)(unsigned long)db_default_act;
 	    return(0);
 	}
-	thr_act = (thread_act_t) *valuep;
-	if (thr_act != THR_ACT_NULL && !db_check_act_address_valid(thr_act))
+	thr_act = (thread_t)(unsigned long)*valuep;
+	if (thr_act != THREAD_NULL && !db_check_act_address_valid(thr_act))
 	    db_error(0);
 	    /* NOTREACHED */
 	db_default_act = thr_act;
@@ -310,14 +298,11 @@ db_set_default_act(
  * convert $taskXXX[.YYY] type DDB variable to task or thread address
  */
 int
-db_get_task_act(
-	struct db_variable	*vp,
-	db_expr_t		*valuep,
-	int			flag,
-	db_var_aux_param_t	ap)
+db_get_task_act(__unused struct db_variable *vp, db_expr_t *valuep, int flag,
+		db_var_aux_param_t ap)
 {
 	task_t	 		task;
-	thread_act_t		thr_act;
+	thread_t		thr_act;
 	int	 		task_id;
 
 	if (flag == DB_VAR_SHOW) {
@@ -338,15 +323,15 @@ db_get_task_act(
 	    /* NOTREACHED */
 	}
 	if (ap->level <= 1) {
-	    *valuep = (db_expr_t) task;
+	    *valuep = (db_expr_t)(unsigned long)task;
 	    return(0);
 	}
-	if ((thr_act = db_lookup_act_id(task, ap->suffix[1])) == THR_ACT_NULL){
+	if ((thr_act = db_lookup_act_id(task, ap->suffix[1])) == THREAD_NULL){
 	    db_printf("no such thr_act($task%d.%d)\n", 
 					ap->suffix[0], ap->suffix[1]);
 	    db_error(0);
 	    /* NOTREACHED */
 	}
-	*valuep = (db_expr_t) thr_act;
+	*valuep = (db_expr_t)(unsigned long)thr_act;
 	return(0);
 }