xnu-792.21.3.tar.gz

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

diff --git a/osfmk/kern/mk_timer.c b/osfmk/kern/mk_timer.c
index df1d3fa700656026dfb1b3fdb1a4269182aa94c2..2fac290ece2d0a73947a6fb95d447dc1d2c73fb1 100644 (file)
--- a/osfmk/kern/mk_timer.c
+++ b/osfmk/kern/mk_timer.c
@@ -1,16 +1,19 @@
 /*
- * Copyright (c) 2000 Apple Computer, Inc. All rights reserved.
+ * Copyright (c) 2000-2004 Apple Computer, Inc. All rights reserved.
  *
- * @APPLE_LICENSE_HEADER_START@
- * 
- * Copyright (c) 1999-2003 Apple Computer, Inc.  All Rights Reserved.
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
  * 
  * 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.
+ * 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.
+ * 
+ * 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
@@ -20,7 +23,7 @@
  * 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.
@@ -32,6 +35,7 @@
  */
 
 #include <mach/mach_types.h>
+#include <mach/mach_traps.h>
 #include <mach/mach_port_server.h>
 
 #include <mach/mk_timer.h>
@@ -52,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();
@@ -70,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;
@@ -114,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;
@@ -137,7 +142,7 @@ mk_timer_init(void)
 static void
 mk_timer_expire(
        void                    *p0,
-       void                    *p1)
+       __unused void           *p1)
 {
        mk_timer_t                      timer = p0;
        ipc_port_t                      port;
@@ -174,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;
@@ -184,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;
@@ -208,18 +214,16 @@ mk_timer_destroy(
 }
 
 kern_return_t
-mk_timer_arm(
-       mach_port_name_t        name,
-       uint64_t                        expire_time)
+mk_timer_arm_trap(
+       struct mk_timer_arm_trap_args *args)
 {
-       uint64_t                        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);
@@ -232,7 +236,6 @@ mk_timer_arm(
                ip_unlock(port);
 
                if (!timer->is_dead) {
-                       timer->time_of_arming = time_of_arming;
                        timer->is_armed = TRUE;
 
                        if (!thread_call_enter_delayed(&timer->call_entry, expire_time))
@@ -250,10 +253,11 @@ mk_timer_arm(
 }
 
 kern_return_t
-mk_timer_cancel(
-       mach_port_name_t        name,
-       uint64_t                        *result_time)
+mk_timer_cancel_trap(
+       struct mk_timer_cancel_trap_args *args)
 {
+       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();
@@ -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;