Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/trunk]: src/sys/rump/librump/rumpkern Pull all relegating memory allocat...
details: https://anonhg.NetBSD.org/src/rev/fadf19fca68a
branches: trunk
changeset: 748755:fadf19fca68a
user: pooka <pooka%NetBSD.org@localhost>
date: Wed Nov 04 18:25:36 2009 +0000
description:
Pull all relegating memory allocators under a common roof in memalloc.c
diffstat:
sys/rump/librump/rumpkern/Makefile.rumpkern | 6 +-
sys/rump/librump/rumpkern/emul.c | 45 +-----
sys/rump/librump/rumpkern/pool.c | 219 ----------------------------
sys/rump/librump/rumpkern/vm.c | 46 +-----
4 files changed, 8 insertions(+), 308 deletions(-)
diffs (truncated from 391 to 300 lines):
diff -r 7d9d1f0552ba -r fadf19fca68a sys/rump/librump/rumpkern/Makefile.rumpkern
--- a/sys/rump/librump/rumpkern/Makefile.rumpkern Wed Nov 04 18:11:11 2009 +0000
+++ b/sys/rump/librump/rumpkern/Makefile.rumpkern Wed Nov 04 18:25:36 2009 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.rumpkern,v 1.59 2009/11/04 17:01:45 pooka Exp $
+# $NetBSD: Makefile.rumpkern,v 1.60 2009/11/04 18:25:36 pooka Exp $
#
.include "${RUMPTOP}/Makefile.rump"
@@ -16,8 +16,8 @@
# Source modules, first the ones specifically implemented for librump.
#
SRCS= rump.c rumpcopy.c emul.c intr.c locks.c ltsleep.c \
- percpu.c pool.c scheduler.c sleepq.c sysproxy_socket.c \
- vm.c
+ memalloc.c percpu.c scheduler.c sleepq.c \
+ sysproxy_socket.c vm.c
# stubs
#
diff -r 7d9d1f0552ba -r fadf19fca68a sys/rump/librump/rumpkern/emul.c
--- a/sys/rump/librump/rumpkern/emul.c Wed Nov 04 18:11:11 2009 +0000
+++ b/sys/rump/librump/rumpkern/emul.c Wed Nov 04 18:25:36 2009 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: emul.c,v 1.106 2009/11/04 17:01:45 pooka Exp $ */
+/* $NetBSD: emul.c,v 1.107 2009/11/04 18:25:36 pooka Exp $ */
/*
* Copyright (c) 2007 Antti Kantee. All Rights Reserved.
@@ -28,10 +28,9 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: emul.c,v 1.106 2009/11/04 17:01:45 pooka Exp $");
+__KERNEL_RCSID(0, "$NetBSD: emul.c,v 1.107 2009/11/04 18:25:36 pooka Exp $");
#include <sys/param.h>
-#include <sys/malloc.h>
#include <sys/null.h>
#include <sys/vnode.h>
#include <sys/stat.h>
@@ -143,46 +142,6 @@
TIMESPEC_TO_TIMEVAL(tv, &ts);
}
-void
-malloc_type_attach(struct malloc_type *type)
-{
-
- return;
-}
-
-void
-malloc_type_detach(struct malloc_type *type)
-{
-
- return;
-}
-
-void *
-kern_malloc(unsigned long size, struct malloc_type *type, int flags)
-{
- void *rv;
-
- rv = rumpuser_malloc(size, (flags & (M_CANFAIL | M_NOWAIT)) != 0);
- if (rv && flags & M_ZERO)
- memset(rv, 0, size);
-
- return rv;
-}
-
-void *
-kern_realloc(void *ptr, unsigned long size, struct malloc_type *type, int flags)
-{
-
- return rumpuser_realloc(ptr, size, (flags & (M_CANFAIL|M_NOWAIT)) != 0);
-}
-
-void
-kern_free(void *ptr, struct malloc_type *type)
-{
-
- rumpuser_free(ptr);
-}
-
static void
gettime(struct timespec *ts)
{
diff -r 7d9d1f0552ba -r fadf19fca68a sys/rump/librump/rumpkern/pool.c
--- a/sys/rump/librump/rumpkern/pool.c Wed Nov 04 18:11:11 2009 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,219 +0,0 @@
-/* $NetBSD: pool.c,v 1.15 2009/09/13 19:07:18 pooka Exp $ */
-
-/*
- * Copyright (c) 2007 Antti Kantee. All Rights Reserved.
- *
- * Development of this software was supported by Google Summer of Code.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS
- * OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
- * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pool.c,v 1.15 2009/09/13 19:07:18 pooka Exp $");
-
-#ifndef RUMP_USE_REAL_ALLOCATORS
-
-#include <sys/param.h>
-#include <sys/mount.h>
-#include <sys/pool.h>
-
-#include <rump/rumpuser.h>
-
-struct pool_cache pnbuf_cache;
-struct pool pnbuf_pool;
-struct pool_allocator pool_allocator_nointr;
-
-void
-pool_subsystem_init()
-{
-
- /* nada */
-}
-
-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)
-{
-
- pp->pr_size = size;
-}
-
-void
-pool_destroy(struct pool *pp)
-{
-
- return;
-}
-
-pool_cache_t
-pool_cache_init(size_t size, u_int align, u_int align_offset, u_int flags,
- const char *wchan, struct pool_allocator *palloc, int ipl,
- int (*ctor)(void *, void *, int), void (*dtor)(void *, void *),
- void *arg)
-{
- pool_cache_t pc;
-
- pc = rumpuser_malloc(sizeof(*pc), 0);
- pool_cache_bootstrap(pc, size, align, align_offset, flags, wchan,
- palloc, ipl, ctor, dtor, arg);
- return pc;
-}
-
-void
-pool_cache_bootstrap(pool_cache_t pc, size_t size, u_int align,
- u_int align_offset, u_int flags, const char *wchan,
- struct pool_allocator *palloc, int ipl,
- int (*ctor)(void *, void *, int), void (*dtor)(void *, void *),
- void *arg)
-{
-
- pool_init(&pc->pc_pool, size, align, align_offset, flags,
- wchan, palloc, ipl);
- pc->pc_ctor = ctor;
- pc->pc_dtor = dtor;
- pc->pc_arg = arg;
-}
-
-void
-pool_cache_destroy(pool_cache_t pc)
-{
-
- pool_destroy(&pc->pc_pool);
- rumpuser_free(pc);
-}
-
-void *
-pool_cache_get_paddr(pool_cache_t pc, int flags, paddr_t *pap)
-{
- void *item;
-
- item = pool_get(&pc->pc_pool, 0);
- if (pc->pc_ctor)
- pc->pc_ctor(pc->pc_arg, item, flags);
- if (pap)
- *pap = POOL_PADDR_INVALID;
-
- return item;
-}
-
-void
-pool_cache_put_paddr(pool_cache_t pc, void *object, paddr_t pa)
-{
-
- if (pc->pc_dtor)
- pc->pc_dtor(pc->pc_arg, object);
- pool_put(&pc->pc_pool, object);
-}
-
-bool
-pool_cache_reclaim(pool_cache_t pc)
-{
-
- return true;
-}
-
-void *
-pool_get(struct pool *pp, int flags)
-{
- void *rv;
-
-#ifdef DIAGNOSTIC
- if (pp->pr_size == 0)
- panic("%s: pool unit size 0. not initialized?", __func__);
-#endif
-
- rv = rumpuser_malloc(pp->pr_size, 1);
- if (rv == NULL && (flags & PR_WAITOK && (flags & PR_LIMITFAIL) == 0))
- panic("%s: out of memory and PR_WAITOK", __func__);
-
- return rv;
-}
-
-void
-pool_put(struct pool *pp, void *item)
-{
-
- rumpuser_free(item);
-}
-
-void
-pool_sethiwat(struct pool *pp, int n)
-{
-
- return;
-}
-
-void
-pool_setlowat(struct pool *pp, int n)
-{
-
- return;
-}
-
-void
-pool_cache_sethardlimit(pool_cache_t pc, int n, const char *warnmess,
- int ratecap)
-{
-
- return;
-}
-
-void
-pool_cache_setlowat(pool_cache_t pc, int n)
-{
-
- return;
-}
-
-void
-pool_cache_set_drain_hook(pool_cache_t pc, void (*fn)(void *, int), void *arg)
-{
-
- /* XXX: notused */
- pc->pc_pool.pr_drain_hook = fn;
- pc->pc_pool.pr_drain_hook_arg = arg;
-}
-
-/* XXX: for tmpfs, shouldn't be here */
-void *pool_page_alloc_nointr(struct pool *, int);
-void pool_page_free_nointr(struct pool *, void *);
-void *
-pool_page_alloc_nointr(struct pool *pp, int flags)
-{
-
- return pool_get(pp, flags);
-}
-
-void
-pool_page_free_nointr(struct pool *pp, void *item)
-{
Home |
Main Index |
Thread Index |
Old Index