From owner-freebsd-arch@FreeBSD.ORG  Tue Apr  1 00:40:49 2003
Return-Path: <owner-freebsd-arch@FreeBSD.ORG>
Delivered-To: freebsd-arch@freebsd.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id ED87337B401
	for <arch@freebsd.org>; Tue,  1 Apr 2003 00:40:49 -0800 (PST)
Received: from storm.FreeBSD.org.uk (storm.FreeBSD.org.uk [194.242.157.42])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 0ABC443FB1
	for <arch@freebsd.org>; Tue,  1 Apr 2003 00:40:49 -0800 (PST)
	(envelope-from mark@grondar.org)
Received: from storm.FreeBSD.org.uk (Ugrondar@localhost [127.0.0.1])
	by storm.FreeBSD.org.uk (8.12.7/8.12.7) with ESMTP id h318elpT087197;
	Tue, 1 Apr 2003 09:40:47 +0100 (BST)
	(envelope-from mark@grondar.org)
Received: (from Ugrondar@localhost)h318elOD087196;
	Tue, 1 Apr 2003 09:40:47 +0100 (BST)
X-Authentication-Warning: storm.FreeBSD.org.uk: Ugrondar set sender to
	mark@grondar.org using -f
Received: from grondar.org (localhost [127.0.0.1])h318bZ4j060918;
	Tue, 1 Apr 2003 09:37:35 +0100 (BST)	(envelope-from mark@grondar.org)
From: Mark Murray <mark@grondar.org>
Message-Id: <200304010837.h318bZ4j060918@grimreaper.grondar.org>
To: Poul-Henning Kamp <phk@phk.freebsd.dk>
In-Reply-To: Your message of "Tue, 01 Apr 2003 10:22:30 +0200."
             <31464.1049185350@critter.freebsd.dk> 
Date: Tue, 01 Apr 2003 09:37:35 +0100
Sender: mark@grondar.org
cc: arch@freebsd.org
Subject: Re: #include <sys/lock.h> and <sys/mutex.h> 
X-BeenThere: freebsd-arch@freebsd.org
X-Mailman-Version: 2.1.1
Precedence: list
List-Id: Discussion related to FreeBSD architecture
	<freebsd-arch.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/freebsd-arch>,
	<mailto:freebsd-arch-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/freebsd-arch>
List-Post: <mailto:freebsd-arch@freebsd.org>
List-Help: <mailto:freebsd-arch-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/freebsd-arch>,
	<mailto:freebsd-arch-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 01 Apr 2003 08:40:50 -0000

Poul-Henning Kamp writes:
> My present predicament is that I will probably put a mutex in the
> bio queue which is defined in <sys/bio.h>, and so far, I've found
> 20 .c files where I need to add <sys/lock.h> and <sys/mutex.h> and
> I am not yet at a point where LINT compiles.
> 
> Do we have a plan for these in the future ?  I can see three obvious
> options:
> 
> A) define them leaf #includes, and #include them from the majority of
>    our .c files.
> 
> B) Include them nested from other .h files which need them, in my
>    case <sys/bio.h>
> 
> C) Include them nested from a central .h file like <sys/kernel.h>

Do you need the whole sys/lock.h and sys/mutex.h? Can you get by with
#including sys/_lock.h and/or sys/_mutex.h in sys/bio.h? And possibly
following up by adding the non-underscore variants in the hopefully
few places where they are actually needed.

M
--
Mark Murray
iumop ap!sdn w,I idlaH