- Initialize a pool of bucket zones so that we waste less space on zones that

   don't cache as many items.
 - Introduce the bucket_alloc(), bucket_free() functions to wrap bucket
   allocation.  These functions select the appropriate bucket zone to
   allocate from or free to.
 - Rename ub_ptr to ub_cnt to reflect a change in its use.  ub_cnt now reflects
   the count of free items in the bucket.  This gets rid of many unnatural
   subtractions by 1 throughout the code.
 - Add ub_entries which reflects the number of entries possibly held in a
   bucket.

1 files changed, 3 insertions, 10 deletions

diff --git a/sys/vm/uma_int.h b/sys/vm/uma_int.h
index 3554f0f..f7550a7 100644
--- a/sys/vm/uma_int.h
+++ b/sys/vm/uma_int.h
@@ -173,18 +173,11 @@ struct uma_hash {
  * Structures for per cpu queues.
  */
 
-/*
- * This size was chosen so that the struct bucket size is roughly
- * 128 * sizeof(void *).  This is exactly true for x86, and for alpha
- * it will would be 32bits smaller if it didn't have alignment adjustments.
- */
-
-#define UMA_BUCKET_SIZE	125
-
 struct uma_bucket {
 	LIST_ENTRY(uma_bucket)	ub_link;	/* Link into the zone */
-	int16_t	ub_ptr;				/* Pointer to current item */
-	void	*ub_bucket[UMA_BUCKET_SIZE];	/* actual allocation storage */
+	int16_t	ub_cnt;				/* Count of free items. */
+	int16_t	ub_entries;			/* Max items. */
+	void	*ub_bucket[];			/* actual allocation storage */
 };
 
 typedef struct uma_bucket * uma_bucket_t;