xnu-4570.41.2.tar.gz

[apple/xnu.git] / bsd / kern / kern_pcsamples.c

diff --git a/bsd/kern/kern_pcsamples.c b/bsd/kern/kern_pcsamples.c
index 312a6af6d3de7d65d000679f42c77158cef658a4..887029225c46e7b6b78adbd0611688e088dbe2fd 100644 (file)
--- a/bsd/kern/kern_pcsamples.c
+++ b/bsd/kern/kern_pcsamples.c
@@ -1,14 +1,19 @@
 /*
- * Copyright (c) 2000 Apple Computer, Inc. All rights reserved.
+ * Copyright (c) 2000-2012 Apple Inc. All rights reserved.
  *
- * @APPLE_LICENSE_HEADER_START@
+ * @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
@@ -18,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@
  */
 
 #include <sys/kdebug.h>
@@ -51,7 +56,7 @@ unsigned int pcsample_end    = 0;
 
 static pid_t global_state_pid = -1;       /* Used to control exclusive use of pc_buffer */
 
-extern int pc_trace_buf[];
+extern unsigned int pc_trace_buf[];
 extern int pc_trace_cnt;
 
 void add_pcbuffer(void);
@@ -67,12 +72,12 @@ int pcsamples_reinit(void);
 int
 enable_branch_tracing(void)
 {
-#ifndef i386
   struct proc *p;
   if (-1 != pc_sample_pid) {
-    p = pfind(pc_sample_pid);
+    p = proc_find(pc_sample_pid);
     if (p) {
-      p->p_flag |= P_BTRACE;
+      p->p_btrace = 1;
+        proc_rele(p);
     } 
   }
   else {
@@ -81,9 +86,6 @@ enable_branch_tracing(void)
 
   return 1;
 
-#else
-    return 0;
-#endif
 }
 
 int
@@ -97,9 +99,10 @@ disable_branch_tracing(void)
     case 0:
         break;
     default:
-        p = pfind(pc_sample_pid);
+        p = proc_find(pc_sample_pid);
         if (p) {
-            p->p_flag &= ~P_BTRACE;
+            p->p_btrace = 0;
+                       proc_rele(p);
         }
         break;
     }
@@ -117,7 +120,7 @@ branch_tracing_enabled(void)
   struct proc *p = current_proc();
   if (TRUE == pc_trace_frameworks) return TRUE;
   if (p) {
-    return (P_BTRACE == (p->p_flag & P_BTRACE));
+    return (p->p_btrace);
   }
   return 0;
 }
@@ -243,13 +246,14 @@ pcsamples_control(int *name, __unused u_int namelen, user_addr_t where, size_t *
              global_state_pid = curpid;
            else if (global_state_pid != curpid)
              {
-               if((p = pfind(global_state_pid)) == NULL)
+               if((p = proc_find(global_state_pid)) == NULL)
                  {
                    /* The global pid no longer exists */
                    global_state_pid = curpid;
                  }
                else
                  {
+                       proc_rele(p);
                    /* The global pid exists, deny this request */
                    return(EBUSY);
                  }