Another attempt at cleaning up the new memory allocator.

1 files changed, 59 insertions, 32 deletions

diff --git a/sys/vm/vm_zone.h b/sys/vm/vm_zone.h
index 7f6630d..a7aa802 100644
--- a/sys/vm/vm_zone.h
+++ b/sys/vm/vm_zone.h
@@ -1,25 +1,43 @@
 
+/*
+ * Copyright (c) 1997 John S. Dyson
+ * All rights reserved.
+ *
+ * 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 immediately at the beginning of the file, without modification,
+ *	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.
+ * 3. Absolutely no warranty of function or purpose is made by the author
+ *	John S. Dyson.
+ * 4. This work was done expressly for inclusion into FreeBSD.  Other use
+ *	is allowed if this notation is included.
+ * 5. Modifications may be freely made to this file if the above conditions
+ *	are met.
+ *
+ * $Id$
+ */
+
 #if !defined(_SYS_ZONE_H)
 
 #define _SYS_ZONE_H
 
-#define ZONE_COLOR 1
-#define ZONE_INTERRUPT 2
-#define ZONE_WAIT 4
-#define ZONE_PREALLOCATE 8
-#define ZONE_BOOT 16
+#define ZONE_INTERRUPT 1	/* Use this if you need to allocate at int time */
+#define ZONE_BOOT 16		/* This is an internal flag used by zbootinit */
 
 #include	<machine/param.h>
 #include	<sys/lock.h>
 
 
-#define CACHE_LINE_SIZE 32
-
 typedef struct vm_zone {
 	struct	simplelock		zlock;			/* lock for data structure */
 	void					*zitems;		/* linked list of items */
-	int						zfreemin;		/* minimum number of free entries */
 	int						zfreecnt;		/* free entries */
+	int						zfreemin;		/* minimum number of free entries */
 	vm_offset_t				zkva;			/* Base kva of zone */
 	int						zpagecount;		/* Total # of allocated pages */
 	int						zpagemax;		/* Max address space */
@@ -33,50 +51,59 @@ typedef struct vm_zone {
 
 
 vm_zone_t zinit(char *name, int size, int nentries, int flags, int zalloc);
-int _zinit(vm_zone_t z, struct vm_object *obj, char *name, int size,
+int zinitna(vm_zone_t z, struct vm_object *obj, char *name, int size,
 		int nentries, int flags, int zalloc);
 static void * zalloc(vm_zone_t z);
 static void zfree(vm_zone_t z, void *item);
 void * zalloci(vm_zone_t z) __attribute__((regparm(1)));
 void zfreei(vm_zone_t z, void *item) __attribute__((regparm(2)));
-void _zbootinit(vm_zone_t z, char *name, int size, void *item, int nitems) ;
-void * zget(vm_zone_t z, int s) __attribute__((regparm(2)));
-
-#if SMP > 1
-
+void zbootinit(vm_zone_t z, char *name, int size, void *item, int nitems) ;
+void * _zget(vm_zone_t z) __attribute__((regparm(1)));
+
+/*
+ * void *zalloc(vm_zone_t zone) --
+ *	Returns an item from a specified zone.
+ *
+ * void zfree(vm_zone_t zone, void *item) --
+ *  Frees an item back to a specified zone.
+ */
 static __inline__ void *
-zalloc(vm_zone_t z) {
-	return zalloci(z);
-}
-
-static __inline__ void
-zfree(vm_zone_t z, void *item) {
-	zfreei(z, item);
-}
-
-#else
-
-static __inline__ void *
-zalloc(vm_zone_t z) {
-	int s;
+_zalloc(vm_zone_t z) {
 	void *item;
 
 	if (z->zfreecnt <= z->zfreemin) {
-		return zget(z, s);
+		return _zget(z);
 	}
 	
 	item = z->zitems;
 	z->zitems = *(void **) item;
-	--z->zfreecnt;
+	z->zfreecnt--;
 	return item;
 }
 
 static __inline__ void
-zfree(vm_zone_t z, void *item) {
+_zfree(vm_zone_t z, void *item) {
 	* (void **) item = z->zitems;
 	z->zitems = item;
-	++z->zfreecnt;
+	z->zfreecnt++;
+}
+
+static __inline__ void *
+zalloc(vm_zone_t z) {
+#if NCPU > 1
+	return zalloci(z);
+#else
+	return _zalloc(z);
+#endif
 }
+
+static __inline__ void
+zfree(vm_zone_t z, void *item) {
+#if NCPU > 1
+	zfreei(z, item);
+#else
+	_zfree(z, item);
 #endif
+}
 
 #endif