X-Git-Url: https://git.saurik.com/apple/xnu.git/blobdiff_plain/e5568f75972dfc723778653c11cb6b4dc825716a..593a1d5fd87cdf5b46dd5fcb84467b432cea0f91:/osfmk/kern/timer_call.c?ds=sidebyside diff --git a/osfmk/kern/timer_call.c b/osfmk/kern/timer_call.c index cf5d481f1..941061c3d 100644 --- a/osfmk/kern/timer_call.c +++ b/osfmk/kern/timer_call.c @@ -1,61 +1,49 @@ /* - * Copyright (c) 1993-1995, 1999-2000 Apple Computer, Inc. - * All rights reserved. + * Copyright (c) 1993-2007 Apple Inc. All rights reserved. * - * @APPLE_LICENSE_HEADER_START@ + * @APPLE_OSREFERENCE_LICENSE_HEADER_START@ * - * The contents of this file constitute Original Code as defined in and - * are subject to the Apple Public Source License Version 1.1 (the - * "License"). You may not use this file except in compliance with the - * License. Please obtain a copy of the License at - * http://www.apple.com/publicsource and read it before using this file. + * 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. 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. * - * This Original Code and all software distributed under the License are - * distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY KIND, EITHER + * 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 * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES, * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE OR NON-INFRINGEMENT. Please see the - * License for the specific language governing rights and limitations - * under the License. + * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT. + * Please see the License for the specific language governing rights and + * limitations under the License. * - * @APPLE_LICENSE_HEADER_END@ + * @APPLE_OSREFERENCE_LICENSE_HEADER_END@ */ /* * Timer interrupt callout module. - * - * HISTORY - * - * 20 December 2000 (debo) - * Created. */ #include #include #include - +#include #include #include -#ifdef i386 -/* - * Until we arrange for per-cpu timers, use the master cpus queues only. - * Fortunately, the timer_call_lock synchronizes access to all queues. - */ -#undef cpu_number() -#define cpu_number() 0 -#endif /* i386 */ - -decl_simple_lock_data(static,timer_call_lock) +#include -static -queue_head_t - timer_call_queues[NCPUS]; +#if CONFIG_DTRACE && (DEVELOPMENT || DEBUG ) +#include +#endif -static struct { - int delayed_num, - delayed_hiwat; -} timer_call_vars; +decl_simple_lock_data(static,timer_call_lock) static void timer_call_interrupt( @@ -68,16 +56,12 @@ void timer_call_initialize(void) { spl_t s; - int i; - 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(&timer_call_queues[i]); - clock_set_timer_func((clock_timer_func_t)timer_call_interrupt); simple_unlock(&timer_call_lock); @@ -114,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; } @@ -126,7 +108,6 @@ _delayed_call_dequeue( timer_call_t call) { (void)remque(qe(call)); - timer_call_vars.delayed_num--; call->state = IDLE; } @@ -136,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 @@ -156,10 +137,10 @@ timer_call_enter( else result = FALSE; - call->param1 = 0; + call->param1 = NULL; call->deadline = deadline; - queue = &timer_call_queues[cpu_number()]; + queue = &PROCESSOR_DATA(current_processor(), timer_call_queue); _delayed_call_enqueue(queue, call); @@ -193,7 +174,7 @@ timer_call_enter1( call->param1 = param1; call->deadline = deadline; - queue = &timer_call_queues[cpu_number()]; + queue = &PROCESSOR_DATA(current_processor(), timer_call_queue); _delayed_call_enqueue(queue, call); @@ -216,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; @@ -263,8 +254,8 @@ timer_call_shutdown( assert(processor != current_processor()); - queue = &timer_call_queues[processor->slot_num]; - myqueue = &timer_call_queues[cpu_number()]; + queue = &PROCESSOR_DATA(processor, timer_call_queue); + myqueue = &PROCESSOR_DATA(current_processor(), timer_call_queue); simple_lock(&timer_call_lock); @@ -286,16 +277,16 @@ 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 = &timer_call_queues[cpu_number()]; + queue_t queue; simple_lock(&timer_call_lock); + queue = &PROCESSOR_DATA(current_processor(), timer_call_queue); + call = TC(queue_first(queue)); while (!queue_end(queue, qe(call))) { @@ -311,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));