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 1581f38ca02a226847681d898ce06cbac57de65c..4108eaac9930d4faf401676750c65a5e0c3f454a 100644 (file)
--- a/iokit/Kernel/IOWorkLoop.cpp
+++ b/iokit/Kernel/IOWorkLoop.cpp
@@ -57,16 +57,6 @@ static inline bool ISSETP(void *addr, unsigned int flag)
 
 #define fFlags loopRestart
 
-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
@@ -94,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;
 
@@ -107,7 +97,7 @@ IOWorkLoop::workLoop()
     IOWorkLoop *me = new IOWorkLoop;
 
     if (me && !me->init()) {
-        me->free();
+        me->release();
         return 0;
     }
 
@@ -250,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()
@@ -298,13 +285,7 @@ void IOWorkLoop::threadMain()
            assert_wait((void *) &workToDo, false);
            IOSimpleLockUnlockEnableInterrupt(workToDoLock, is);
 
-#if defined (__i386__)
-           thread_block(0);
-           continue;
-#else
-           thread_set_cont_arg((int) this);
-           thread_block(&threadMainContinuation);
-#endif
+           thread_block_parameter((thread_continue_t)threadMainContinuation, this);
            /* NOTREACHED */
        }
 
@@ -321,7 +302,7 @@ void IOWorkLoop::threadMain()
 exitThread:
     workThread = 0;    // Say we don't have a loop and free ourselves
     free();
-    IOExitThread(0);
+    IOExitThread();
 }
 
 IOThread IOWorkLoop::getThread() const
@@ -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;
 
@@ -398,43 +379,48 @@ IOReturn IOWorkLoop::_maintRequest(void *inC, void *inD, void *, void *)
     switch (command)
     {
     case mAddEvent:
-       SETP(&fFlags, kLoopRestart);
-        inEvent->retain();
-        inEvent->setWorkLoop(this);
-        inEvent->setNext(0);
-
-        if (!eventChain)
-            eventChain = inEvent;
-        else {
-            IOEventSource *event, *next;
-
-            for (event = eventChain; (next = event->getNext()); event = next)
-                ;
-            event->setNext(inEvent);
+        if (!inEvent->getWorkLoop()) {
+            SETP(&fFlags, kLoopRestart);
+
+            inEvent->retain();
+            inEvent->setWorkLoop(this);
+            inEvent->setNext(0);
+    
+            if (!eventChain)
+                eventChain = inEvent;
+            else {
+                IOEventSource *event, *next;
+    
+                for (event = eventChain; (next = event->getNext()); event = next)
+                    ;
+                event->setNext(inEvent);
+            }
         }
         break;
 
     case mRemoveEvent:
-        if (eventChain == inEvent)
-            eventChain = inEvent->getNext();
-        else {
-            IOEventSource *event, *next;
-
-            event = eventChain;
-            while ((next = event->getNext()) && next != inEvent)
-                event = next;
-
-            if (!next) {
-                res = kIOReturnBadArgument;
-                break;
+        if (inEvent->getWorkLoop()) {
+            if (eventChain == inEvent)
+                eventChain = inEvent->getNext();
+            else {
+                IOEventSource *event, *next;
+    
+                event = eventChain;
+                while ((next = event->getNext()) && next != inEvent)
+                    event = next;
+    
+                if (!next) {
+                    res = kIOReturnBadArgument;
+                    break;
+                }
+                event->setNext(inEvent->getNext());
             }
-            event->setNext(inEvent->getNext());
+    
+            inEvent->setWorkLoop(0);
+            inEvent->setNext(0);
+            inEvent->release();
+            SETP(&fFlags, kLoopRestart);
         }
-
-        inEvent->setWorkLoop(0);
-        inEvent->setNext(0);
-        inEvent->release();
-       SETP(&fFlags, kLoopRestart);
         break;
 
     default: