Loading...
--- xnu/xnu-792.22.5/iokit/Kernel/IOWorkLoop.cpp
+++ xnu/xnu-201/iokit/Kernel/IOWorkLoop.cpp
@@ -1,29 +1,23 @@
/*
* Copyright (c) 1998-2000 Apple Computer, Inc. All rights reserved.
*
- * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
+ * @APPLE_LICENSE_HEADER_START@
*
- * 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.
+ * 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.
*
- * 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_OSREFERENCE_LICENSE_HEADER_END@
+ * @APPLE_LICENSE_HEADER_END@
*/
/*
Copyright (c) 1998 Apple Computer, Inc. All rights reserved.
@@ -44,8 +38,8 @@
// 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);
@@ -63,6 +57,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
@@ -76,8 +80,7 @@
return false;
controlG = IOCommandGate::
- commandGate(this, OSMemberFunctionCast(IOCommandGate::Action,
- this, &IOWorkLoop::_maintRequest));
+ commandGate(this, (IOCommandGate::Action) &IOWorkLoop::_maintRequest);
if ( !controlG )
return false;
@@ -91,9 +94,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;
@@ -106,7 +107,7 @@
IOWorkLoop *me = new IOWorkLoop;
if (me && !me->init()) {
- me->release();
+ me->free();
return 0;
}
@@ -249,55 +250,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 */
}
@@ -305,12 +312,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
@@ -365,8 +376,8 @@
}
IOReturn IOWorkLoop::runAction(Action inAction, OSObject *target,
- void *arg0, void *arg1,
- void *arg2, void *arg3)
+ void *arg0 = 0, void *arg1 = 0,
+ void *arg2 = 0, void *arg3 = 0)
{
IOReturn res;
@@ -387,48 +398,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: