xnu-517.7.7.tar.gz

[apple/xnu.git] / osfmk / ddb / db_task_thread.c

diff --git a/osfmk/ddb/db_task_thread.c b/osfmk/ddb/db_task_thread.c
index e01b03f2faafc00bed9fb25a8bff4d12bff6fd6d..e380137464ca7e90794a284210971db9dc75e8d4 100644 (file)
--- a/osfmk/ddb/db_task_thread.c
+++ b/osfmk/ddb/db_task_thread.c
@@ -3,22 +3,19 @@
  *
  * @APPLE_LICENSE_HEADER_START@
  * 
- * Copyright (c) 1999-2003 Apple Computer, Inc.  All Rights Reserved.
+ * 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.
  * 
- * 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
+ * This 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, QUIET ENJOYMENT OR NON-INFRINGEMENT.
- * Please see the License for the specific language governing rights and
- * limitations under the License.
+ * 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@
  */
@@ -124,9 +121,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)
@@ -155,7 +152,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)
@@ -215,9 +212,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);
        }