From owner-cvs-all@FreeBSD.ORG Tue Aug 1 17:40:14 2006 Return-Path: X-Original-To: cvs-all@FreeBSD.org Delivered-To: cvs-all@FreeBSD.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 69C9516A4DA; Tue, 1 Aug 2006 17:40:14 +0000 (UTC) (envelope-from jhb@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 3286643D45; Tue, 1 Aug 2006 17:40:14 +0000 (GMT) (envelope-from jhb@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k71HeEkh020276; Tue, 1 Aug 2006 17:40:14 GMT (envelope-from jhb@repoman.freebsd.org) Received: (from jhb@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k71HeEsP020273; Tue, 1 Aug 2006 17:40:14 GMT (envelope-from jhb) Message-Id: <200608011740.k71HeEsP020273@repoman.freebsd.org> From: John Baldwin Date: Tue, 1 Aug 2006 17:40:13 +0000 (UTC) To: src-committers@FreeBSD.org, cvs-src@FreeBSD.org, cvs-all@FreeBSD.org X-FreeBSD-CVS-Branch: RELENG_6 Cc: Subject: cvs commit: src/sys/conf files src/sys/kern kern_mutex.c kern_sx.c subr_lock.c subr_turnstile.c subr_witness.c src/sys/sys lock.h mutex.h X-BeenThere: cvs-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: CVS commit messages for the entire tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 01 Aug 2006 17:40:14 -0000 jhb 2006-08-01 17:40:13 UTC FreeBSD src repository Modified files: (Branch: RELENG_6) sys/conf files sys/kern kern_mutex.c kern_sx.c subr_turnstile.c subr_witness.c sys/sys lock.h mutex.h Added files: (Branch: RELENG_6) sys/kern subr_lock.c Log: MFC: Sync up with HEAD in some of the locking primitive details: - Teach WITNESS_SAVE() and WITNESS_RESTORE() to work with spin locks instead of only sleep locks. - Do the extra step required when destroying a locked spin mutex. - Initialize thread0.td_contested in init_turnstiles() rather than mutex_init(). - Add LOCK_CLASS() macro and sync with HEAD on its usage. For RELENG_6 this just maps to lock->lo_class. (In HEAD lo_class was removed an array index was encoded into lo_flags instead.) - Add subr_lock.c including adding lock_init() and lock_destroy() functions as we as moving the 'show lock' command into this file from kern_mutex.c. Revision Changes Path 1.1031.2.34 +1 -0 src/sys/conf/files 1.154.2.6 +31 -49 src/sys/kern/kern_mutex.c 1.25.2.2 +3 -16 src/sys/kern/kern_sx.c 1.4.2.1 +100 -0 src/sys/kern/subr_lock.c (new) 1.152.2.3 +1 -0 src/sys/kern/subr_turnstile.c 1.195.2.10 +48 -38 src/sys/kern/subr_witness.c 1.52.2.2 +12 -5 src/sys/sys/lock.h 1.79.2.3 +1 -1 src/sys/sys/mutex.h