/*
* Copyright (c) 1998-2000 Apple Computer, Inc. All rights reserved.
*
- * @APPLE_LICENSE_HEADER_START@
+ * @APPLE_LICENSE_OSREFERENCE_HEADER_START@
*
- * Copyright (c) 1999-2003 Apple Computer, Inc. All Rights Reserved.
- *
- * 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. Please obtain a copy of the License at
- * http://www.opensource.apple.com/apsl/ and read it before using this
+ * 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
+ *
+ * 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_HEADER_END@
+ *
+ * @APPLE_LICENSE_OSREFERENCE_HEADER_END@
*/
/*
Copyright (c) 1998 Apple Computer, Inc. All rights reserved.
// 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);
#define fFlags loopRestart
-extern "C" extern void stack_privilege( thread_t thread);
-
-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
return false;
controlG = IOCommandGate::
- commandGate(this, (IOCommandGate::Action) &IOWorkLoop::_maintRequest);
+ commandGate(this, OSMemberFunctionCast(IOCommandGate::Action,
+ this, &IOWorkLoop::_maintRequest));
if ( !controlG )
return false;
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;
IOWorkLoop *me = new IOWorkLoop;
if (me && !me->init()) {
- me->free();
+ me->release();
return 0;
}
#endif /* KDEBUG */
-void IOWorkLoop::threadMainContinuation()
-{
- IOWorkLoop* self;
- self = (IOWorkLoop *) thread_get_cont_arg();
-
- self->threadMain();
-}
-
-void IOWorkLoop::threadMain()
+/* virtual */ bool IOWorkLoop::runEventSources()
{
- 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_set_cont_arg((int) this);
- thread_block(&threadMainContinuation);
+ thread_continue_t cptr = OSMemberFunctionCast(
+ thread_continue_t, this, &IOWorkLoop::threadMain);
+ thread_block_parameter(cptr, this);
/* NOTREACHED */
}
// 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
}
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;
projects / apple / xnu.git / blobdiff