Rename rb.h to rbtree.h, as it is more appropriate (c.f. ptree.h). Also

helps find code that hasn't been updated to use the new rbtree API.
This commit is contained in:
matt 2010-09-25 01:42:38 +00:00
parent 46b35128cb
commit 19e6c76b2d
13 changed files with 31 additions and 30 deletions

View File

@ -1,4 +1,4 @@
/* $NetBSD: rb.c,v 1.7 2010/09/24 22:51:51 rmind Exp $ */
/* $NetBSD: rb.c,v 1.8 2010/09/25 01:42:38 matt Exp $ */
/*-
* Copyright (c) 2001 The NetBSD Foundation, Inc.
@ -70,9 +70,9 @@ __weak_alias(rb_tree_depths, _rb_tree_depths)
#endif
#ifdef RBTEST
#include "rb.h"
#include "rbtree.h"
#else
#include <sys/rb.h>
#include <sys/rbtree.h>
#endif
static void rb_tree_insert_rebalance(struct rb_tree *, struct rb_node *);

View File

@ -1,4 +1,4 @@
/* $NetBSD: prop_rb_impl.h,v 1.7 2008/06/30 20:14:09 matt Exp $ */
/* $NetBSD: prop_rb_impl.h,v 1.8 2010/09/25 01:42:38 matt Exp $ */
/*-
* Copyright (c) 2001 The NetBSD Foundation, Inc.
@ -33,7 +33,7 @@
#define _PROP_RB_IMPL_H_
#ifdef __NetBSD__
#include <sys/rb.h>
#include <sys/rbtree.h>
/*
* Define local names for common rb_tree functions.

View File

@ -1,4 +1,4 @@
# $NetBSD: mi,v 1.1509 2010/09/24 21:53:00 christos Exp $
# $NetBSD: mi,v 1.1510 2010/09/25 01:42:38 matt Exp $
#
# Note: don't delete entries from here - mark them as "obsolete" instead.
#
@ -2086,7 +2086,8 @@
./usr/include/sys/queue.h comp-c-include
./usr/include/sys/radioio.h comp-c-include
./usr/include/sys/ras.h comp-c-include
./usr/include/sys/rb.h comp-c-include
./usr/include/sys/rb.h comp-obsolete obsolete
./usr/include/sys/rbtree.h comp-c-include
./usr/include/sys/reboot.h comp-c-include
./usr/include/sys/resource.h comp-c-include
./usr/include/sys/resourcevar.h comp-c-include

View File

@ -1,4 +1,4 @@
/* $NetBSD: udf.h,v 1.42 2010/09/24 22:51:50 rmind Exp $ */
/* $NetBSD: udf.h,v 1.43 2010/09/25 01:42:40 matt Exp $ */
/*
* Copyright (c) 2006, 2008 Reinoud Zandijk
@ -30,7 +30,7 @@
#define _FS_UDF_UDF_H_
#include <sys/queue.h>
#include <sys/rb.h>
#include <sys/rbtree.h>
#include <sys/uio.h>
#include <sys/mutex.h>

View File

@ -1,4 +1,4 @@
/* $NetBSD: subr_lockdebug.c,v 1.42 2010/09/24 22:51:50 rmind Exp $ */
/* $NetBSD: subr_lockdebug.c,v 1.43 2010/09/25 01:42:39 matt Exp $ */
/*-
* Copyright (c) 2006, 2007, 2008 The NetBSD Foundation, Inc.
@ -34,7 +34,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: subr_lockdebug.c,v 1.42 2010/09/24 22:51:50 rmind Exp $");
__KERNEL_RCSID(0, "$NetBSD: subr_lockdebug.c,v 1.43 2010/09/25 01:42:39 matt Exp $");
#include "opt_ddb.h"
@ -48,7 +48,7 @@ __KERNEL_RCSID(0, "$NetBSD: subr_lockdebug.c,v 1.42 2010/09/24 22:51:50 rmind Ex
#include <sys/cpu.h>
#include <sys/atomic.h>
#include <sys/lock.h>
#include <sys/rb.h>
#include <sys/rbtree.h>
#include <machine/lock.h>

View File

@ -1,4 +1,4 @@
/* $NetBSD: npf_impl.h,v 1.2 2010/09/16 04:53:27 rmind Exp $ */
/* $NetBSD: npf_impl.h,v 1.3 2010/09/25 01:42:39 matt Exp $ */
/*-
* Copyright (c) 2009-2010 The NetBSD Foundation, Inc.
@ -37,7 +37,7 @@
#ifndef _NPF_IMPL_H_
#define _NPF_IMPL_H_
#include <sys/rb.h>
#include <sys/rbtree.h>
#include <sys/hash.h>
#include <sys/queue.h>
#include <sys/types.h>

View File

@ -1,4 +1,4 @@
/* $NetBSD: nfsmount.h,v 1.49 2009/03/14 14:46:11 dsl Exp $ */
/* $NetBSD: nfsmount.h,v 1.50 2010/09/25 01:42:39 matt Exp $ */
/*
* Copyright (c) 1989, 1993
@ -42,7 +42,7 @@
#include <sys/rwlock.h>
#include <sys/mutex.h>
#include <sys/disk.h>
#include <sys/rb.h>
#include <sys/rbtree.h>
#endif
/*

View File

@ -1,4 +1,4 @@
/* $NetBSD: nfsnode.h,v 1.71 2009/03/14 14:46:11 dsl Exp $ */
/* $NetBSD: nfsnode.h,v 1.72 2010/09/25 01:42:39 matt Exp $ */
/*
* Copyright (c) 1989, 1993
@ -40,7 +40,7 @@
#include <sys/condvar.h>
#include <sys/mutex.h>
#include <sys/rb.h>
#include <sys/rbtree.h>
#ifndef _NFS_NFS_H_
#include <nfs/nfs.h>

View File

@ -1,4 +1,4 @@
# $NetBSD: Makefile,v 1.127 2010/06/01 13:52:08 tnozaki Exp $
# $NetBSD: Makefile,v 1.128 2010/09/25 01:42:40 matt Exp $
.include <bsd.sys.mk>
@ -27,7 +27,7 @@ INCS= acct.h agpio.h aio.h ansi.h aout_mids.h ataio.h atomic.h audioio.h \
param.h pipe.h pmc.h poll.h pool.h power.h proc.h \
protosw.h pset.h ptrace.h ptree.h \
queue.h \
ras.h rb.h reboot.h radioio.h resource.h resourcevar.h rmd160.h \
ras.h rbtree.h reboot.h radioio.h resource.h resourcevar.h rmd160.h \
rnd.h rwlock.h sa.h satypes.h \
scanio.h sched.h scsiio.h sdt.h select.h selinfo.h sem.h sha1.h \
sha2.h shm.h siginfo.h signal.h signalvar.h sigtypes.h simplelock.h \

View File

@ -1,4 +1,4 @@
/* $NetBSD: rb.h,v 1.14 2010/09/24 22:51:51 rmind Exp $ */
/* $NetBSD: rbtree.h,v 1.1 2010/09/25 01:42:40 matt Exp $ */
/*-
* Copyright (c) 2001 The NetBSD Foundation, Inc.
@ -29,8 +29,8 @@
* POSSIBILITY OF SUCH DAMAGE.
*/
#ifndef _SYS_RB_H_
#define _SYS_RB_H_
#ifndef _SYS_RBTREE_H_
#define _SYS_RBTREE_H_
#if defined(_KERNEL) || defined(_STANDALONE)
#include <sys/types.h>
@ -191,4 +191,4 @@ void rb_tree_depths(const rb_tree_t *, size_t *);
__END_DECLS
#endif /* _SYS_RB_H_*/
#endif /* _SYS_RBTREE_H_*/

