xnu-1504.7.4.tar.gz

[apple/xnu.git] / osfmk / kern / thread_act.c

diff --git a/osfmk/kern/thread_act.c b/osfmk/kern/thread_act.c
index da65103821e0c6b4bf544fdbad053dfcf4e1b03c..8c18ffc300b1d058de4ae5dcb172650e48735f78 100644 (file)
--- a/osfmk/kern/thread_act.c
+++ b/osfmk/kern/thread_act.c
@@ -77,8 +77,6 @@
 
 #include <mach/rpc.h>
 
-#include <mach/sdt.h>
-
 void                   act_abort(thread_t);
 void                   install_special_handler_locked(thread_t);
 void                   special_handler_continue(void);
@@ -87,9 +85,12 @@ void                 special_handler_continue(void);
  * Internal routine to mark a thread as started.
  * Always called with the thread locked.
  *
- * Note: function intentionall declared with the noinline attribute to
+ * Note: function intentionally declared with the noinline attribute to
  * prevent multiple declaration of probe symbols in this file; we would
  * prefer "#pragma noinline", but gcc does not support it.
+ * PR-6385749 -- the lwp-start probe should fire from within the context
+ * of the newly created thread.  Commented out for now, in case we
+ * turn it into a dead code probe.
  */
 void
 thread_start_internal(
@@ -97,7 +98,7 @@ thread_start_internal(
 {
        clear_wait(thread, THREAD_AWAKENED);
        thread->started = TRUE;
-       DTRACE_PROC1(lwp__start, thread_t, thread);
+       // DTRACE_PROC1(lwp__start, thread_t, thread);
 }
 
 /*
@@ -110,8 +111,6 @@ thread_terminate_internal(
 {
        kern_return_t           result = KERN_SUCCESS;
 
-       DTRACE_PROC(lwp__exit);
-
        thread_mtx_lock(thread);
 
        if (thread->active) {
@@ -759,7 +758,6 @@ special_handler_continue(void)
 
                        thread->sched_pri = DEPRESSPRI;
                        myprocessor->current_pri = thread->sched_pri;
-                       thread->sched_mode &= ~TH_MODE_PREEMPT;
                }
                thread_unlock(thread);
                splx(s);