Loading...
--- xnu/xnu-201.14/iokit/Kernel/IOWorkLoop.cpp
+++ xnu/xnu-792.13.8/iokit/Kernel/IOWorkLoop.cpp
@@ -1,23 +1,31 @@
/*
* Copyright (c) 1998-2000 Apple Computer, Inc. All rights reserved.
*
- * @APPLE_LICENSE_HEADER_START@
+ * @APPLE_LICENSE_OSREFERENCE_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.
- *
- * 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 OR NON-INFRINGEMENT. Please see the
- * License for the specific language governing rights and limitations
- * under the License.
- *
- * @APPLE_LICENSE_HEADER_END@
+ * 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. The rights granted to you under the
+ * License may not be used to create, or enable the creation or
+ * redistribution of, unlawful or unlicensed copies of an Apple operating
+ * system, or to circumvent, violate, or enable the circumvention or
+ * violation of, any terms of an Apple operating system software license
+ * agreement.
+ *
+ * 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, QUIET ENJOYMENT OR NON-INFRINGEMENT.
+ * Please see the License for the specific language governing rights and
+ * limitations under the License.
+ *
+ * @APPLE_LICENSE_OSREFERENCE_HEADER_END@
*/
/*
Copyright (c) 1998 Apple Computer, Inc. All rights reserved.
@@ -38,8 +46,8 @@
// Block of unused functions intended for future use
OSMetaClassDefineReservedUsed(IOWorkLoop, 0);
-
-OSMetaClassDefineReservedUnused(IOWorkLoop, 1);
+OSMetaClassDefineReservedUsed(IOWorkLoop, 1);
+
OSMetaClassDefineReservedUnused(IOWorkLoop, 2);
OSMetaClassDefineReservedUnused(IOWorkLoop, 3);
OSMetaClassDefineReservedUnused(IOWorkLoop, 4);
@@ -57,16 +65,6 @@
#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
@@ -80,7 +78,8 @@
return false;
controlG = IOCommandGate::
- commandGate(this, (IOCommandGate::Action) &IOWorkLoop::_maintRequest);
+ commandGate(this, OSMemberFunctionCast(IOCommandGate::Action,
+ this, &IOWorkLoop::_maintRequest));
if ( !controlG )
return false;
@@ -94,7 +93,9 @@
if (addEventSource(controlG) != kIOReturnSuccess)
return false;
- workThread = IOCreateThread(launchThreadMain, (void *) this);
+ IOThreadFunc cptr =
+ OSMemberFunctionCast(IOThreadFunc, this, &IOWorkLoop::threadMain);
+ workThread = IOCreateThread(cptr, this);
if (!workThread)
return false;
@@ -107,7 +108,7 @@
IOWorkLoop *me = new IOWorkLoop;
if (me && !me->init()) {
- me->free();
+ me->release();
return 0;
}
@@ -250,61 +251,55 @@
#endif /* KDEBUG */
-void IOWorkLoop::threadMainContinuation()
-{
- IOWorkLoop* self;
- self = (IOWorkLoop *) thread_get_cont_arg();
-
- self->threadMain();
-}
-
-void IOWorkLoop::threadMain()
-{
- CLRP(&fFlags, kLoopRestart);
-
- for (;;) {
- bool more;
- IOInterruptState is;
+/* virtual */ bool IOWorkLoop::runEventSources()
+{
+ bool res = false;
+ closeGate();
+ if (ISSETP(&fFlags, kLoopTerminate))
+ goto abort;
IOTimeWorkS();
-
- closeGate();
- if (ISSETP(&fFlags, kLoopTerminate))
+ 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;
+ IOTimeWorkE();
+
+abort:
+ openGate();
+ return res;
+}
+
+/* virtual */ void IOWorkLoop::threadMain()
+{
+ do {
+ if ( !runEventSources() )
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();
-
- openGate();
-
- is = IOSimpleLockLockDisableInterrupt(workToDoLock);
+ IOInterruptState is = IOSimpleLockLockDisableInterrupt(workToDoLock);
if ( !ISSETP(&fFlags, kLoopTerminate) && !workToDo) {
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_continue_t cptr = OSMemberFunctionCast(
+ thread_continue_t, this, &IOWorkLoop::threadMain);
+ thread_block_parameter(cptr, this);
/* NOTREACHED */
}
@@ -312,16 +307,12 @@
// 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
free();
- IOExitThread(0);
+ IOExitThread();
}
IOThread IOWorkLoop::getThread() const
@@ -376,8 +367,8 @@
}
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 +389,48 @@
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: