xnu-792.6.56.tar.gz

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

diff --git a/osfmk/kern/thread_call.c b/osfmk/kern/thread_call.c
index 15cd7e8a4eb190a940f5aec43464c4fa81a0c890..20b9341eb28e5d92c53785bbac50b36570606be0 100644 (file)
--- a/osfmk/kern/thread_call.c
+++ b/osfmk/kern/thread_call.c
@@ -1,11 +1,9 @@
 /*
 /*

- * Copyright (c) 1993-1995, 1999-2000 Apple Computer, Inc.
+ * Copyright (c) 1993-1995, 1999-2005 Apple Computer, Inc.

  * All rights reserved.
  *
  * @APPLE_LICENSE_HEADER_START@
  * 
  * All rights reserved.
  *
  * @APPLE_LICENSE_HEADER_START@
  * 

- * Copyright (c) 1999-2003 Apple Computer, Inc.  All Rights Reserved.
- * 

  * 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
  * 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


@@ -23,30 +21,27 @@
  * 
  * @APPLE_LICENSE_HEADER_END@
  */
  * 
  * @APPLE_LICENSE_HEADER_END@
  */

-/*
- * Thread-based callout module.
- *
- * HISTORY
- *
- * 10 July 1999 (debo)
- *  Pulled into Mac OS X (microkernel).
- *
- * 3 July 1993 (debo)
- *     Created.
- */

  
 #include <mach/mach_types.h>
  
 #include <mach/mach_types.h>

+#include <mach/thread_act.h>

 
 

+#include <kern/kern_types.h>
+#include <kern/kalloc.h>

 #include <kern/sched_prim.h>
 #include <kern/clock.h>
 #include <kern/task.h>
 #include <kern/thread.h>
 #include <kern/sched_prim.h>
 #include <kern/clock.h>
 #include <kern/task.h>
 #include <kern/thread.h>

+#include <kern/wait_queue.h>
+
+#include <vm/vm_pageout.h>

 
 #include <kern/thread_call.h>
 #include <kern/call_entry.h>
 
 #include <kern/timer_call.h>
 
 
 #include <kern/thread_call.h>
 #include <kern/call_entry.h>
 
 #include <kern/timer_call.h>
 

+#include <sys/kdebug.h>
+

 #define internal_call_num      768
 
 #define thread_call_thread_min 4
 #define internal_call_num      768
 
 #define thread_call_thread_min 4


@@ -59,20 +54,16 @@ decl_simple_lock_data(static,thread_call_lock)
 
 static
 timer_call_data_t
 
 static
 timer_call_data_t

-       thread_call_delayed_timer;
+       thread_call_delaytimer;

 
 static
 queue_head_t
 
 static
 queue_head_t

-       internal_call_free_queue,
-       pending_call_queue, delayed_call_queue;
+       thread_call_xxx_queue,
+       thread_call_pending_queue, thread_call_delayed_queue;

 
 static
 struct wait_queue
 
 static
 struct wait_queue

-       call_thread_idle_queue;
-
-static
-thread_t
-       activate_thread;
+       call_thread_waitqueue;

 
 static
 boolean_t
 
 static
 boolean_t


@@ -90,10 +81,7 @@ static struct {
        int             thread_num,
                        thread_hiwat,
                        thread_lowat;
        int             thread_num,
                        thread_hiwat,
                        thread_lowat;

-} thread_calls;
-
-static boolean_t
-       thread_call_initialized = FALSE;
+} thread_call_vars;

 
 static __inline__ thread_call_t
        _internal_call_allocate(void);
 
 static __inline__ thread_call_t
        _internal_call_allocate(void);


@@ -117,7 +105,7 @@ _delayed_call_dequeue(
        thread_call_t           call
 );
 
        thread_call_t           call
 );
 

-static void __inline__
+static __inline__ void

 _set_delayed_call_timer(
        thread_call_t           call
 );
 _set_delayed_call_timer(
        thread_call_t           call
 );


@@ -164,43 +152,43 @@ _delayed_call_timer(
 void
 thread_call_initialize(void)
 {
 void
 thread_call_initialize(void)
 {

-    thread_call_t              call;
-       spl_t                           s;
+       kern_return_t   result;
+       thread_t                thread;
+    thread_call_t      call;
+       spl_t                   s;

 
 

-    if (thread_call_initialized)
-       panic("thread_call_initialize");
-
-    simple_lock_init(&thread_call_lock, ETAP_MISC_TIMER);
+    simple_lock_init(&thread_call_lock, 0);

 
        s = splsched();
        simple_lock(&thread_call_lock);
 
 
        s = splsched();
        simple_lock(&thread_call_lock);
 

-    queue_init(&pending_call_queue);
-    queue_init(&delayed_call_queue);
+    queue_init(&thread_call_pending_queue);
+    queue_init(&thread_call_delayed_queue);

 
 

-    queue_init(&internal_call_free_queue);
+    queue_init(&thread_call_xxx_queue);

     for (
                call = internal_call_storage;
                        call < &internal_call_storage[internal_call_num];
                        call++) {
 
     for (
                call = internal_call_storage;
                        call < &internal_call_storage[internal_call_num];
                        call++) {
 

-               enqueue_tail(&internal_call_free_queue, qe(call));
+               enqueue_tail(&thread_call_xxx_queue, qe(call));

     }
 
     }
 

-       timer_call_setup(&thread_call_delayed_timer, _delayed_call_timer, NULL);
+       timer_call_setup(&thread_call_delaytimer, _delayed_call_timer, NULL);

 
 

-       wait_queue_init(&call_thread_idle_queue, SYNC_POLICY_FIFO);
-       thread_calls.thread_lowat = thread_call_thread_min;
+       wait_queue_init(&call_thread_waitqueue, SYNC_POLICY_FIFO);
+       thread_call_vars.thread_lowat = thread_call_thread_min;

 
        activate_thread_awake = TRUE;
 
        activate_thread_awake = TRUE;

-    thread_call_initialized = TRUE;

 
        simple_unlock(&thread_call_lock);
        splx(s);
 
 
        simple_unlock(&thread_call_lock);
        splx(s);
 

-    activate_thread = kernel_thread_with_priority(
-                                                                               kernel_task, MAXPRI_KERNEL - 2,
-                                                                                               _activate_thread, TRUE, TRUE);
+       result = kernel_thread_start_priority((thread_continue_t)_activate_thread, NULL, MAXPRI_KERNEL - 2, &thread);
+       if (result != KERN_SUCCESS)
+               panic("thread_call_initialize");
+
+       thread_deallocate(thread);

 }
 
 void
 }
 
 void


@@ -228,10 +216,10 @@ _internal_call_allocate(void)
 {
     thread_call_t              call;
     
 {
     thread_call_t              call;
     

-    if (queue_empty(&internal_call_free_queue))
+    if (queue_empty(&thread_call_xxx_queue))

        panic("_internal_call_allocate");
        
        panic("_internal_call_allocate");
        

-    call = TC(dequeue_head(&internal_call_free_queue));
+    call = TC(dequeue_head(&thread_call_xxx_queue));

     
     return (call);
 }
     
     return (call);
 }


@@ -255,7 +243,7 @@ _internal_call_release(
 {
     if (    call >= internal_call_storage                                              &&
                    call < &internal_call_storage[internal_call_num]            )
 {
     if (    call >= internal_call_storage                                              &&
                    call < &internal_call_storage[internal_call_num]            )

-               enqueue_tail(&internal_call_free_queue, qe(call));
+               enqueue_head(&thread_call_xxx_queue, qe(call));

 }
 
 /*
 }
 
 /*


@@ -275,9 +263,9 @@ _pending_call_enqueue(
     thread_call_t              call
 )
 {
     thread_call_t              call
 )
 {

-    enqueue_tail(&pending_call_queue, qe(call));
-       if (++thread_calls.pending_num > thread_calls.pending_hiwat)
-               thread_calls.pending_hiwat = thread_calls.pending_num;
+    enqueue_tail(&thread_call_pending_queue, qe(call));
+       if (++thread_call_vars.pending_num > thread_call_vars.pending_hiwat)
+               thread_call_vars.pending_hiwat = thread_call_vars.pending_num;

 
     call->state = PENDING;
 }
 
     call->state = PENDING;
 }


@@ -300,7 +288,7 @@ _pending_call_dequeue(
 )
 {
     (void)remque(qe(call));
 )
 {
     (void)remque(qe(call));

-       thread_calls.pending_num--;
+       thread_call_vars.pending_num--;

     
     call->state = IDLE;
 }
     
     call->state = IDLE;
 }


@@ -325,10 +313,10 @@ _delayed_call_enqueue(
 {
     thread_call_t              current;
     
 {
     thread_call_t              current;
     

-    current = TC(queue_first(&delayed_call_queue));
+    current = TC(queue_first(&thread_call_delayed_queue));

     
     while (TRUE) {
     
     while (TRUE) {

-       if (    queue_end(&delayed_call_queue, qe(current))             ||
+       if (    queue_end(&thread_call_delayed_queue, qe(current))              ||

                                        call->deadline < current->deadline                      ) {
                        current = TC(queue_prev(qe(current)));
                        break;
                                        call->deadline < current->deadline                      ) {
                        current = TC(queue_prev(qe(current)));
                        break;


@@ -338,8 +326,8 @@ _delayed_call_enqueue(
     }
 
     insque(qe(call), qe(current));
     }
 
     insque(qe(call), qe(current));

-       if (++thread_calls.delayed_num > thread_calls.delayed_hiwat)
-               thread_calls.delayed_hiwat = thread_calls.delayed_num;
+       if (++thread_call_vars.delayed_num > thread_call_vars.delayed_hiwat)
+               thread_call_vars.delayed_hiwat = thread_call_vars.delayed_num;

     
     call->state = DELAYED;
 }
     
     call->state = DELAYED;
 }


@@ -362,7 +350,7 @@ _delayed_call_dequeue(
 )
 {
     (void)remque(qe(call));
 )
 {
     (void)remque(qe(call));

-       thread_calls.delayed_num--;
+       thread_call_vars.delayed_num--;

     
     call->state = IDLE;
 }
     
     call->state = IDLE;
 }


@@ -383,7 +371,7 @@ _set_delayed_call_timer(
     thread_call_t              call
 )
 {
     thread_call_t              call
 )
 {

-    timer_call_enter(&thread_call_delayed_timer, call->deadline);
+    timer_call_enter(&thread_call_delaytimer, call->deadline);

 }
 
 /*
 }
 
 /*


@@ -411,9 +399,9 @@ _remove_from_pending_queue(
        boolean_t                       call_removed = FALSE;
        thread_call_t           call;
     
        boolean_t                       call_removed = FALSE;
        thread_call_t           call;
     

-    call = TC(queue_first(&pending_call_queue));
+    call = TC(queue_first(&thread_call_pending_queue));

     
     

-    while (!queue_end(&pending_call_queue, qe(call))) {
+    while (!queue_end(&thread_call_pending_queue, qe(call))) {

        if (    call->func == func                      &&
                                call->param0 == param0                  ) {
                        thread_call_t   next = TC(queue_next(qe(call)));
        if (    call->func == func                      &&
                                call->param0 == param0                  ) {
                        thread_call_t   next = TC(queue_next(qe(call)));


@@ -460,9 +448,9 @@ _remove_from_delayed_queue(
     boolean_t                  call_removed = FALSE;
     thread_call_t              call;
     
     boolean_t                  call_removed = FALSE;
     thread_call_t              call;
     

-    call = TC(queue_first(&delayed_call_queue));
+    call = TC(queue_first(&thread_call_delayed_queue));

     
     

-    while (!queue_end(&delayed_call_queue, qe(call))) {
+    while (!queue_end(&thread_call_delayed_queue, qe(call))) {

        if (    call->func == func                      &&
                                call->param0 == param0                  ) {
                        thread_call_t   next = TC(queue_next(qe(call)));
        if (    call->func == func                      &&
                                call->param0 == param0                  ) {
                        thread_call_t   next = TC(queue_next(qe(call)));


@@ -505,17 +493,14 @@ thread_call_func(
 )
 {
     thread_call_t              call;
 )
 {
     thread_call_t              call;

-    int                                        s;
+    spl_t                              s;

     
     

-    if (!thread_call_initialized)
-       panic("thread_call_func");
-       

     s = splsched();
     simple_lock(&thread_call_lock);
     
     s = splsched();
     simple_lock(&thread_call_lock);
     

-    call = TC(queue_first(&pending_call_queue));
+    call = TC(queue_first(&thread_call_pending_queue));

     
     

-       while (unique_call && !queue_end(&pending_call_queue, qe(call))) {
+       while (unique_call && !queue_end(&thread_call_pending_queue, qe(call))) {

        if (    call->func == func                      &&
                                call->param0 == param                   ) {
                        break;
        if (    call->func == func                      &&
                                call->param0 == param                   ) {
                        break;


@@ -524,7 +509,7 @@ thread_call_func(
                call = TC(queue_next(qe(call)));
     }
     
                call = TC(queue_next(qe(call)));
     }
     

-    if (!unique_call || queue_end(&pending_call_queue, qe(call))) {
+    if (!unique_call || queue_end(&thread_call_pending_queue, qe(call))) {

                call = _internal_call_allocate();
                call->func                      = func;
                call->param0            = param;
                call = _internal_call_allocate();
                call->func                      = func;
                call->param0            = param;


@@ -532,7 +517,7 @@ thread_call_func(
        
                _pending_call_enqueue(call);
                
        
                _pending_call_enqueue(call);
                

-               if (thread_calls.active_num <= 0)
+               if (thread_call_vars.active_num <= 0)

                        _call_thread_wake();
     }
 
                        _call_thread_wake();
     }
 


@@ -560,11 +545,8 @@ thread_call_func_delayed(
 )
 {
     thread_call_t              call;
 )
 {
     thread_call_t              call;

-    int                                        s;
+    spl_t                              s;

     
     

-    if (!thread_call_initialized)
-       panic("thread_call_func_delayed");
-

     s = splsched();
     simple_lock(&thread_call_lock);
     
     s = splsched();
     simple_lock(&thread_call_lock);
     


@@ -576,7 +558,7 @@ thread_call_func_delayed(
     
     _delayed_call_enqueue(call);
     
     
     _delayed_call_enqueue(call);
     

-    if (queue_first(&delayed_call_queue) == qe(call))
+    if (queue_first(&thread_call_delayed_queue) == qe(call))

        _set_delayed_call_timer(call);
     
     simple_unlock(&thread_call_lock);
        _set_delayed_call_timer(call);
     
     simple_unlock(&thread_call_lock);


@@ -609,7 +591,7 @@ thread_call_func_cancel(
 )
 {
        boolean_t                       result;
 )
 {
        boolean_t                       result;

-    int                                        s;
+    spl_t                              s;

     
     s = splsched();
     simple_lock(&thread_call_lock);
     
     s = splsched();
     simple_lock(&thread_call_lock);


@@ -669,7 +651,7 @@ thread_call_free(
     thread_call_t              call
 )
 {
     thread_call_t              call
 )
 {

-    int                        s;
+    spl_t              s;

     
     s = splsched();
     simple_lock(&thread_call_lock);
     
     s = splsched();
     simple_lock(&thread_call_lock);


@@ -684,7 +666,7 @@ thread_call_free(
     simple_unlock(&thread_call_lock);
     splx(s);
     
     simple_unlock(&thread_call_lock);
     splx(s);
     

-    kfree((vm_offset_t)call, sizeof (thread_call_data_t));
+    kfree(call, sizeof (thread_call_data_t));

 
        return (TRUE);
 }
 
        return (TRUE);
 }


@@ -709,7 +691,7 @@ thread_call_enter(
 )
 {
        boolean_t               result = TRUE;
 )
 {
        boolean_t               result = TRUE;

-    int                                s;
+    spl_t                      s;

     
     s = splsched();
     simple_lock(&thread_call_lock);
     
     s = splsched();
     simple_lock(&thread_call_lock);


@@ -722,7 +704,7 @@ thread_call_enter(
 
        _pending_call_enqueue(call);
                
 
        _pending_call_enqueue(call);
                

-               if (thread_calls.active_num <= 0)
+               if (thread_call_vars.active_num <= 0)

                        _call_thread_wake();
        }
 
                        _call_thread_wake();
        }
 


@@ -741,7 +723,7 @@ thread_call_enter1(
 )
 {
        boolean_t                       result = TRUE;
 )
 {
        boolean_t                       result = TRUE;

-    int                                        s;
+    spl_t                              s;

     
     s = splsched();
     simple_lock(&thread_call_lock);
     
     s = splsched();
     simple_lock(&thread_call_lock);


@@ -754,7 +736,7 @@ thread_call_enter1(
 
        _pending_call_enqueue(call);
 
 
        _pending_call_enqueue(call);
 

-               if (thread_calls.active_num <= 0)
+               if (thread_call_vars.active_num <= 0)

                        _call_thread_wake();
     }
 
                        _call_thread_wake();
     }
 


@@ -787,7 +769,7 @@ thread_call_enter_delayed(
 )
 {
        boolean_t               result = TRUE;
 )
 {
        boolean_t               result = TRUE;

-    int                                s;
+    spl_t                      s;

 
     s = splsched();
     simple_lock(&thread_call_lock);
 
     s = splsched();
     simple_lock(&thread_call_lock);


@@ -804,7 +786,7 @@ thread_call_enter_delayed(
 
        _delayed_call_enqueue(call);
 
 
        _delayed_call_enqueue(call);
 

-       if (queue_first(&delayed_call_queue) == qe(call))
+       if (queue_first(&thread_call_delayed_queue) == qe(call))

                _set_delayed_call_timer(call);
 
     simple_unlock(&thread_call_lock);
                _set_delayed_call_timer(call);
 
     simple_unlock(&thread_call_lock);


@@ -821,7 +803,7 @@ thread_call_enter1_delayed(
 )
 {
        boolean_t                       result = TRUE;
 )
 {
        boolean_t                       result = TRUE;

-    int                                        s;
+    spl_t                              s;

 
     s = splsched();
     simple_lock(&thread_call_lock);
 
     s = splsched();
     simple_lock(&thread_call_lock);


@@ -838,7 +820,7 @@ thread_call_enter1_delayed(
 
        _delayed_call_enqueue(call);
 
 
        _delayed_call_enqueue(call);
 

-       if (queue_first(&delayed_call_queue) == qe(call))
+       if (queue_first(&thread_call_delayed_queue) == qe(call))

                _set_delayed_call_timer(call);
 
     simple_unlock(&thread_call_lock);
                _set_delayed_call_timer(call);
 
     simple_unlock(&thread_call_lock);


@@ -867,7 +849,7 @@ thread_call_cancel(
 )
 {
        boolean_t               result = TRUE;
 )
 {
        boolean_t               result = TRUE;

-    int                                s;
+    spl_t                      s;

     
     s = splsched();
     simple_lock(&thread_call_lock);
     
     s = splsched();
     simple_lock(&thread_call_lock);


@@ -905,7 +887,7 @@ thread_call_is_delayed(
        uint64_t                        *deadline)
 {
        boolean_t               result = FALSE;
        uint64_t                        *deadline)
 {
        boolean_t               result = FALSE;

-       int                             s;
+       spl_t                   s;

 
        s = splsched();
        simple_lock(&thread_call_lock);
 
        s = splsched();
        simple_lock(&thread_call_lock);


@@ -939,17 +921,15 @@ static __inline__
 void
 _call_thread_wake(void)
 {
 void
 _call_thread_wake(void)
 {

-       if (wait_queue_wakeup_one(
-                                       &call_thread_idle_queue, &call_thread_idle_queue,
-                                                                               THREAD_AWAKENED) == KERN_SUCCESS) {
-               thread_calls.idle_thread_num--;
+       if (wait_queue_wakeup_one(&call_thread_waitqueue, NULL, THREAD_AWAKENED) == KERN_SUCCESS) {
+               thread_call_vars.idle_thread_num--;

 
 

-               if (++thread_calls.active_num > thread_calls.active_hiwat)
-                       thread_calls.active_hiwat = thread_calls.active_num;
+               if (++thread_call_vars.active_num > thread_call_vars.active_hiwat)
+                       thread_call_vars.active_hiwat = thread_call_vars.active_num;

        }
        else
        if (!activate_thread_awake) {
        }
        else
        if (!activate_thread_awake) {

-               clear_wait(activate_thread, THREAD_AWAKENED);
+               thread_wakeup_one(&activate_thread_awake);

                activate_thread_awake = TRUE;
        }
 }
                activate_thread_awake = TRUE;
        }
 }


@@ -970,11 +950,11 @@ call_thread_block(void)
 {
        simple_lock(&thread_call_lock);
 
 {
        simple_lock(&thread_call_lock);
 

-       if (--thread_calls.active_num < thread_calls.active_lowat)
-               thread_calls.active_lowat = thread_calls.active_num;
+       if (--thread_call_vars.active_num < thread_call_vars.active_lowat)
+               thread_call_vars.active_lowat = thread_call_vars.active_num;

 
 

-       if (    thread_calls.active_num <= 0    &&
-                       thread_calls.pending_num > 0            )
+       if (    thread_call_vars.active_num <= 0        &&
+                       thread_call_vars.pending_num > 0                )

                _call_thread_wake();
 
        simple_unlock(&thread_call_lock);
                _call_thread_wake();
 
        simple_unlock(&thread_call_lock);


@@ -996,8 +976,8 @@ call_thread_unblock(void)
 {
        simple_lock(&thread_call_lock);
 
 {
        simple_lock(&thread_call_lock);
 

-       if (++thread_calls.active_num > thread_calls.active_hiwat)
-               thread_calls.active_hiwat = thread_calls.active_num;
+       if (++thread_call_vars.active_num > thread_call_vars.active_hiwat)
+               thread_call_vars.active_hiwat = thread_call_vars.active_num;

 
        simple_unlock(&thread_call_lock);
 }
 
        simple_unlock(&thread_call_lock);
 }


@@ -1021,15 +1001,15 @@ _call_thread_continue(void)
     (void) splsched();
     simple_lock(&thread_call_lock);
 
     (void) splsched();
     simple_lock(&thread_call_lock);
 

-       self->active_callout = TRUE;
+       self->options |= TH_OPT_CALLOUT;

 
 

-    while (thread_calls.pending_num > 0) {
+    while (thread_call_vars.pending_num > 0) {

                thread_call_t                   call;
                thread_call_func_t              func;
                thread_call_param_t             param0, param1;
 
                thread_call_t                   call;
                thread_call_func_t              func;
                thread_call_param_t             param0, param1;
 

-               call = TC(dequeue_head(&pending_call_queue));
-               thread_calls.pending_num--;
+               call = TC(dequeue_head(&thread_call_pending_queue));
+               thread_call_vars.pending_num--;

 
                func = call->func;
                param0 = call->param0;
 
                func = call->func;
                param0 = call->param0;


@@ -1042,6 +1022,10 @@ _call_thread_continue(void)
                simple_unlock(&thread_call_lock);
                (void) spllo();
 
                simple_unlock(&thread_call_lock);
                (void) spllo();
 

+               KERNEL_DEBUG_CONSTANT(
+                       MACHDBG_CODE(DBG_MACH_SCHED,MACH_CALLOUT) | DBG_FUNC_NONE,
+                               (int)func, (int)param0, (int)param1, 0, 0);
+

                (*func)(param0, param1);
 
                (void)thread_funnel_set(self->funnel_lock, FALSE);
                (*func)(param0, param1);
 
                (void)thread_funnel_set(self->funnel_lock, FALSE);


@@ -1050,31 +1034,29 @@ _call_thread_continue(void)
                simple_lock(&thread_call_lock);
     }
 
                simple_lock(&thread_call_lock);
     }
 

-       self->active_callout = FALSE;
+       self->options &= ~TH_OPT_CALLOUT;

 
 

-       if (--thread_calls.active_num < thread_calls.active_lowat)
-               thread_calls.active_lowat = thread_calls.active_num;
+       if (--thread_call_vars.active_num < thread_call_vars.active_lowat)
+               thread_call_vars.active_lowat = thread_call_vars.active_num;

        
        

-    if (thread_calls.idle_thread_num < thread_calls.thread_lowat) {
-               thread_calls.idle_thread_num++;
+    if (thread_call_vars.idle_thread_num < thread_call_vars.thread_lowat) {
+               thread_call_vars.idle_thread_num++;

 
 

-               wait_queue_assert_wait(
-                                       &call_thread_idle_queue, &call_thread_idle_queue,
-                                                                                                               THREAD_INTERRUPTIBLE);
+               wait_queue_assert_wait(&call_thread_waitqueue, NULL, THREAD_UNINT, 0);

        
                simple_unlock(&thread_call_lock);
                (void) spllo();
 
        
                simple_unlock(&thread_call_lock);
                (void) spllo();
 

-               thread_block(_call_thread_continue);
+               thread_block((thread_continue_t)_call_thread_continue);

                /* NOTREACHED */
     }
     
                /* NOTREACHED */
     }
     

-    thread_calls.thread_num--;
+    thread_call_vars.thread_num--;

     
     simple_unlock(&thread_call_lock);
     (void) spllo();
     
     
     simple_unlock(&thread_call_lock);
     (void) spllo();
     

-    (void) thread_terminate(self->top_act);
+    thread_terminate(self);

        /* NOTREACHED */
 }
 
        /* NOTREACHED */
 }
 


@@ -1082,10 +1064,6 @@ static
 void
 _call_thread(void)
 {
 void
 _call_thread(void)
 {

-       thread_t                                        self = current_thread();
-
-    stack_privilege(self);
-

     _call_thread_continue();
     /* NOTREACHED */
 }
     _call_thread_continue();
     /* NOTREACHED */
 }


@@ -1104,24 +1082,30 @@ static
 void
 _activate_thread_continue(void)
 {
 void
 _activate_thread_continue(void)
 {

+       kern_return_t   result;
+       thread_t                thread;
+

     (void) splsched();
     simple_lock(&thread_call_lock);
         
     (void) splsched();
     simple_lock(&thread_call_lock);
         

-       while (         thread_calls.active_num <= 0    &&
-                               thread_calls.pending_num > 0            ) {
+       while (         thread_call_vars.active_num <= 0        &&
+                               thread_call_vars.pending_num > 0                ) {

 
 

-               if (++thread_calls.active_num > thread_calls.active_hiwat)
-                       thread_calls.active_hiwat = thread_calls.active_num;
+               if (++thread_call_vars.active_num > thread_call_vars.active_hiwat)
+                       thread_call_vars.active_hiwat = thread_call_vars.active_num;

 
 

-               if (++thread_calls.thread_num > thread_calls.thread_hiwat)
-                       thread_calls.thread_hiwat = thread_calls.thread_num;
+               if (++thread_call_vars.thread_num > thread_call_vars.thread_hiwat)
+                       thread_call_vars.thread_hiwat = thread_call_vars.thread_num;

 
                simple_unlock(&thread_call_lock);
                (void) spllo();
        
 
                simple_unlock(&thread_call_lock);
                (void) spllo();
        

-               (void) kernel_thread_with_priority(
-                                                                       kernel_task, MAXPRI_KERNEL - 1,
-                                                                                                       _call_thread, TRUE, TRUE);
+               result = kernel_thread_start_priority((thread_continue_t)_call_thread, NULL, MAXPRI_KERNEL - 1, &thread);
+               if (result != KERN_SUCCESS)
+                       panic("activate_thread");
+
+               thread_deallocate(thread);
+

                (void) splsched();
                simple_lock(&thread_call_lock);
     }
                (void) splsched();
                simple_lock(&thread_call_lock);
     }


@@ -1132,7 +1116,7 @@ _activate_thread_continue(void)
     simple_unlock(&thread_call_lock);
        (void) spllo();
     
     simple_unlock(&thread_call_lock);
        (void) spllo();
     

-       thread_block(_activate_thread_continue);
+       thread_block((thread_continue_t)_activate_thread_continue);

        /* NOTREACHED */
 }
 
        /* NOTREACHED */
 }
 


