xnu-792.24.17.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 6680727634af7fa247db645816fb8790138bb3ce..6b6d15d23a626fafa58bd47da4c9693b875c6bf5 100644 (file)
--- a/osfmk/kern/mk_timer.c
+++ b/osfmk/kern/mk_timer.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000 Apple Computer, Inc. All rights reserved.
+ * Copyright (c) 2000-2004 Apple Computer, Inc. All rights reserved.
  *
  * @APPLE_LICENSE_HEADER_START@
  * 
@@ -29,6 +29,7 @@
  */
 
 #include <mach/mach_types.h>
+#include <mach/mach_traps.h>
 #include <mach/mach_port_server.h>
 
 #include <mach/mk_timer.h>
@@ -49,7 +50,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 +69,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 +113,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 +124,7 @@ mk_timer_port_destroy(
 }
 
 void
-mk_timer_initialize(void)
+mk_timer_init(void)
 {
        int                     s = sizeof (mk_timer_data_t);
 
@@ -134,14 +136,11 @@ mk_timer_initialize(void)
 static void
 mk_timer_expire(
        void                    *p0,
-       void                    *p1)
+       __unused void           *p1)
 {
-       uint64_t                        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 +151,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 +164,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 +173,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 +183,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 +208,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);
@@ -234,11 +229,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,10 +247,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 +284,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;