Loading...
--- xnu/xnu-2050.7.9/iokit/Kernel/IOLocks.cpp
+++ xnu/xnu-1228/iokit/Kernel/IOLocks.cpp
@@ -25,6 +25,15 @@
*
* @APPLE_OSREFERENCE_LICENSE_HEADER_END@
*/
+/*
+ * Copyright (c) 1998 Apple Computer, Inc. All rights reserved.
+ *
+ * HISTORY
+ *
+ */
+
+
+#define IOLOCKS_CPP 1
#include <IOKit/system.h>
@@ -186,6 +195,7 @@
int res;
assert(lock->thread == IOThreadSelf());
+ assert(lock->count == 1 || interType == THREAD_UNINT);
lock->count = 0;
lock->thread = 0;
@@ -200,29 +210,6 @@
return res;
}
-int IORecursiveLockSleepDeadline( IORecursiveLock * _lock, void *event,
- AbsoluteTime deadline, UInt32 interType)
-{
- _IORecursiveLock * lock = (_IORecursiveLock *)_lock;
- UInt32 count = lock->count;
- int res;
-
- assert(lock->thread == IOThreadSelf());
-
- lock->count = 0;
- lock->thread = 0;
- res = lck_mtx_sleep_deadline(lock->mutex, LCK_SLEEP_DEFAULT, (event_t) event,
- (wait_interrupt_t) interType, __OSAbsoluteTime(deadline));
-
- // Must re-establish the recursive lock no matter why we woke up
- // otherwise we would potentially leave the return path corrupted.
- assert(lock->thread == 0);
- assert(lock->count == 0);
- lock->thread = IOThreadSelf();
- lock->count = count;
- return res;
-}
-
void IORecursiveLockWakeup(IORecursiveLock *, void *event, bool oneThread)
{
thread_wakeup_prim((event_t) event, oneThread, THREAD_AWAKENED);