Loading...
--- xnu/xnu-792.10.96/iokit/Kernel/IOWorkLoop.cpp
+++ xnu/xnu-124.7/iokit/Kernel/IOWorkLoop.cpp
@@ -37,9 +37,8 @@
OSDefineMetaClassAndStructors(IOWorkLoop, OSObject);
// Block of unused functions intended for future use
-OSMetaClassDefineReservedUsed(IOWorkLoop, 0);
-OSMetaClassDefineReservedUsed(IOWorkLoop, 1);
-
+OSMetaClassDefineReservedUnused(IOWorkLoop, 0);
+OSMetaClassDefineReservedUnused(IOWorkLoop, 1);
OSMetaClassDefineReservedUnused(IOWorkLoop, 2);
OSMetaClassDefineReservedUnused(IOWorkLoop, 3);
OSMetaClassDefineReservedUnused(IOWorkLoop, 4);
@@ -57,6 +56,16 @@
#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
@@ -70,8 +79,7 @@
return false;
controlG = IOCommandGate::
- commandGate(this, OSMemberFunctionCast(IOCommandGate::Action,
- this, &IOWorkLoop::_maintRequest));
+ commandGate(this, (IOCommandGate::Action) &IOWorkLoop::_maintRequest);
if ( !controlG )
return false;
@@ -85,9 +93,7 @@
if (addEventSource(controlG) != kIOReturnSuccess)
return false;
- IOThreadFunc cptr =
- OSMemberFunctionCast(IOThreadFunc, this, &IOWorkLoop::threadMain);
- workThread = IOCreateThread(cptr, this);
+ workThread = IOCreateThread(launchThreadMain, (void *) this);
if (!workThread)
return false;
@@ -100,7 +106,7 @@
IOWorkLoop *me = new IOWorkLoop;
if (me && !me->init()) {
- me->release();
+ me->free();
return 0;
}
@@ -243,55 +249,61 @@
#endif /* KDEBUG */
-/* virtual */ bool IOWorkLoop::runEventSources()
-{
- bool res = false;
- closeGate();
- if (ISSETP(&fFlags, kLoopTerminate))
- goto abort;
+void IOWorkLoop::threadMainContinuation()
+{
+ IOWorkLoop* self;
+ self = (IOWorkLoop *) thread_get_cont_arg();
+
+ self->threadMain();
+}
+
+void IOWorkLoop::threadMain()
+{
+ CLRP(&fFlags, kLoopRestart);
+
+ for (;;) {
+ bool more;
+ IOInterruptState is;
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);
-
- res = true;
+
+ 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);
+
IOTimeWorkE();
-abort:
- openGate();
- return res;
-}
-
-/* virtual */ void IOWorkLoop::threadMain()
-{
- do {
- if ( !runEventSources() )
- goto exitThread;
-
- IOInterruptState is = IOSimpleLockLockDisableInterrupt(workToDoLock);
+ openGate();
+
+ is = IOSimpleLockLockDisableInterrupt(workToDoLock);
if ( !ISSETP(&fFlags, kLoopTerminate) && !workToDo) {
assert_wait((void *) &workToDo, false);
IOSimpleLockUnlockEnableInterrupt(workToDoLock, is);
- thread_continue_t cptr = OSMemberFunctionCast(
- thread_continue_t, this, &IOWorkLoop::threadMain);
- thread_block_parameter(cptr, this);
+#if defined (__i386__)
+ thread_block(0);
+ continue;
+#else
+ thread_set_cont_arg((int) this);
+ thread_block(&threadMainContinuation);
+#endif
/* NOTREACHED */
}
@@ -299,12 +311,16 @@
// to commit suicide. But no matter
// Clear the simple lock and retore the interrupt state
IOSimpleLockUnlockEnableInterrupt(workToDoLock, is);
- } while(workToDo);
+ if (workToDo)
+ continue;
+ else
+ break;
+ }
exitThread:
workThread = 0; // Say we don't have a loop and free ourselves
free();
- IOExitThread();
+ IOExitThread(0);
}
IOThread IOWorkLoop::getThread() const
@@ -358,20 +374,6 @@
IORecursiveLockWakeup(gateLock, event, oneThread);
}
-IOReturn IOWorkLoop::runAction(Action inAction, OSObject *target,
- void *arg0, void *arg1,
- void *arg2, void *arg3)
-{
- IOReturn res;
-
- // closeGate is recursive so don't worry if we already hold the lock.
- closeGate();
- res = (*inAction)(target, arg0, arg1, arg2, arg3);
- openGate();
-
- return res;
-}
-
IOReturn IOWorkLoop::_maintRequest(void *inC, void *inD, void *, void *)
{
maintCommandEnum command = (maintCommandEnum) (vm_address_t) inC;
@@ -381,48 +383,43 @@
switch (command)
{
case mAddEvent:
- 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);
- }
+ 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 (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());
+ 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;
}
-
- inEvent->setWorkLoop(0);
- inEvent->setNext(0);
- inEvent->release();
- SETP(&fFlags, kLoopRestart);
+ event->setNext(inEvent->getNext());
}
+
+ inEvent->setWorkLoop(0);
+ inEvent->setNext(0);
+ inEvent->release();
+ SETP(&fFlags, kLoopRestart);
break;
default: