smalloc: cleanup firstfree()

[fio.git] / t / stest.c

diff --git a/t/stest.c b/t/stest.c
index 0da8f2cf8670aad2cef31de9b0abedd5e86f1f93..515ae5a5e370f4b3af1c09c7e5c95f6a21c78cbc 100644 (file)
--- a/t/stest.c
+++ b/t/stest.c
@@ -4,36 +4,39 @@
 
 #include "../smalloc.h"
 #include "../flist.h"
-
-FILE *f_err;
-struct timeval *fio_tv = NULL;
-unsigned int fio_debug = 0;
+#include "../arch/arch.h"
+#include "debug.h"
 
 #define MAGIC1 0xa9b1c8d2
 #define MAGIC2 0xf0a1e9b3
 
 #define LOOPS  32
+#define MAXSMALLOC     120*1024*1024UL
+#define LARGESMALLOC   128*1024U
 
 struct elem {
        unsigned int magic1;
        struct flist_head list;
        unsigned int magic2;
+       unsigned int size;
 };
 
-FLIST_HEAD(list);
+static FLIST_HEAD(list);
 
 static int do_rand_allocs(void)
 {
        unsigned int size, nr, rounds = 0;
        unsigned long total;
        struct elem *e;
+       bool error;
 
        while (rounds++ < LOOPS) {
 #ifdef STEST_SEED
                srand(MAGIC1);
 #endif
+               error = false;
                nr = total = 0;
-               while (total < 128*1024*1024UL) {
+               while (total < MAXSMALLOC) {
                        size = 8 * sizeof(struct elem) + (int) (999.0 * (rand() / (RAND_MAX + 1.0)));
                        e = smalloc(size);
                        if (!e) {
@@ -42,6 +45,7 @@ static int do_rand_allocs(void)
                        }
                        e->magic1 = MAGIC1;
                        e->magic2 = MAGIC2;
+                       e->size = size;
                        total += size;
                        flist_add_tail(&e->list, &list);
                        nr++;
@@ -53,38 +57,35 @@ static int do_rand_allocs(void)
                        e = flist_entry(list.next, struct elem, list);
                        assert(e->magic1 == MAGIC1);
                        assert(e->magic2 == MAGIC2);
+                       total -= e->size;
                        flist_del(&e->list);
                        sfree(e);
+
+                       if (!error) {
+                               e = smalloc(LARGESMALLOC);
+                               if (!e) {
+                                       error = true;
+                                       printf("failure allocating %u bytes at %lu allocated during sfree phase\n",
+                                               LARGESMALLOC, total);
+                               }
+                               else
+                                       sfree(e);
+                       }
                }
        }
 
        return 0;
 }
 
-static int do_specific_alloc(unsigned long size)
-{
-       void *ptr;
-
-       ptr = smalloc(size);
-       sfree(ptr);
-       return 0;
-}
-
 int main(int argc, char *argv[])
 {
-       f_err = stderr;
-
+       arch_init(argv);
        sinit();
+       debug_init();
 
        do_rand_allocs();
-
-       /* smalloc bug, commit 271067a6 */
-       do_specific_alloc(671386584);
+       smalloc_debug(0);       /* free and total blocks should match */
 
        scleanup();
        return 0;
 }
-
-void __dprint(int type, const char *str, ...)
-{
-}