xnu-792.21.3.tar.gz

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

diff --git a/osfmk/ddb/db_task_thread.h b/osfmk/ddb/db_task_thread.h
index a112631787a1446b751de5ed4218d9ad3cfa8278..12f9ac6b4d571252434178d6184ec72d1307b3bf 100644 (file)
--- a/osfmk/ddb/db_task_thread.h
+++ b/osfmk/ddb/db_task_thread.h
@@ -1,16 +1,19 @@
 /*
  * Copyright (c) 2000 Apple Computer, 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@
@@ -69,10 +72,10 @@
  * space.
  */
 #define db_current_task()                                              \
-               ((current_act())? current_act()->task: TASK_NULL)
+               ((current_thread())? current_thread()->task: TASK_NULL)
 #define db_current_space()                                             \
-               ((current_act())?\
-                       current_act()->task: TASK_NULL)
+               ((current_thread())?\
+                       current_thread()->task: TASK_NULL)
 #define db_target_space(thr_act, user_space)                           \
                ((!(user_space) || ((thr_act)))?\
                        TASK_NULL:                                      \
@@ -82,24 +85,24 @@
                ((task) == TASK_NULL || (task) == db_current_space())
 
 extern task_t          db_default_task;        /* default target task */
-extern thread_act_t    db_default_act;         /* default target thr_act */
+extern thread_t        db_default_act;         /* default target thr_act */
 
 
 /* Prototypes for functions exported by this module.
  */
 
-int db_lookup_act(thread_act_t target_act);
+int db_lookup_act(thread_t target_act);
 
 int db_lookup_task(task_t target_task);
 
 int db_lookup_task_act(
        task_t          task,
-       thread_act_t            target_act);
+       thread_t                target_act);
 
-boolean_t db_check_act_address_valid(thread_act_t thr_act);
+boolean_t db_check_act_address_valid(thread_t thr_act);
 
 boolean_t db_get_next_act(
-       thread_act_t            *actp,
+       thread_t                *actp,
        int             position);
 
 void db_init_default_act(void);