xnu-1699.22.81.tar.gz

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

diff --git a/iokit/Kernel/IOConditionLock.cpp b/iokit/Kernel/IOConditionLock.cpp
index d4940b77e74745690d6b9105bd1011c6617494a6..9e2bd04cb076f841f8a420c3b1e8d0424567ec34 100644 (file)
--- a/iokit/Kernel/IOConditionLock.cpp
+++ b/iokit/Kernel/IOConditionLock.cpp
@@ -1,23 +1,29 @@
 /*
  * Copyright (c) 1998-2000 Apple Computer, Inc. All rights reserved.
  *
- * @APPLE_LICENSE_HEADER_START@
+ * @APPLE_OSREFERENCE_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.
+ * 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.
  * 
- * This Original Code and all software distributed under the License are
- * distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * 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 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_OSREFERENCE_LICENSE_HEADER_END@
  */
 /* Copyright (c) 1997 Apple Computer, Inc.  All rights reserved.
  * Copyright (c) 1994-1996 NeXT Software, Inc.  All rights reserved. 
@@ -36,7 +42,7 @@
 #define super OSObject
 OSDefineMetaClassAndStructors(IOConditionLock, OSObject)
 
-bool IOConditionLock::initWithCondition(int inCondition, bool inIntr = true)
+bool IOConditionLock::initWithCondition(int inCondition, bool inIntr)
 {
     if (!super::init())
         return false;
@@ -52,12 +58,12 @@ bool IOConditionLock::initWithCondition(int inCondition, bool inIntr = true)
     return cond_interlock && sleep_interlock;
 }
 
-IOConditionLock *IOConditionLock::withCondition(int condition, bool intr = true)
+IOConditionLock *IOConditionLock::withCondition(int condition, bool intr)
 {
     IOConditionLock *me = new IOConditionLock;
 
     if (me && !me->initWithCondition(condition, intr)) {
-        me->free();
+        me->release();
         return 0;
     }
 
@@ -101,7 +107,7 @@ void IOConditionLock::unlock()
     want_lock = false;
     if (waiting) {
        waiting = false;
-       thread_wakeup(this);    // Wakeup everybody
+       IOLockWakeup(sleep_interlock, this, /* one-thread */ false);    // Wakeup everybody
     }
 
     IOUnlock(sleep_interlock);
@@ -145,12 +151,7 @@ int IOConditionLock::lock()
     while (want_lock && thread_res == THREAD_AWAKENED)
     {
        waiting = true;
-
-        assert_wait((void *) this, interruptible);     /* assert event */
-       IOUnlock(sleep_interlock);                      /* release the lock */
-       thread_res = thread_block((void (*)(void)) 0);  /* block ourselves */
-
-        IOTakeLock(sleep_interlock);
+       thread_res = IOLockSleep(sleep_interlock, (void *) this, interruptible);
     }
     if (thread_res == THREAD_AWAKENED)
        want_lock = true;
@@ -191,8 +192,8 @@ int IOConditionLock::lockWhen(int inCondition)
         * of changes in _condition.
         */
         assert_wait((void *) &condition, interruptible); /* assert event */
-       IOUnlock(cond_interlock);                       /* release the lock */
-       thread_res = thread_block((void (*)(void)) 0);  /* block ourselves */
+       IOUnlock(cond_interlock);                        /* release the lock */
+       thread_res = thread_block(THREAD_CONTINUE_NULL); /* block ourselves */
     } while (thread_res == THREAD_AWAKENED);
     
     return thread_res;