xnu-792.6.76.tar.gz

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

diff --git a/osfmk/kern/timer_call.c b/osfmk/kern/timer_call.c
index 66d69a8333f6a33becd8607b5039edff1327803b..fd48c39597615dfc76f1bd8dc82413596d0589d4 100644 (file)
--- a/osfmk/kern/timer_call.c
+++ b/osfmk/kern/timer_call.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1993-1995, 1999-2000 Apple Computer, Inc.
+ * Copyright (c) 1993-1995, 1999-2004 Apple Computer, Inc.
  * All rights reserved.
  *
  * @APPLE_LICENSE_HEADER_START@
@@ -32,25 +32,17 @@
 #include <mach/mach_types.h>
 
 #include <kern/clock.h>
+#include <kern/processor.h>
 
 #include <kern/timer_call.h>
 #include <kern/call_entry.h>
 
 decl_simple_lock_data(static,timer_call_lock)
 
-static
-queue_head_t
-       delayed_call_queues[NCPUS];
-
 static struct {
-       int             pending_num,
-                       pending_hiwat;
        int             delayed_num,
                        delayed_hiwat;
-} timer_calls;
-
-static boolean_t
-       timer_call_initialized = FALSE;
+} timer_call_vars;
 
 static void
 timer_call_interrupt(
@@ -63,23 +55,14 @@ void
 timer_call_initialize(void)
 {
        spl_t                           s;
-       int                                     i;
-
-       if (timer_call_initialized)
-               panic("timer_call_initialize");
 
-       simple_lock_init(&timer_call_lock, ETAP_MISC_TIMER);
+       simple_lock_init(&timer_call_lock, 0);
 
        s = splclock();
        simple_lock(&timer_call_lock);
 
-       for (i = 0; i < NCPUS; i++)
-               queue_init(&delayed_call_queues[i]);
-
        clock_set_timer_func((clock_timer_func_t)timer_call_interrupt);
 
-       timer_call_initialized = TRUE;
-
        simple_unlock(&timer_call_lock);
        splx(s);
 }
@@ -114,8 +97,8 @@ _delayed_call_enqueue(
        }
 
        insque(qe(call), qe(current));
-       if (++timer_calls.delayed_num > timer_calls.delayed_hiwat)
-               timer_calls.delayed_hiwat = timer_calls.delayed_num;
+       if (++timer_call_vars.delayed_num > timer_call_vars.delayed_hiwat)
+               timer_call_vars.delayed_hiwat = timer_call_vars.delayed_num;
 
        call->state = DELAYED;
 }
@@ -126,31 +109,7 @@ _delayed_call_dequeue(
        timer_call_t                    call)
 {
        (void)remque(qe(call));
-       timer_calls.delayed_num--;
-
-       call->state = IDLE;
-}
-
-static __inline__
-void
-_pending_call_enqueue(
-       queue_t                                 queue,
-       timer_call_t                    call)
-{
-       enqueue_tail(queue, qe(call));
-       if (++timer_calls.pending_num > timer_calls.pending_hiwat)
-               timer_calls.pending_hiwat = timer_calls.pending_num;
-
-       call->state = PENDING;
-}
-
-static __inline__
-void
-_pending_call_dequeue(
-       timer_call_t                    call)
-{
-       (void)remque(qe(call));
-       timer_calls.pending_num--;
+       timer_call_vars.delayed_num--;
 
        call->state = IDLE;
 }
@@ -169,27 +128,25 @@ timer_call_enter(
        uint64_t                                deadline)
 {
        boolean_t               result = TRUE;
-       queue_t                 delayed;
+       queue_t                 queue;
        spl_t                   s;
 
        s = splclock();
        simple_lock(&timer_call_lock);
 
-       if (call->state == PENDING)
-               _pending_call_dequeue(call);
-       else if (call->state == DELAYED)
+       if (call->state == DELAYED)
                _delayed_call_dequeue(call);
-       else if (call->state == IDLE)
+       else
                result = FALSE;
 
        call->param1    = 0;
        call->deadline  = deadline;
 
-       delayed = &delayed_call_queues[cpu_number()];
+       queue = &PROCESSOR_DATA(current_processor(), timer_call_queue);
 
-       _delayed_call_enqueue(delayed, call);
+       _delayed_call_enqueue(queue, call);
 
-       if (queue_first(delayed) == qe(call))
+       if (queue_first(queue) == qe(call))
                _set_delayed_call_timer(call);
 
        simple_unlock(&timer_call_lock);
@@ -205,27 +162,25 @@ timer_call_enter1(
        uint64_t                                deadline)
 {
        boolean_t               result = TRUE;
-       queue_t                 delayed;
+       queue_t                 queue;
        spl_t                   s;
 
        s = splclock();
        simple_lock(&timer_call_lock);
 
-       if (call->state == PENDING)
-               _pending_call_dequeue(call);
-       else if (call->state == DELAYED)
+       if (call->state == DELAYED)
                _delayed_call_dequeue(call);
-       else if (call->state == IDLE)
+       else
                result = FALSE;
 
        call->param1    = param1;
        call->deadline  = deadline;
 
-       delayed = &delayed_call_queues[cpu_number()];
+       queue = &PROCESSOR_DATA(current_processor(), timer_call_queue);
 
-       _delayed_call_enqueue(delayed, call);
+       _delayed_call_enqueue(queue, call);
 
-       if (queue_first(delayed) == qe(call))
+       if (queue_first(queue) == qe(call))
                _set_delayed_call_timer(call);
 
        simple_unlock(&timer_call_lock);
@@ -244,9 +199,7 @@ timer_call_cancel(
        s = splclock();
        simple_lock(&timer_call_lock);
 
-       if (call->state == PENDING)
-               _pending_call_dequeue(call);
-       else if (call->state == DELAYED)
+       if (call->state == DELAYED)
                _delayed_call_dequeue(call);
        else
                result = FALSE;
@@ -280,19 +233,57 @@ timer_call_is_delayed(
        return (result);
 }
 
+/*
+ * Called at splclock.
+ */
+
+void
+timer_call_shutdown(
+       processor_t                     processor)
+{
+       timer_call_t            call;
+       queue_t                         queue, myqueue;
+
+       assert(processor != current_processor());
+
+       queue = &PROCESSOR_DATA(processor, timer_call_queue);
+       myqueue = &PROCESSOR_DATA(current_processor(), timer_call_queue);
+
+       simple_lock(&timer_call_lock);
+
+       call = TC(queue_first(queue));
+
+       while (!queue_end(queue, qe(call))) {
+               _delayed_call_dequeue(call);
+
+               _delayed_call_enqueue(myqueue, call);
+
+               call = TC(queue_first(queue));
+       }
+
+       call = TC(queue_first(myqueue));
+
+       if (!queue_end(myqueue, qe(call)))
+               _set_delayed_call_timer(call);
+
+       simple_unlock(&timer_call_lock);
+}
+
 static
 void
 timer_call_interrupt(
        uint64_t                                timestamp)
 {
        timer_call_t            call;
-       queue_t                         delayed = &delayed_call_queues[cpu_number()];
+       queue_t                         queue;
 
        simple_lock(&timer_call_lock);
 
-       call = TC(queue_first(delayed));
+       queue = &PROCESSOR_DATA(current_processor(), timer_call_queue);
+
+       call = TC(queue_first(queue));
 
-       while (!queue_end(delayed, qe(call))) {
+       while (!queue_end(queue, qe(call))) {
                if (call->deadline <= timestamp) {
                        timer_call_func_t               func;
                        timer_call_param_t              param0, param1;
@@ -312,10 +303,10 @@ timer_call_interrupt(
                else
                        break;
 
-               call = TC(queue_first(delayed));
+               call = TC(queue_first(queue));
        }
 
-       if (!queue_end(delayed, qe(call)))
+       if (!queue_end(queue, qe(call)))
                _set_delayed_call_timer(call);
 
        simple_unlock(&timer_call_lock);