xnu-792.24.17.tar.gz

[apple/xnu.git] / iokit / Kernel / IOWorkLoop.cpp

diff --git a/iokit/Kernel/IOWorkLoop.cpp b/iokit/Kernel/IOWorkLoop.cpp
index a6bfd4673a6bb9f9ee44f05c0a367f1dbc78b450..4108eaac9930d4faf401676750c65a5e0c3f454a 100644 (file)
--- a/iokit/Kernel/IOWorkLoop.cpp
+++ b/iokit/Kernel/IOWorkLoop.cpp
@@ -3,22 +3,19 @@
  *
  * @APPLE_LICENSE_HEADER_START@
  * 
- * Copyright (c) 1999-2003 Apple Computer, Inc.  All Rights Reserved.
+ * 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.
- * 
- * The Original Code and all software distributed under the License are
- * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * This 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, QUIET ENJOYMENT OR NON-INFRINGEMENT.
- * Please see the License for the specific language governing rights and
- * limitations under the License.
+ * FITNESS FOR A PARTICULAR PURPOSE OR NON-INFRINGEMENT.  Please see the
+ * License for the specific language governing rights and limitations
+ * under the License.
  * 
  * @APPLE_LICENSE_HEADER_END@
  */
@@ -60,18 +57,6 @@ static inline bool ISSETP(void *addr, unsigned int flag)
 
 #define fFlags loopRestart
 
-extern "C" extern void stack_privilege( thread_t thread);
-
-void IOWorkLoop::launchThreadMain(void *self)
-{
-    register thread_t mythread = current_thread();
-
-    // Make sure that this thread always has a kernel stack
-    stack_privilege(mythread);
-    thread_set_cont_arg((int) self);
-    threadMainContinuation();
-}
-
 bool IOWorkLoop::init()
 {
     // The super init and gateLock allocation MUST be done first
@@ -99,7 +84,7 @@ bool IOWorkLoop::init()
     if (addEventSource(controlG) != kIOReturnSuccess)
         return false;
 
-    workThread = IOCreateThread(launchThreadMain, (void *) this);
+    workThread = IOCreateThread((thread_continue_t)threadMainContinuation, this);
     if (!workThread)
         return false;
 
@@ -112,7 +97,7 @@ IOWorkLoop::workLoop()
     IOWorkLoop *me = new IOWorkLoop;
 
     if (me && !me->init()) {
-        me->free();
+        me->release();
         return 0;
     }
 
@@ -255,12 +240,9 @@ do {                                                                       \
 
 #endif /* KDEBUG */
 
-void IOWorkLoop::threadMainContinuation()
+void IOWorkLoop::threadMainContinuation(IOWorkLoop *self)
 {
-  IOWorkLoop* self;
-  self = (IOWorkLoop *) thread_get_cont_arg();
-
-  self->threadMain();
+       self->threadMain();
 }
 
 void IOWorkLoop::threadMain()
@@ -303,8 +285,7 @@ void IOWorkLoop::threadMain()
            assert_wait((void *) &workToDo, false);
            IOSimpleLockUnlockEnableInterrupt(workToDoLock, is);
 
-           thread_set_cont_arg((int) this);
-           thread_block(&threadMainContinuation);
+           thread_block_parameter((thread_continue_t)threadMainContinuation, this);
            /* NOTREACHED */
        }
 
@@ -376,8 +357,8 @@ void IOWorkLoop::wakeupGate(void *event, bool oneThread)
 }
 
 IOReturn IOWorkLoop::runAction(Action inAction, OSObject *target,
-                                  void *arg0 = 0, void *arg1 = 0,
-                                  void *arg2 = 0, void *arg3 = 0)
+                                  void *arg0, void *arg1,
+                                  void *arg2, void *arg3)
 {
     IOReturn res;