Module Name: src
Committed By: pooka
Date: Wed Jun 17 11:46:34 UTC 2015
Modified Files:
src/sys/rump: README.compileopts
src/sys/rump/librump/rumpkern: Makefile.rumpkern
Removed Files:
src/sys/rump/librump/rumpkern: memalloc.c
Log Message:
Remove unreal allocators, unconditionally use subr_{kmem,pool}.
Will, with other work, allow to tighten the memory allocation hypercall
specification to page-granularity allocations in the future.
To generate a diff of this commit:
cvs rdiff -u -r1.11 -r1.12 src/sys/rump/README.compileopts
cvs rdiff -u -r1.159 -r1.160 src/sys/rump/librump/rumpkern/Makefile.rumpkern
cvs rdiff -u -r1.21 -r0 src/sys/rump/librump/rumpkern/memalloc.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/rump/README.compileopts
diff -u src/sys/rump/README.compileopts:1.11 src/sys/rump/README.compileopts:1.12
--- src/sys/rump/README.compileopts:1.11 Wed Jun 3 14:40:11 2015
+++ src/sys/rump/README.compileopts Wed Jun 17 11:46:33 2015
@@ -1,4 +1,4 @@
- $NetBSD: README.compileopts,v 1.11 2015/06/03 14:40:11 pooka Exp $
+ $NetBSD: README.compileopts,v 1.12 2015/06/17 11:46:33 pooka Exp $
This file describes compile-time options for rump kernels. Additionally,
NetBSD build options will have an effect. See src/share/mk/bsd.README
@@ -44,16 +44,6 @@ effect: If "yes", build rump kernel with
runtime. If "no", build with multiprocessor-capable locking.
- RUMP_UNREAL_ALLOCATORS
-
-values: yes|no
-defval: no
-effect: If "yes", build version of kmem_alloc, pool and pool_cache
- that directly relegate allocation to a hypercall. If "no",
- build the regular NetBSD memory allocators which use
- page-sized memory allocation hypercalls.
-
-
RUMP_VIRTIF
values: yes|no
Index: src/sys/rump/librump/rumpkern/Makefile.rumpkern
diff -u src/sys/rump/librump/rumpkern/Makefile.rumpkern:1.159 src/sys/rump/librump/rumpkern/Makefile.rumpkern:1.160
--- src/sys/rump/librump/rumpkern/Makefile.rumpkern:1.159 Thu Apr 23 14:49:26 2015
+++ src/sys/rump/librump/rumpkern/Makefile.rumpkern Wed Jun 17 11:46:34 2015
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.rumpkern,v 1.159 2015/04/23 14:49:26 pooka Exp $
+# $NetBSD: Makefile.rumpkern,v 1.160 2015/06/17 11:46:34 pooka Exp $
#
.include "${RUMPTOP}/Makefile.rump"
@@ -104,12 +104,14 @@ SRCS+= init_sysctl_base.c \
subr_humanize.c \
subr_iostat.c \
subr_kcpuset.c \
+ subr_kmem.c \
subr_kobj.c \
subr_log.c \
subr_lwp_specificdata.c \
subr_once.c \
subr_pcq.c \
subr_percpu.c \
+ subr_pool.c \
subr_prf.c \
subr_pserialize.c \
subr_specificdata.c \
@@ -156,16 +158,6 @@ SRCS+= kern_time_50.c
SRCS+= rndpseudo_50.c
.endif
-# Set RUMP_UNREAL_ALLOCATORS to "yes" to use memory allocation hypercalls
-# directly instead of the kmem/pool allocators backed by hypercalls.
-# Direct hypercalls may be a few percent faster, but don't emulate
-# all kernel corner cases as well (not to mention if you want to debug the
-# allocators themselves).
-.if defined(RUMP_UNREAL_ALLOCATORS) && ${RUMP_UNREAL_ALLOCATORS} == "yes"
-SRCS+= memalloc.c
-.else
-SRCS+= subr_kmem.c subr_pool.c
-.endif
.ifdef RUMP_LOCKDEBUG
SRCS+= subr_lockdebug.c
