Module Name: src
Committed By: pooka
Date: Fri Apr 24 13:27:03 UTC 2009
Modified Files:
src/sys/rump/librump/rumpkern: pool.c rump.c vm.c
Log Message:
* init pool linksets, makes proplib work. reported by Arnaud Ysmal.
(linksets, sigh)
* reduce #ifdef for RUMP_USE_REAL_ALLOCATORS
To generate a diff of this commit:
cvs rdiff -u -r1.12 -r1.13 src/sys/rump/librump/rumpkern/pool.c
cvs rdiff -u -r1.101 -r1.102 src/sys/rump/librump/rumpkern/rump.c
cvs rdiff -u -r1.53 -r1.54 src/sys/rump/librump/rumpkern/vm.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/librump/rumpkern/pool.c
diff -u src/sys/rump/librump/rumpkern/pool.c:1.12 src/sys/rump/librump/rumpkern/pool.c:1.13
--- src/sys/rump/librump/rumpkern/pool.c:1.12 Fri Jan 23 13:14:16 2009
+++ src/sys/rump/librump/rumpkern/pool.c Fri Apr 24 13:27:03 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: pool.c,v 1.12 2009/01/23 13:14:16 pooka Exp $ */
+/* $NetBSD: pool.c,v 1.13 2009/04/24 13:27:03 pooka Exp $ */
/*
* Copyright (c) 2007 Antti Kantee. All Rights Reserved.
@@ -28,7 +28,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pool.c,v 1.12 2009/01/23 13:14:16 pooka Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pool.c,v 1.13 2009/04/24 13:27:03 pooka Exp $");
#ifndef RUMP_USE_REAL_ALLOCATORS
@@ -43,6 +43,20 @@
struct pool_allocator pool_allocator_nointr;
void
+pool_subsystem_init()
+{
+ __link_set_decl(pools, struct link_pool_init);
+ struct link_pool_init *const *pi;
+
+#define _pi(name) (*pi)->name
+ __link_set_foreach(pi, pools) {
+ pool_init(_pi(pp), _pi(size), _pi(align), _pi(align_offset),
+ _pi(flags), _pi(wchan), _pi(palloc), _pi(ipl));
+ }
+#undef _pi
+}
+
+void
pool_init(struct pool *pp, size_t size, u_int align, u_int align_offset,
int flags, const char *wchan, struct pool_allocator *palloc, int ipl)
{
Index: src/sys/rump/librump/rumpkern/rump.c
diff -u src/sys/rump/librump/rumpkern/rump.c:1.101 src/sys/rump/librump/rumpkern/rump.c:1.102
--- src/sys/rump/librump/rumpkern/rump.c:1.101 Thu Apr 16 14:07:18 2009
+++ src/sys/rump/librump/rumpkern/rump.c Fri Apr 24 13:27:03 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: rump.c,v 1.101 2009/04/16 14:07:18 pooka Exp $ */
+/* $NetBSD: rump.c,v 1.102 2009/04/24 13:27:03 pooka Exp $ */
/*
* Copyright (c) 2007 Antti Kantee. All Rights Reserved.
@@ -28,7 +28,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: rump.c,v 1.101 2009/04/16 14:07:18 pooka Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rump.c,v 1.102 2009/04/24 13:27:03 pooka Exp $");
#include <sys/param.h>
#include <sys/atomic.h>
@@ -173,10 +173,10 @@
once_init();
rump_sleepers_init();
-#ifdef RUMP_USE_REAL_ALLOCATORS
+
pool_subsystem_init();
kmem_init();
-#endif
+
kprintf_init();
loginit();
Index: src/sys/rump/librump/rumpkern/vm.c
diff -u src/sys/rump/librump/rumpkern/vm.c:1.53 src/sys/rump/librump/rumpkern/vm.c:1.54
--- src/sys/rump/librump/rumpkern/vm.c:1.53 Wed Mar 18 10:22:45 2009
+++ src/sys/rump/librump/rumpkern/vm.c Fri Apr 24 13:27:03 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: vm.c,v 1.53 2009/03/18 10:22:45 cegger Exp $ */
+/* $NetBSD: vm.c,v 1.54 2009/04/24 13:27:03 pooka Exp $ */
/*
* Copyright (c) 2007 Antti Kantee. All Rights Reserved.
@@ -42,7 +42,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: vm.c,v 1.53 2009/03/18 10:22:45 cegger Exp $");
+__KERNEL_RCSID(0, "$NetBSD: vm.c,v 1.54 2009/04/24 13:27:03 pooka Exp $");
#include <sys/param.h>
#include <sys/atomic.h>
@@ -444,6 +444,13 @@
*/
#ifndef RUMP_USE_REAL_ALLOCATORS
+void
+kmem_init()
+{
+
+ /* nothing to do */
+}
+
void *
kmem_alloc(size_t size, km_flag_t kmflag)
{
