Loading...
--- xnu/xnu-1504.7.4/iokit/Kernel/IOLocks.cpp
+++ xnu/xnu-344.12.2/iokit/Kernel/IOLocks.cpp
@@ -1,30 +1,31 @@
/*
- * Copyright (c) 1998-2007 Apple Inc. All rights reserved.
+ * Copyright (c) 1998-2000 Apple Computer, Inc. All rights reserved.
*
- * @APPLE_OSREFERENCE_LICENSE_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.
+ * 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.
*
- * 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
+ * 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, QUIET ENJOYMENT OR NON-INFRINGEMENT.
- * Please see the License for the specific language governing rights and
- * limitations under the License.
+ * FITNESS FOR A PARTICULAR PURPOSE OR NON-INFRINGEMENT. Please see the
+ * License for the specific language governing rights and limitations
+ * under the License.
*
- * @APPLE_OSREFERENCE_LICENSE_HEADER_END@
- */
+ * @APPLE_LICENSE_HEADER_END@
+ */
+/*
+ * Copyright (c) 1998 Apple Computer, Inc. All rights reserved.
+ *
+ * HISTORY
+ *
+ */
+
#include <IOKit/system.h>
@@ -32,98 +33,58 @@
#include <IOKit/IOLib.h>
#include <IOKit/assert.h>
-#include <IOKit/IOLocksPrivate.h>
-
extern "C" {
-#include <kern/locks.h>
+#include <kern/simple_lock.h>
+#include <machine/machine_routines.h>
+
+IOLock * IOLockAlloc( void )
+{
+ return( mutex_alloc(ETAP_IO_AHA) );
+}
+
+void IOLockFree( IOLock * lock)
+{
+ mutex_free( lock );
+}
void IOLockInitWithState( IOLock * lock, IOLockState state)
{
if( state == kIOLockStateLocked)
- lck_mtx_lock( lock);
-}
-
-IOLock * IOLockAlloc( void )
-{
- return( lck_mtx_alloc_init(IOLockGroup, LCK_ATTR_NULL) );
-}
-
-void IOLockFree( IOLock * lock)
-{
- lck_mtx_free( lock, IOLockGroup);
-}
-
-lck_mtx_t * IOLockGetMachLock( IOLock * lock)
-{
- return( (lck_mtx_t *)lock);
-}
-
-int IOLockSleep( IOLock * lock, void *event, UInt32 interType)
-{
- return (int) lck_mtx_sleep(lock, LCK_SLEEP_DEFAULT, (event_t) event, (wait_interrupt_t) interType);
-}
-
-int IOLockSleepDeadline( IOLock * lock, void *event,
- AbsoluteTime deadline, UInt32 interType)
-{
- return (int) lck_mtx_sleep_deadline(lock, LCK_SLEEP_DEFAULT, (event_t) event,
- (wait_interrupt_t) interType, __OSAbsoluteTime(deadline));
-}
-
-void IOLockWakeup(IOLock * lock, void *event, bool oneThread)
-{
- thread_wakeup_prim((event_t) event, oneThread, THREAD_AWAKENED);
-}
-
+ IOLockLock( lock);
+}
struct _IORecursiveLock {
- lck_mtx_t *mutex;
- lck_grp_t *group;
- thread_t thread;
- UInt32 count;
+ mutex_t * mutex;
+ thread_t thread;
+ UInt32 count;
};
-IORecursiveLock * IORecursiveLockAllocWithLockGroup( lck_grp_t * lockGroup )
+IORecursiveLock * IORecursiveLockAlloc( void )
{
_IORecursiveLock * lock;
- if( lockGroup == 0 )
+ lock = IONew( _IORecursiveLock, 1);
+ if( !lock)
return( 0 );
- lock = IONew( _IORecursiveLock, 1 );
- if( !lock )
- return( 0 );
-
- lock->mutex = lck_mtx_alloc_init( lockGroup, LCK_ATTR_NULL );
- if( lock->mutex ) {
- lock->group = lockGroup;
+ lock->mutex = mutex_alloc(ETAP_IO_AHA);
+ if( lock->mutex) {
lock->thread = 0;
lock->count = 0;
} else {
- IODelete( lock, _IORecursiveLock, 1 );
+ IODelete( lock, _IORecursiveLock, 1);
lock = 0;
}
return( (IORecursiveLock *) lock );
}
-
-IORecursiveLock * IORecursiveLockAlloc( void )
-{
- return IORecursiveLockAllocWithLockGroup( IOLockGroup );
-}
-
void IORecursiveLockFree( IORecursiveLock * _lock )
{
_IORecursiveLock * lock = (_IORecursiveLock *)_lock;
-
- lck_mtx_free( lock->mutex, lock->group );
- IODelete( lock, _IORecursiveLock, 1 );
-}
-
-lck_mtx_t * IORecursiveLockGetMachLock( IORecursiveLock * lock )
-{
- return( lock->mutex );
+
+ mutex_free( lock->mutex );
+ IODelete( lock, _IORecursiveLock, 1);
}
void IORecursiveLockLock( IORecursiveLock * _lock)
@@ -133,7 +94,7 @@
if( lock->thread == IOThreadSelf())
lock->count++;
else {
- lck_mtx_lock( lock->mutex );
+ mutex_lock( lock->mutex );
assert( lock->thread == 0 );
assert( lock->count == 0 );
lock->thread = IOThreadSelf();
@@ -149,7 +110,7 @@
lock->count++;
return( true );
} else {
- if( lck_mtx_try_lock( lock->mutex )) {
+ if( mutex_try( lock->mutex )) {
assert( lock->thread == 0 );
assert( lock->count == 0 );
lock->thread = IOThreadSelf();
@@ -168,7 +129,7 @@
if( 0 == (--lock->count)) {
lock->thread = 0;
- lck_mtx_unlock( lock->mutex );
+ mutex_unlock( lock->mutex );
}
}
@@ -186,10 +147,11 @@
int res;
assert(lock->thread == IOThreadSelf());
+ assert(lock->count == 1 || interType == THREAD_UNINT);
lock->count = 0;
lock->thread = 0;
- res = lck_mtx_sleep(lock->mutex, LCK_SLEEP_DEFAULT, (event_t) event, (wait_interrupt_t) interType);
+ res = thread_sleep_mutex((event_t) event, lock->mutex, (int) interType);
// Must re-establish the recursive lock no matter why we woke up
// otherwise we would potentially leave the return path corrupted.
@@ -200,29 +162,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);
@@ -234,17 +173,16 @@
IORWLock * IORWLockAlloc( void )
{
- return( lck_rw_alloc_init(IOLockGroup, LCK_ATTR_NULL) );
+ IORWLock * lock;
+
+ lock = lock_alloc( true, ETAP_IO_AHA, ETAP_IO_AHA);
+
+ return( lock);
}
void IORWLockFree( IORWLock * lock)
{
- lck_rw_free( lock, IOLockGroup);
-}
-
-lck_rw_t * IORWLockGetMachLock( IORWLock * lock)
-{
- return( (lck_rw_t *)lock);
+ lock_free( lock );
}
@@ -254,22 +192,23 @@
IOSimpleLock * IOSimpleLockAlloc( void )
{
- return( lck_spin_alloc_init( IOLockGroup, LCK_ATTR_NULL) );
+ IOSimpleLock * lock;
+
+ lock = (IOSimpleLock *) IOMalloc( sizeof(IOSimpleLock));
+ if( lock)
+ IOSimpleLockInit( lock );
+
+ return( lock );
}
void IOSimpleLockInit( IOSimpleLock * lock)
{
- lck_spin_init( lock, IOLockGroup, LCK_ATTR_NULL);
+ simple_lock_init( (simple_lock_t) lock, ETAP_IO_AHA );
}
void IOSimpleLockFree( IOSimpleLock * lock )
{
- lck_spin_free( lock, IOLockGroup);
-}
-
-lck_spin_t * IOSimpleLockGetMachLock( IOSimpleLock * lock)
-{
- return( (lck_spin_t *)lock);
+ IOFree( lock, sizeof(IOSimpleLock));
}
} /* extern "C" */