xnu-517.tar.gz

[apple/xnu.git] / iokit / Kernel / IOWorkLoop.cpp

diff --git a/iokit/Kernel/IOWorkLoop.cpp b/iokit/Kernel/IOWorkLoop.cpp
index 1581f38ca02a226847681d898ce06cbac57de65c..79b96d20262e30f237e0139ab05e37e5ec022984 100644 (file)
--- a/iokit/Kernel/IOWorkLoop.cpp
+++ b/iokit/Kernel/IOWorkLoop.cpp
@@ -3,19 +3,22 @@
  *
  * @APPLE_LICENSE_HEADER_START@
  * 
  *
  * @APPLE_LICENSE_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.
+ * Copyright (c) 1999-2003 Apple Computer, Inc.  All Rights Reserved.

  * 
  * 

- * This Original Code and all software distributed under the License are
- * distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * 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
+ * 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,
  * 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.
+ * 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_HEADER_END@
  */


@@ -59,10 +62,6 @@ static inline bool ISSETP(void *addr, unsigned int flag)
 
 void IOWorkLoop::launchThreadMain(void *self)
 {
 
 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();
 }
     thread_set_cont_arg((int) self);
     threadMainContinuation();
 }


@@ -107,7 +106,7 @@ IOWorkLoop::workLoop()
     IOWorkLoop *me = new IOWorkLoop;
 
     if (me && !me->init()) {
     IOWorkLoop *me = new IOWorkLoop;
 
     if (me && !me->init()) {

-        me->free();
+        me->release();

         return 0;
     }
 
         return 0;
     }
 


@@ -298,13 +297,8 @@ void IOWorkLoop::threadMain()
            assert_wait((void *) &workToDo, false);
            IOSimpleLockUnlockEnableInterrupt(workToDoLock, is);
 
            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);
            thread_set_cont_arg((int) this);
            thread_block(&threadMainContinuation);

-#endif

            /* NOTREACHED */
        }
 
            /* NOTREACHED */
        }
 


@@ -321,7 +315,7 @@ void IOWorkLoop::threadMain()
 exitThread:
     workThread = 0;    // Say we don't have a loop and free ourselves
     free();
 exitThread:
     workThread = 0;    // Say we don't have a loop and free ourselves
     free();

-    IOExitThread(0);
+    IOExitThread();

 }
 
 IOThread IOWorkLoop::getThread() const
 }
 
 IOThread IOWorkLoop::getThread() const


@@ -376,8 +370,8 @@ void IOWorkLoop::wakeupGate(void *event, bool oneThread)
 }
 
 IOReturn IOWorkLoop::runAction(Action inAction, OSObject *target,
 }
 
 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;
 
 {
     IOReturn res;
 


@@ -398,43 +392,48 @@ IOReturn IOWorkLoop::_maintRequest(void *inC, void *inD, void *, void *)
     switch (command)
     {
     case mAddEvent:
     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:
         }
         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:
         break;
 
     default: