radix tree test suite: Add allocation counts and size to kmem_cache

Add functions to get the number of allocations, and total allocations
from a kmem_cache.  Also add a function to get the allocated size and a
way to zero the total allocations.

Signed-off-by: Liam R. Howlett <Liam.Howlett@Oracle.com>

diff --git a/tools/testing/radix-tree/linux.c b/tools/testing/radix-tree/linux.c
index 00ee01a146526b42528513885ebda063d2e3f59c..f95e71d65f00a972716cb092860089cb4b42a151 100644 (file)
--- a/tools/testing/radix-tree/linux.c
+++ b/tools/testing/radix-tree/linux.c
@@ -25,6 +25,8 @@ struct kmem_cache {
        void *objs;
        void (*ctor)(void *);
        unsigned int non_kernel;
+       unsigned long nr_allocated;
+       unsigned long nr_tallocated;
 };
 
 void kmem_cache_set_non_kernel(struct kmem_cache *cachep, unsigned int val)
@@ -32,6 +34,26 @@ void kmem_cache_set_non_kernel(struct kmem_cache *cachep, unsigned int val)
        cachep->non_kernel = val;
 }
 
+unsigned long kmem_cache_get_alloc(struct kmem_cache *cachep)
+{
+       return cachep->size * cachep->nr_allocated;
+}
+
+unsigned long kmem_cache_nr_allocated(struct kmem_cache *cachep)
+{
+       return cachep->nr_allocated;
+}
+
+unsigned long kmem_cache_nr_tallocated(struct kmem_cache *cachep)
+{
+       return cachep->nr_tallocated;
+}
+
+void kmem_cache_zero_nr_tallocated(struct kmem_cache *cachep)
+{
+       cachep->nr_tallocated = 0;
+}
+
 void *kmem_cache_alloc(struct kmem_cache *cachep, int gfp)
 {
        void *p;
@@ -63,7 +85,9 @@ void *kmem_cache_alloc(struct kmem_cache *cachep, int gfp)
                        memset(p, 0, cachep->size);
        }
 
+       uatomic_inc(&cachep->nr_allocated);
        uatomic_inc(&nr_allocated);
+       uatomic_inc(&cachep->nr_tallocated);
        if (kmalloc_verbose)
                printf("Allocating %p from slab\n", p);
        return p;
@@ -73,6 +97,7 @@ void kmem_cache_free(struct kmem_cache *cachep, void *objp)
 {
        assert(objp);
        uatomic_dec(&nr_allocated);
+       uatomic_dec(&cachep->nr_allocated);
        if (kmalloc_verbose)
                printf("Freeing %p to slab\n", objp);
        pthread_mutex_lock(&cachep->lock);
@@ -124,6 +149,8 @@ kmem_cache_create(const char *name, unsigned int size, unsigned int align,
        ret->size = size;
        ret->align = align;
        ret->nr_objs = 0;
+       ret->nr_allocated = 0;
+       ret->nr_tallocated = 0;
        ret->objs = NULL;
        ret->ctor = ctor;
        ret->non_kernel = 0;