xnu-792.25.20.tar.gz

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

diff --git a/iokit/Kernel/IOWorkLoop.cpp b/iokit/Kernel/IOWorkLoop.cpp
index 4108eaac9930d4faf401676750c65a5e0c3f454a..81e03f4ab69ea9d91726f50fcf158bb81385b420 100644 (file)
--- a/iokit/Kernel/IOWorkLoop.cpp
+++ b/iokit/Kernel/IOWorkLoop.cpp
@@ -38,8 +38,8 @@ OSDefineMetaClassAndStructors(IOWorkLoop, OSObject);
 
 // Block of unused functions intended for future use
 OSMetaClassDefineReservedUsed(IOWorkLoop, 0);
+OSMetaClassDefineReservedUsed(IOWorkLoop, 1);
 
-OSMetaClassDefineReservedUnused(IOWorkLoop, 1);
 OSMetaClassDefineReservedUnused(IOWorkLoop, 2);
 OSMetaClassDefineReservedUnused(IOWorkLoop, 3);
 OSMetaClassDefineReservedUnused(IOWorkLoop, 4);
@@ -70,7 +70,8 @@ bool IOWorkLoop::init()
         return false;
 
     controlG = IOCommandGate::
-       commandGate(this, (IOCommandGate::Action) &IOWorkLoop::_maintRequest);
+       commandGate(this, OSMemberFunctionCast(IOCommandGate::Action,
+                                       this, &IOWorkLoop::_maintRequest));
     if ( !controlG )
         return false;
 
@@ -84,7 +85,9 @@ bool IOWorkLoop::init()
     if (addEventSource(controlG) != kIOReturnSuccess)
         return false;
 
-    workThread = IOCreateThread((thread_continue_t)threadMainContinuation, this);
+    IOThreadFunc cptr =
+       OSMemberFunctionCast(IOThreadFunc, this, &IOWorkLoop::threadMain);
+    workThread = IOCreateThread(cptr, this);
     if (!workThread)
         return false;
 
@@ -240,52 +243,55 @@ do {                                                                      \
 
 #endif /* KDEBUG */
 
-void IOWorkLoop::threadMainContinuation(IOWorkLoop *self)
+/* virtual */ bool IOWorkLoop::runEventSources()
 {
-       self->threadMain();
-}
-
-void IOWorkLoop::threadMain()
-{
-    CLRP(&fFlags, kLoopRestart);
-
-    for (;;) {
-        bool more;
-       IOInterruptState is;
+    bool res = false;
+    closeGate();
+    if (ISSETP(&fFlags, kLoopTerminate))
+       goto abort;
 
     IOTimeWorkS();
+    bool more;
+    do {
+       CLRP(&fFlags, kLoopRestart);
+       workToDo = more = false;
+       for (IOEventSource *evnt = eventChain; evnt; evnt = evnt->getNext()) {
+
+           IOTimeClientS();
+           more |= evnt->checkForWork();
+           IOTimeClientE();
+
+           if (ISSETP(&fFlags, kLoopTerminate))
+               goto abort;
+           else if (fFlags & kLoopRestart) {
+               more = true;
+               break;
+           }
+       }
+    } while (more);
 
-        closeGate();
-        if (ISSETP(&fFlags, kLoopTerminate))
-           goto exitThread;
-
-        do {
-            workToDo = more = false;
-            for (IOEventSource *event = eventChain; event; event = event->getNext()) {
-
-            IOTimeClientS();
-                more |= event->checkForWork();
-            IOTimeClientE();
-
-               if (ISSETP(&fFlags, kLoopTerminate))
-                   goto exitThread;
-                else if (fFlags & kLoopRestart) {
-                   CLRP(&fFlags, kLoopRestart);
-                    continue;
-                }
-            }
-        } while (more);
-
+    res = true;
     IOTimeWorkE();
 
-        openGate();
+abort:
+    openGate();
+    return res;
+}
+
+/* virtual */ void IOWorkLoop::threadMain()
+{
+    do {
+       if ( !runEventSources() )
+           goto exitThread;
 
-       is = IOSimpleLockLockDisableInterrupt(workToDoLock);
+       IOInterruptState is = IOSimpleLockLockDisableInterrupt(workToDoLock);
         if ( !ISSETP(&fFlags, kLoopTerminate) && !workToDo) {
            assert_wait((void *) &workToDo, false);
            IOSimpleLockUnlockEnableInterrupt(workToDoLock, is);
 
-           thread_block_parameter((thread_continue_t)threadMainContinuation, this);
+           thread_continue_t cptr = OSMemberFunctionCast(
+                   thread_continue_t, this, &IOWorkLoop::threadMain);
+           thread_block_parameter(cptr, this);
            /* NOTREACHED */
        }
 
@@ -293,11 +299,7 @@ void IOWorkLoop::threadMain()
        // to commit suicide.  But no matter 
        // Clear the simple lock and retore the interrupt state
        IOSimpleLockUnlockEnableInterrupt(workToDoLock, is);
-       if (workToDo)
-           continue;
-       else
-           break;
-    }
+    } while(workToDo);
 
 exitThread:
     workThread = 0;    // Say we don't have a loop and free ourselves