X-Git-Url: https://git.saurik.com/apple/xnu.git/blobdiff_plain/e5568f75972dfc723778653c11cb6b4dc825716a..ff6e181ae92fc6f1e89841290f461d1f2f9badd9:/osfmk/kern/ast.c diff --git a/osfmk/kern/ast.c b/osfmk/kern/ast.c index 7540375ce..a0181460f 100644 --- a/osfmk/kern/ast.c +++ b/osfmk/kern/ast.c @@ -1,21 +1,22 @@ /* - * Copyright (c) 2000 Apple Computer, Inc. All rights reserved. + * Copyright (c) 2000-2004 Apple Computer, Inc. All rights reserved. * * @APPLE_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. Please obtain a copy of the License at + * http://www.opensource.apple.com/apsl/ and read it before using this + * file. * - * This Original Code and all software distributed under the License are - * distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY KIND, EITHER + * 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@ */ @@ -60,7 +61,6 @@ */ #include -#include #include #include @@ -70,24 +70,18 @@ #include #include #include -#include -#include #include #include +#include #include -volatile ast_t need_ast[NCPUS]; +#ifdef __ppc__ +#include // for CHUD AST hook +#endif void ast_init(void) { -#ifndef MACHINE_AST - register int i; - - for (i=0; istate & TH_IDLE)) { + if (!(thread->state & TH_IDLE)) { /* * Check for urgent preemption. */ if ( (reasons & AST_URGENT) && - wait_queue_assert_possible(self) ) { + wait_queue_assert_possible(thread) ) { if (reasons & AST_PREEMPT) { counter(c_ast_taken_block++); - thread_block_reason(THREAD_CONTINUE_NULL, + thread_block_reason(THREAD_CONTINUE_NULL, NULL, AST_PREEMPT | AST_URGENT); } @@ -137,11 +148,8 @@ ast_taken( * Handle BSD hook. */ if (reasons & AST_BSD) { - extern void bsd_ast(thread_act_t act); - thread_act_t act = self->top_act; - - thread_ast_clear(act, AST_BSD); - bsd_ast(act); + thread_ast_clear(thread, AST_BSD); + bsd_ast(thread); } #endif @@ -159,15 +167,15 @@ ast_taken( if (reasons & AST_PREEMPT) { processor_t myprocessor = current_processor(); - if (csw_needed(self, myprocessor)) + if (csw_needed(thread, myprocessor)) reasons = AST_PREEMPT; else reasons = AST_NONE; } if ( (reasons & AST_PREEMPT) && - wait_queue_assert_possible(self) ) { + wait_queue_assert_possible(thread) ) { counter(c_ast_taken_block++); - thread_block_reason(thread_exception_return, AST_PREEMPT); + thread_block_reason((thread_continue_t)thread_exception_return, NULL, AST_PREEMPT); } } } @@ -182,30 +190,22 @@ void ast_check( processor_t processor) { - register thread_t self = processor->active_thread; + register thread_t thread = processor->active_thread; - processor->current_pri = self->sched_pri; - if (processor->state == PROCESSOR_RUNNING) { + processor->current_pri = thread->sched_pri; + if ( processor->state == PROCESSOR_RUNNING || + processor->state == PROCESSOR_SHUTDOWN ) { register ast_t preempt; -processor_running: /* * Propagate thread ast to processor. */ - ast_propagate(self->top_act->ast); + ast_propagate(thread->ast); /* * Context switch check. */ - if ((preempt = csw_check(self, processor)) != AST_NONE) + if ((preempt = csw_check(thread, processor)) != AST_NONE) ast_on(preempt); } - else - if ( processor->state == PROCESSOR_DISPATCHING || - processor->state == PROCESSOR_IDLE ) { - return; - } - else - if (processor->state == PROCESSOR_SHUTDOWN) - goto processor_running; }