X-Git-Url: https://git.saurik.com/apple/xnu.git/blobdiff_plain/8f6c56a50524aa785f7e596d52dddfb331e18961..593a1d5fd87cdf5b46dd5fcb84467b432cea0f91:/osfmk/kern/timer_call.c?ds=sidebyside diff --git a/osfmk/kern/timer_call.c b/osfmk/kern/timer_call.c index c1ffdabcf..941061c3d 100644 --- a/osfmk/kern/timer_call.c +++ b/osfmk/kern/timer_call.c @@ -1,6 +1,5 @@ /* - * Copyright (c) 1993-1995, 1999-2004 Apple Computer, Inc. - * All rights reserved. + * Copyright (c) 1993-2007 Apple Inc. All rights reserved. * * @APPLE_OSREFERENCE_LICENSE_HEADER_START@ * @@ -28,27 +27,23 @@ */ /* * Timer interrupt callout module. - * - * HISTORY - * - * 20 December 2000 (debo) - * Created. */ #include #include #include - +#include #include #include -decl_simple_lock_data(static,timer_call_lock) +#include -static struct { - int delayed_num, - delayed_hiwat; -} timer_call_vars; +#if CONFIG_DTRACE && (DEVELOPMENT || DEBUG ) +#include +#endif + +decl_simple_lock_data(static,timer_call_lock) static void timer_call_interrupt( @@ -103,8 +98,6 @@ _delayed_call_enqueue( } insque(qe(call), qe(current)); - if (++timer_call_vars.delayed_num > timer_call_vars.delayed_hiwat) - timer_call_vars.delayed_hiwat = timer_call_vars.delayed_num; call->state = DELAYED; } @@ -115,7 +108,6 @@ _delayed_call_dequeue( timer_call_t call) { (void)remque(qe(call)); - timer_call_vars.delayed_num--; call->state = IDLE; } @@ -125,7 +117,7 @@ void _set_delayed_call_timer( timer_call_t call) { - clock_set_timer_deadline(call->deadline); + etimer_set_deadline(call->deadline); } boolean_t @@ -145,7 +137,7 @@ timer_call_enter( else result = FALSE; - call->param1 = 0; + call->param1 = NULL; call->deadline = deadline; queue = &PROCESSOR_DATA(current_processor(), timer_call_queue); @@ -205,8 +197,18 @@ timer_call_cancel( s = splclock(); simple_lock(&timer_call_lock); - if (call->state == DELAYED) - _delayed_call_dequeue(call); + if (call->state == DELAYED) { + queue_t queue = &PROCESSOR_DATA(current_processor(), timer_call_queue); + + if (queue_first(queue) == qe(call)) { + _delayed_call_dequeue(call); + + if (!queue_empty(queue)) + _set_delayed_call_timer((timer_call_t)queue_first(queue)); + } + else + _delayed_call_dequeue(call); + } else result = FALSE; @@ -275,10 +277,8 @@ timer_call_shutdown( simple_unlock(&timer_call_lock); } -static -void -timer_call_interrupt( - uint64_t timestamp) +static void +timer_call_interrupt(uint64_t timestamp) { timer_call_t call; queue_t queue; @@ -302,11 +302,36 @@ timer_call_interrupt( simple_unlock(&timer_call_lock); + KERNEL_DEBUG_CONSTANT(MACHDBG_CODE(DBG_MACH_EXCP_DECI, + 2) + | DBG_FUNC_START, + (unsigned int)func, + (unsigned int)param0, + (unsigned int)param1, 0, 0); + +#if CONFIG_DTRACE && (DEVELOPMENT || DEBUG ) + DTRACE_TMR3(callout__start, timer_call_func_t, func, + timer_call_param_t, param0, + timer_call_param_t, param1); +#endif + (*func)(param0, param1); +#if CONFIG_DTRACE && (DEVELOPMENT || DEBUG ) + DTRACE_TMR3(callout__end, timer_call_func_t, func, + timer_call_param_t, param0, + timer_call_param_t, param1); +#endif + + KERNEL_DEBUG_CONSTANT(MACHDBG_CODE(DBG_MACH_EXCP_DECI, + 2) + | DBG_FUNC_END, + (unsigned int)func, + (unsigned int)param0, + (unsigned int)param1, 0, 0); + simple_lock(&timer_call_lock); - } - else + } else break; call = TC(queue_first(queue));