@@ -1140,11 +1124,10 @@ static
 void
 _activate_thread(void)
 {
 void
 _activate_thread(void)
 {

-       thread_t                self = current_thread();
+       thread_t        self = current_thread();

 
 

-       self->vm_privilege = TRUE;
+       self->options |= TH_OPT_VMPRIV;

        vm_page_free_reserve(2);        /* XXX */
        vm_page_free_reserve(2);        /* XXX */

-    stack_privilege(self);

     
     _activate_thread_continue();
     /* NOTREACHED */
     
     _activate_thread_continue();
     /* NOTREACHED */


@@ -1153,23 +1136,23 @@ _activate_thread(void)
 static
 void
 _delayed_call_timer(
 static
 void
 _delayed_call_timer(

-       timer_call_param_t              p0,
-       timer_call_param_t              p1
+       __unused timer_call_param_t             p0,
+       __unused timer_call_param_t             p1

 )
 {
        uint64_t                        timestamp;
     thread_call_t              call;
        boolean_t                       new_pending = FALSE;
 )
 {
        uint64_t                        timestamp;
     thread_call_t              call;
        boolean_t                       new_pending = FALSE;

-    int                                        s;
+    spl_t                              s;

 
     s = splsched();
     simple_lock(&thread_call_lock);
 
        clock_get_uptime(&timestamp);
     
 
     s = splsched();
     simple_lock(&thread_call_lock);
 
        clock_get_uptime(&timestamp);
     

-    call = TC(queue_first(&delayed_call_queue));
+    call = TC(queue_first(&thread_call_delayed_queue));

     
     

-    while (!queue_end(&delayed_call_queue, qe(call))) {
+    while (!queue_end(&thread_call_delayed_queue, qe(call))) {

        if (call->deadline <= timestamp) {
                        _delayed_call_dequeue(call);
 
        if (call->deadline <= timestamp) {
                        _delayed_call_dequeue(call);
 


@@ -1179,13 +1162,13 @@ _delayed_call_timer(
                else
                        break;
            
                else
                        break;
            

-               call = TC(queue_first(&delayed_call_queue));
+               call = TC(queue_first(&thread_call_delayed_queue));

     }
 
     }
 

-       if (!queue_end(&delayed_call_queue, qe(call)))
+       if (!queue_end(&thread_call_delayed_queue, qe(call)))

                _set_delayed_call_timer(call);
 
                _set_delayed_call_timer(call);
 

-    if (new_pending && thread_calls.active_num <= 0)
+    if (new_pending && thread_call_vars.active_num <= 0)

                _call_thread_wake();
 
     simple_unlock(&thread_call_lock);
                _call_thread_wake();
 
     simple_unlock(&thread_call_lock);