[src/trunk]: src Include radixtree in the kernel.

[ad <ad%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/1e024d3dd9c3
branches:  trunk
changeset: 466172:1e024d3dd9c3
user:      ad <ad%NetBSD.org@localhost>
date:      Sat Dec 14 15:30:37 2019 +0000

description:
Include radixtree in the kernel.

diffstat:

 distrib/sets/lists/comp/mi       |  3 ++-
 sys/kern/init_main.c             |  6 ++++--
 sys/lib/libkern/Makefile.libkern |  4 ++--
 sys/sys/Makefile                 |  6 +++---
 4 files changed, 11 insertions(+), 8 deletions(-)

diffs (89 lines):

diff -r cc806b9495e9 -r 1e024d3dd9c3 distrib/sets/lists/comp/mi
--- a/distrib/sets/lists/comp/mi        Sat Dec 14 15:21:51 2019 +0000
+++ b/distrib/sets/lists/comp/mi        Sat Dec 14 15:30:37 2019 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: mi,v 1.2296 2019/12/07 15:13:59 riastradh Exp $
+#      $NetBSD: mi,v 1.2297 2019/12/14 15:30:37 ad Exp $
 #
 # Note: don't delete entries from here - mark them as "obsolete" instead.
 ./etc/mtree/set.comp                           comp-sys-root
@@ -3102,6 +3102,7 @@
 ./usr/include/sys/quota.h                      comp-c-include
 ./usr/include/sys/quotactl.h                   comp-c-include
 ./usr/include/sys/radioio.h                    comp-c-include
+./usr/include/sys/radixtree.h                  comp-c-include
 ./usr/include/sys/ras.h                                comp-c-include
 ./usr/include/sys/rb.h                         comp-obsolete           obsolete
 ./usr/include/sys/rbtree.h                     comp-c-include
diff -r cc806b9495e9 -r 1e024d3dd9c3 sys/kern/init_main.c
--- a/sys/kern/init_main.c      Sat Dec 14 15:21:51 2019 +0000
+++ b/sys/kern/init_main.c      Sat Dec 14 15:30:37 2019 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: init_main.c,v 1.509 2019/12/12 22:55:20 pgoyette Exp $ */
+/*     $NetBSD: init_main.c,v 1.510 2019/12/14 15:30:37 ad Exp $       */
 
 /*-
  * Copyright (c) 2008, 2009, 2019 The NetBSD Foundation, Inc.
@@ -97,7 +97,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: init_main.c,v 1.509 2019/12/12 22:55:20 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: init_main.c,v 1.510 2019/12/14 15:30:37 ad Exp $");
 
 #include "opt_ddb.h"
 #include "opt_inet.h"
@@ -197,6 +197,7 @@
 #include <net80211/ieee80211_netbsd.h>
 #include <sys/cprng.h>
 #include <sys/psref.h>
+#include <sys/radixtree.h>
 
 #include <sys/syscall.h>
 #include <sys/syscallargs.h>
@@ -476,6 +477,7 @@
        /* Initialize fstrans. */
        fstrans_init();
 
+       radix_tree_init(); /* used for page cache */
        vfsinit();
        lf_init();
 
diff -r cc806b9495e9 -r 1e024d3dd9c3 sys/lib/libkern/Makefile.libkern
--- a/sys/lib/libkern/Makefile.libkern  Sat Dec 14 15:21:51 2019 +0000
+++ b/sys/lib/libkern/Makefile.libkern  Sat Dec 14 15:30:37 2019 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile.libkern,v 1.43 2018/09/03 16:54:54 riastradh Exp $
+#      $NetBSD: Makefile.libkern,v 1.44 2019/12/14 15:30:37 ad Exp $
 
 # 
 # Variable definitions for libkern.  
@@ -87,7 +87,7 @@
 
 SRCS+= xlat_mbr_fstype.c
 
-SRCS+= heapsort.c ptree.c rb.c
+SRCS+= heapsort.c ptree.c radixtree.c rb.c rpst.c
 
 SRCS+= hexdump.c
 
diff -r cc806b9495e9 -r 1e024d3dd9c3 sys/sys/Makefile
--- a/sys/sys/Makefile  Sat Dec 14 15:21:51 2019 +0000
+++ b/sys/sys/Makefile  Sat Dec 14 15:30:37 2019 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.170 2019/05/18 08:38:00 mlelstv Exp $
+#      $NetBSD: Makefile,v 1.171 2019/12/14 15:30:37 ad Exp $
 
 .include <bsd.own.mk>
 
@@ -33,8 +33,8 @@
        param.h pcu.h pipe.h pmf.h poll.h pool.h power.h proc.h \
        protosw.h pset.h psref.h ptrace.h ptree.h \
        queue.h quota.h quotactl.h \
-       ras.h rbtree.h reboot.h radioio.h resource.h resourcevar.h rmd160.h \
-       rnd.h rndio.h rwlock.h \
+       radixtree.h ras.h rbtree.h reboot.h radioio.h resource.h \
+       resourcevar.h rmd160.h rnd.h rndio.h rwlock.h \
        scanio.h sched.h scsiio.h sdt.h select.h selinfo.h sem.h semaphore.h \
        sha1.h sha2.h sha3.h shm.h siginfo.h signal.h signalvar.h sigtypes.h \
        sleepq.h socket.h \