xnu-517.tar.gz

[apple/xnu.git] / bsd / kern / kern_lock.c

diff --git a/bsd/kern/kern_lock.c b/bsd/kern/kern_lock.c
index 117407d6db5d4d1c80f97cd64b0f8d2a64c9c2cb..b7a2269fcfc138c15ce3c45c0cb9ce1a2871452f 100644 (file)
--- a/bsd/kern/kern_lock.c
+++ b/bsd/kern/kern_lock.c
@@ -1,21 +1,24 @@
 /*
- * Copyright (c) 2000 Apple Computer, Inc. All rights reserved.
+ * Copyright (c) 2000-2001 Apple Computer, Inc. All rights reserved.
  *
  * @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,
- * 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@
  */
@@ -189,7 +192,7 @@ lockmgr(lkp, flags, interlkp, p)
        int extflags;
        void *self;
 
-       error = 0; self = current_thread();
+       error = 0; self = current_act();
        if (p)
                pid = p->p_pid;
        else
@@ -384,9 +387,11 @@ lockmgr(lkp, flags, interlkp, p)
                if (lkp->lk_exclusivecount != 0) {
                        if (pid != lkp->lk_lockholder ||
                                        lkp->lk_lockthread != self)
-                               panic("lockmgr: pid %d, not %s %d unlocking",
-                                   pid, "exclusive lock holder",
-                                   lkp->lk_lockholder);
+                               panic("lockmgr: pid %d, thread 0x%8x,"
+                                       " not exclusive lock holder pid %d"
+                                       " thread 0x%8x unlocking, exclusive count %d",
+                                   pid, self, lkp->lk_lockholder,
+                                       lkp->lk_lockthread, lkp->lk_exclusivecount);
                        lkp->lk_exclusivecount--;
                        COUNT(p, -1);
                        if (lkp->lk_exclusivecount == 0) {