X-Git-Url: https://git.saurik.com/apple/xnu.git/blobdiff_plain/de355530ae67247cbd0da700edb3a2a1dae884c2..55e303ae13a4cf49d70f2294092726f2fffb9ef2:/osfmk/ddb/db_task_thread.c

diff --git a/osfmk/ddb/db_task_thread.c b/osfmk/ddb/db_task_thread.c
index cf8f37ea4..6ff2066a1 100644
--- a/osfmk/ddb/db_task_thread.c
+++ b/osfmk/ddb/db_task_thread.c
@@ -3,94 +3,28 @@
  *
  * @APPLE_LICENSE_HEADER_START@
  * 
- * The contents of this file constitute Original Code as defined in and
- * are subject to the Apple Public Source License Version 1.1 (the
- * "License").  You may not use this file 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.
+ * Copyright (c) 1999-2003 Apple Computer, Inc.  All Rights Reserved.
  * 
- * This Original Code and all software distributed under the License are
- * distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * 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.
+ * 
+ * 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,
  * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE OR NON-INFRINGEMENT.  Please see the
- * License for the specific language governing rights and limitations
- * under the License.
+ * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
+ * Please see the License for the specific language governing rights and
+ * limitations under the License.
  * 
  * @APPLE_LICENSE_HEADER_END@
  */
 /*
  * @OSF_COPYRIGHT@
  */
-/*
- * HISTORY
- * 
- * Revision 1.1.1.1  1998/09/22 21:05:48  wsanchez
- * Import of Mac OS X kernel (~semeria)
- *
- * Revision 1.1.1.1  1998/03/07 02:26:09  wsanchez
- * Import of OSF Mach kernel (~mburg)
- *
- * Revision 1.1.16.3  1996/01/09  19:16:26  devrcs
- * 	Make db_lookup_task_id() globally available (remove static).
- * 	Changed declarations of 'register foo' to 'register int foo'.
- * 	[1995/12/01  21:42:37  jfraser]
- *
- * 	Merged '64-bit safe' changes from DEC alpha port.
- * 	[1995/11/21  18:03:48  jfraser]
- *
- * Revision 1.1.16.2  1994/09/23  01:21:59  ezf
- * 	change marker to not FREE
- * 	[1994/09/22  21:11:09  ezf]
- * 
- * Revision 1.1.16.1  1994/06/11  21:12:29  bolinger
- * 	Merge up to NMK17.2.
- * 	[1994/06/11  20:02:43  bolinger]
- * 
- * Revision 1.1.14.1  1994/02/08  10:59:02  bernadat
- * 	Added support of DB_VAR_SHOW.
- * 	[93/08/12            paire]
- * 	[94/02/08            bernadat]
- * 
- * Revision 1.1.12.3  1994/03/17  22:35:35  dwm
- * 	The infamous name change:  thread_activation + thread_shuttle = thread.
- * 	[1994/03/17  21:25:50  dwm]
- * 
- * Revision 1.1.12.2  1994/01/17  18:08:54  dwm
- * 	Add patchable integer force_act_lookup to force successful
- * 	lookup, to allow stack trace on orphaned act/thread pairs.
- * 	[1994/01/17  16:06:50  dwm]
- * 
- * Revision 1.1.12.1  1994/01/12  17:50:52  dwm
- * 	Coloc: initial restructuring to follow Utah model.
- * 	[1994/01/12  17:13:23  dwm]
- * 
- * Revision 1.1.3.3  1993/07/27  18:28:15  elliston
- * 	Add ANSI prototypes.  CR #9523.
- * 	[1993/07/27  18:13:06  elliston]
- * 
- * Revision 1.1.3.2  1993/06/02  23:12:39  jeffc
- * 	Added to OSF/1 R1.3 from NMK15.0.
- * 	[1993/06/02  20:57:24  jeffc]
- * 
- * Revision 1.1  1992/09/30  02:01:27  robert
- * 	Initial revision
- * 
- * $EndLog$
- */
-/* CMU_HIST */
-/*
- * Revision 2.2  91/10/09  16:03:04  af
- * 	 Revision 2.1.3.1  91/10/05  13:07:50  jeffreyh
- * 	 	Created for task/thread handling.
- * 	 	[91/08/29            tak]
- * 
- * Revision 2.1.3.1  91/10/05  13:07:50  jeffreyh
- * 	Created for task/thread handling.
- * 	[91/08/29            tak]
- * 
- */
-/* CMU_ENDHIST */
 /* 
  * Mach Operating System
  * Copyright (c) 1991,1990 Carnegie Mellon University
@@ -190,9 +124,9 @@ db_lookup_task_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_act_t, task_threads) {
 	    if (target_act == thr_act)
 		return(act_id);
 	    if (act_id++ >= DB_MAX_THREADID)
@@ -221,7 +155,7 @@ db_lookup_act(thread_act_t target_act)
 	queue_iterate(&pset->tasks, task, task_t, pset_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)
@@ -281,9 +215,9 @@ db_lookup_act_id(
 	
 	if (act_id > DB_MAX_THREADID)
 	    return(THR_ACT_NULL);
-	if (queue_first(&task->thr_acts) == 0)
+	if (queue_first(&task->threads) == 0)
 	    return(THR_ACT_NULL);
-	queue_iterate(&task->thr_acts, thr_act, thread_act_t, thr_acts) {
+	queue_iterate(&task->threads, thr_act, thread_act_t, task_threads) {
 	    if (act_id-- <= 0)
 		return(thr_act);
 	}