xnu-517.3.7.tar.gz

[apple/xnu.git] / bsd / uxkern / ux_exception.c

diff --git a/bsd/uxkern/ux_exception.c b/bsd/uxkern/ux_exception.c
index 7a4e53e45aa0d0f1d10a04abe84bac61036dc9e9..941d65c5d052dd37d83c9e4bba5583aaa89d0f93 100644 (file)
--- a/bsd/uxkern/ux_exception.c
+++ b/bsd/uxkern/ux_exception.c
@@ -3,19 +3,22 @@
  *
  * @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.
+ * Copyright (c) 1999-2003 Apple Computer, Inc.  All Rights Reserved.
  * 
- * This Original Code and all software distributed under the License are
- * distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * 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.
+ * 
+ * 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@
  */
@@ -42,6 +45,7 @@
 #include <mach/mig_errors.h>
 #include <kern/task.h>
 #include <kern/thread.h>
+#include <kern/sched_prim.h>
 #include <kern/thread_act.h>
 #include <kern/kalloc.h>
 
@@ -153,20 +157,14 @@ ux_handler(void)
 void
 ux_handler_init(void)
 {
-       task_t  handler_task;
-
        simple_lock_init(&ux_handler_init_lock);
        ux_exception_port = MACH_PORT_NULL;
-       if (kernel_task_create(kernel_task, 
-               0, 0, &handler_task) != MACH_MSG_SUCCESS) {
-               panic("Failed to created ux handler task\n");
-       }
-       (void) kernel_thread(handler_task, ux_handler);
+       (void) kernel_thread(kernel_task, ux_handler);
        simple_lock(&ux_handler_init_lock);
        if (ux_exception_port == MACH_PORT_NULL)  {
                simple_unlock(&ux_handler_init_lock);
                assert_wait(&ux_exception_port, THREAD_UNINT);
-               thread_block((void (*)(void)) 0);
+               thread_block(THREAD_CONTINUE_NULL);
                }
        else
                simple_unlock(&ux_handler_init_lock);
@@ -198,7 +196,7 @@ catch_exception_raise(
        (ipc_object_copyin(get_task_ipcspace(self), thread_name,
                       MACH_MSG_TYPE_PORT_SEND,
                       (void *) &thread_port) == MACH_MSG_SUCCESS)) {
-        if (IPC_OBJECT_VALID(thread_port)) {
+        if (IPC_PORT_VALID(thread_port)) {
           th_act = (thread_act_t)convert_port_to_act(thread_port);
           ipc_port_release(thread_port);
        } else {
@@ -306,6 +304,9 @@ void ux_exception(
            case EXC_UNIX_ABORT:
                *ux_signal = SIGABRT;
                break;
+           case EXC_SOFT_SIGNAL:
+               *ux_signal = SIGKILL;
+               break;
            }
            break;