Loading...
--- xnu/xnu-792.12.6/iokit/Kernel/IOWorkLoop.cpp
+++ xnu/xnu-124.1/iokit/Kernel/IOWorkLoop.cpp
@@ -1,31 +1,23 @@
/*
* Copyright (c) 1998-2000 Apple Computer, Inc. All rights reserved.
*
- * @APPLE_LICENSE_OSREFERENCE_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.
- *
- * 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@
+ * 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@
*/
/*
Copyright (c) 1998 Apple Computer, Inc. All rights reserved.
@@ -45,8 +37,7 @@
OSDefineMetaClassAndStructors(IOWorkLoop, OSObject);
// Block of unused functions intended for future use
-OSMetaClassDefineReservedUsed(IOWorkLoop, 0);
-
+OSMetaClassDefineReservedUnused(IOWorkLoop, 0);
OSMetaClassDefineReservedUnused(IOWorkLoop, 1);
OSMetaClassDefineReservedUnused(IOWorkLoop, 2);
OSMetaClassDefineReservedUnused(IOWorkLoop, 3);
@@ -65,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
@@ -92,7 +93,7 @@
if (addEventSource(controlG) != kIOReturnSuccess)
return false;
- workThread = IOCreateThread((thread_continue_t)threadMainContinuation, this);
+ workThread = IOCreateThread(launchThreadMain, (void *) this);
if (!workThread)
return false;
@@ -105,7 +106,7 @@
IOWorkLoop *me = new IOWorkLoop;
if (me && !me->init()) {
- me->release();
+ me->free();
return 0;
}
@@ -248,9 +249,12 @@
#endif /* KDEBUG */
-void IOWorkLoop::threadMainContinuation(IOWorkLoop *self)
-{
- self->threadMain();
+void IOWorkLoop::threadMainContinuation()
+{
+ IOWorkLoop* self;
+ self = (IOWorkLoop *) thread_get_cont_arg();
+
+ self->threadMain();
}
void IOWorkLoop::threadMain()
@@ -293,7 +297,13 @@
assert_wait((void *) &workToDo, false);
IOSimpleLockUnlockEnableInterrupt(workToDoLock, is);
- thread_block_parameter((thread_continue_t)threadMainContinuation, this);
+#if defined (__i386__)
+ thread_block(0);
+ continue;
+#else
+ thread_set_cont_arg((int) this);
+ thread_block(&threadMainContinuation);
+#endif
/* NOTREACHED */
}
@@ -310,7 +320,7 @@
exitThread:
workThread = 0; // Say we don't have a loop and free ourselves
free();
- IOExitThread();
+ IOExitThread(0);
}
IOThread IOWorkLoop::getThread() const
@@ -364,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;
@@ -387,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: