X-Git-Url: https://git.saurik.com/apple/xnu.git/blobdiff_plain/1c79356b52d46aa6b508fb032f5ae709b1f2897b..89b3af67bb32e691275bf6fa803d1834b2284115:/osfmk/kern/mk_timer.c diff --git a/osfmk/kern/mk_timer.c b/osfmk/kern/mk_timer.c index 0f6850a13..2fac290ec 100644 --- a/osfmk/kern/mk_timer.c +++ b/osfmk/kern/mk_timer.c @@ -1,23 +1,29 @@ /* - * Copyright (c) 2000 Apple Computer, Inc. All rights reserved. + * Copyright (c) 2000-2004 Apple Computer, 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@ */ /* * Copyright (c) 2000 Apple Computer, Inc. All rights reserved. @@ -29,6 +35,7 @@ */ #include +#include #include #include @@ -49,7 +56,8 @@ static void mk_timer_expire( void *p1); mach_port_name_t -mk_timer_create(void) +mk_timer_create_trap( + __unused struct mk_timer_create_trap_args *args) { mk_timer_t timer; ipc_space_t myspace = current_space(); @@ -67,12 +75,12 @@ mk_timer_create(void) result = ipc_port_translate_receive(myspace, name, &port); if (result != KERN_SUCCESS) { - zfree(mk_timer_zone, (vm_offset_t)timer); + zfree(mk_timer_zone, timer); return (MACH_PORT_NULL); } - simple_lock_init(&timer->lock, ETAP_MISC_TIMER); + simple_lock_init(&timer->lock, 0); call_entry_setup(&timer->call_entry, mk_timer_expire, timer); timer->is_armed = timer->is_dead = FALSE; timer->active = 0; @@ -111,7 +119,7 @@ mk_timer_port_destroy( timer->is_dead = TRUE; if (timer->active == 0) { simple_unlock(&timer->lock); - zfree(mk_timer_zone, (vm_offset_t)timer); + zfree(mk_timer_zone, timer); ipc_port_release_send(port); return; @@ -122,7 +130,7 @@ mk_timer_port_destroy( } void -mk_timer_initialize(void) +mk_timer_init(void) { int s = sizeof (mk_timer_data_t); @@ -134,14 +142,11 @@ mk_timer_initialize(void) static void mk_timer_expire( void *p0, - void *p1) + __unused void *p1) { - AbsoluteTime time_of_posting; mk_timer_t timer = p0; ipc_port_t port; - clock_get_uptime(&time_of_posting); - simple_lock(&timer->lock); if (timer->active > 1) { @@ -152,17 +157,12 @@ mk_timer_expire( port = timer->port; assert(port != IP_NULL); + assert(timer->active == 1); - while ( timer->is_armed && - !thread_call_is_delayed(&timer->call_entry, NULL) ) { + while (timer->is_armed && timer->active == 1) { mk_timer_expire_msg_t msg; timer->is_armed = FALSE; - - msg.time_of_arming = timer->time_of_arming; - msg.armed_time = timer->call_entry.deadline; - msg.time_of_posting = time_of_posting; - simple_unlock(&timer->lock); msg.header.msgh_bits = MACH_MSGH_BITS(MACH_MSG_TYPE_COPY_SEND, 0); @@ -170,6 +170,8 @@ mk_timer_expire( msg.header.msgh_local_port = MACH_PORT_NULL; msg.header.msgh_reserved = msg.header.msgh_id = 0; + msg.unused[0] = msg.unused[1] = msg.unused[2] = 0; + (void) mach_msg_send_from_kernel(&msg.header, sizeof (msg)); simple_lock(&timer->lock); @@ -177,7 +179,7 @@ mk_timer_expire( if (--timer->active == 0 && timer->is_dead) { simple_unlock(&timer->lock); - zfree(mk_timer_zone, (vm_offset_t)timer); + zfree(mk_timer_zone, timer); ipc_port_release_send(port); return; @@ -187,9 +189,10 @@ mk_timer_expire( } kern_return_t -mk_timer_destroy( - mach_port_name_t name) +mk_timer_destroy_trap( + struct mk_timer_destroy_trap_args *args) { + mach_port_name_t name = args->name; ipc_space_t myspace = current_space(); ipc_port_t port; kern_return_t result; @@ -211,18 +214,16 @@ mk_timer_destroy( } kern_return_t -mk_timer_arm( - mach_port_name_t name, - AbsoluteTime expire_time) +mk_timer_arm_trap( + struct mk_timer_arm_trap_args *args) { - AbsoluteTime time_of_arming; + mach_port_name_t name = args->name; + uint64_t expire_time = args->expire_time; mk_timer_t timer; ipc_space_t myspace = current_space(); ipc_port_t port; kern_return_t result; - clock_get_uptime(&time_of_arming); - result = ipc_port_translate_receive(myspace, name, &port); if (result != KERN_SUCCESS) return (result); @@ -234,11 +235,13 @@ mk_timer_arm( assert(timer->port == port); ip_unlock(port); - timer->time_of_arming = time_of_arming; - timer->is_armed = TRUE; + if (!timer->is_dead) { + timer->is_armed = TRUE; + + if (!thread_call_enter_delayed(&timer->call_entry, expire_time)) + timer->active++; + } - if (!thread_call_enter_delayed(&timer->call_entry, expire_time)) - timer->active++; simple_unlock(&timer->lock); } else { @@ -250,11 +253,12 @@ mk_timer_arm( } kern_return_t -mk_timer_cancel( - mach_port_name_t name, - AbsoluteTime *result_time) +mk_timer_cancel_trap( + struct mk_timer_cancel_trap_args *args) { - AbsoluteTime armed_time = { 0, 0 }; + mach_port_name_t name = args->name; + mach_vm_address_t result_time_addr = args->result_time; + uint64_t armed_time = 0; mk_timer_t timer; ipc_space_t myspace = current_space(); ipc_port_t port; @@ -286,8 +290,8 @@ mk_timer_cancel( } if (result == KERN_SUCCESS) - if ( result_time != NULL && - copyout((void *)&armed_time, (void *)result_time, + if ( result_time_addr != 0 && + copyout((void *)&armed_time, result_time_addr, sizeof (armed_time)) != 0 ) result = KERN_FAILURE;