xnu-792.6.22.tar.gz

[apple/xnu.git] / osfmk / kern / profile.h

diff --git a/osfmk/kern/profile.h b/osfmk/kern/profile.h
index 31e890bea3331cf07ab395254701f80e72506dfd..10488e8ef711fa0c379a603861eceeabfefbc299 100644 (file)
--- a/osfmk/kern/profile.h
+++ b/osfmk/kern/profile.h
@@ -1,24 +1,21 @@
 /*
- * Copyright (c) 2000 Apple Computer, Inc. All rights reserved.
+ * Copyright (c) 2000-2004 Apple Computer, Inc. All rights reserved.
  *
  * @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@
  */
@@ -100,12 +97,10 @@ typedef struct buffer              *buffer_t;
        (pbuf)->prof_index
 
 
-extern vm_map_t kernel_map; 
-
 /* MACRO set_pbuf_value 
 ** 
 ** enters the value 'val' in the buffer 'pbuf' and returns the following
-** indications:     0: means that a fatal error occured: the buffer was full
+** indications:     0: means that a fatal error occurred: the buffer was full
 **                       (it hasn't been sent yet)
 **                  1: means that a value has been inserted successfully
 **                 2: means that we'v just entered the last value causing 
@@ -165,28 +160,27 @@ extern void       profile(
        task->task_profiled = FALSE; \
        task->profil_buffer = NULLPROFDATA;
 
-#define act_prof_init(thr_act, task) \
-       thr_act->act_profiled = task->task_profiled;    \
-       thr_act->profil_buffer = task->profil_buffer;
+#define thread_prof_init(thread, task) \
+       thread->profiled = task->profiled;      \
+       thread->profil_buffer = task->profil_buffer;
 
 #define task_prof_deallocate(task) \
        if (task->profil_buffer) \
                task_sample(task, MACH_PORT_NULL); \
 
-#define act_prof_deallocate(thr_act) \
-       if (thr_act->act_profiled_own && thr_act->profil_buffer)  \
-               thread_sample(thr_act, MACH_PORT_NULL); \
+#define thread_prof_deallocate(thread) \
+       if (thread->profiled_own && thread->profil_buffer)  \
+               thread_sample(thread, MACH_PORT_NULL); \
 
-extern kern_return_t thread_sample(thread_act_t, ipc_port_t);
+extern kern_return_t thread_sample(thread_t, ipc_port_t);
 extern kern_return_t task_sample(task_t, ipc_port_t);
 
 #else /* !MACH_PROT */
 
 #define task_prof_init(task)
-#define act_prof_init(thr_act, task)
+#define thread_prof_init(thread, task)
 #define task_prof_deallocate(task)
-#define act_prof_deallocate(thr_act)
-
+#define thread_prof_deallocate(thread)
                
 #endif /* !MACH_PROF */