View File

@ -1,4 +1,4 @@
/* $NetBSD: uvm_map.h,v 1.64 2009/08/01 16:35:51 yamt Exp $ */
/* $NetBSD: uvm_map.h,v 1.65 2010/09/25 01:42:40 matt Exp $ */
/*
* Copyright (c) 1997 Charles D. Cranor and Washington University.
@ -110,7 +110,7 @@
#endif /* _KERNEL */
#include <sys/rb.h>
#include <sys/rbtree.h>
#include <sys/pool.h>
#include <sys/rwlock.h>
#include <sys/mutex.h>

View File

@ -1,4 +1,4 @@
/* $NetBSD: uvm_object.h,v 1.27 2010/09/24 22:51:51 rmind Exp $ */
/* $NetBSD: uvm_object.h,v 1.28 2010/09/25 01:42:40 matt Exp $ */
/*
*
@ -41,7 +41,7 @@
* uvm_object.h
*/
#include <sys/rb.h>
#include <sys/rbtree.h>
/*
* uvm_object: all that is left of mach objects.

View File

@ -1,4 +1,4 @@
/* $NetBSD: uvm_page.h,v 1.60 2010/07/29 10:54:51 hannken Exp $ */
/* $NetBSD: uvm_page.h,v 1.61 2010/09/25 01:42:40 matt Exp $ */
/*
* Copyright (c) 1997 Charles D. Cranor and Washington University.
@ -118,7 +118,7 @@
#include <uvm/uvm_extern.h>
#include <uvm/uvm_pglist.h>
#include <sys/rb.h>
#include <sys/rbtree.h>
struct vm_page {
struct rb_node rb_node; /* tree of pages in obj (O) */