smalloc: final cleanups

Passes all regressions and tests, must be Bug Free.

Signed-off-by: Jens Axboe <jens.axboe@oracle.com>

diff --git a/smalloc.c b/smalloc.c
index bad0bcb2a614d1838eb137d7a21934d7b85262c5..dfddfba9fcc0eef0246af80b566fec0d8171c97f 100644 (file)
--- a/smalloc.c
+++ b/smalloc.c
@@ -300,19 +300,17 @@ void scleanup(void)
                fio_mutex_remove(lock);
 }
 
                fio_mutex_remove(lock);
 }
 

+#ifdef SMALLOC_REDZONE

 static void fill_redzone(struct block_hdr *hdr)
 {
 static void fill_redzone(struct block_hdr *hdr)
 {

-#ifdef SMALLOC_REDZONE

        unsigned int *postred = (void *) hdr + hdr->size - sizeof(unsigned int);
 
        hdr->prered = SMALLOC_PRE_RED;
        *postred = SMALLOC_POST_RED;
        unsigned int *postred = (void *) hdr + hdr->size - sizeof(unsigned int);
 
        hdr->prered = SMALLOC_PRE_RED;
        *postred = SMALLOC_POST_RED;

-#endif

 }
 
 static void sfree_check_redzone(struct block_hdr *hdr)
 {
 }
 
 static void sfree_check_redzone(struct block_hdr *hdr)
 {

-#ifdef SMALLOC_REDZONE

        unsigned int *postred = (void *) hdr + hdr->size - sizeof(unsigned int);
 
        if (hdr->prered != SMALLOC_PRE_RED) {
        unsigned int *postred = (void *) hdr + hdr->size - sizeof(unsigned int);
 
        if (hdr->prered != SMALLOC_PRE_RED) {


@@ -327,9 +325,17 @@ static void sfree_check_redzone(struct block_hdr *hdr)
                                hdr, *postred, SMALLOC_POST_RED);
                assert(0);
        }
                                hdr, *postred, SMALLOC_POST_RED);
                assert(0);
        }

-#endif
+}
+#else
+static void fill_redzone(struct block_hdr *hdr)
+{

 }
 
 }
 

+static void sfree_check_redzone(struct block_hdr *hdr)
+{
+}
+#endif
+

 static void sfree_pool(struct pool *pool, void *ptr)
 {
        struct block_hdr *hdr;
 static void sfree_pool(struct pool *pool, void *ptr)
 {
        struct block_hdr *hdr;


@@ -438,26 +444,24 @@ fail:
 
 static void *smalloc_pool(struct pool *pool, unsigned int size)
 {
 
 static void *smalloc_pool(struct pool *pool, unsigned int size)
 {

-       struct block_hdr *hdr;
-       unsigned int alloc_size;
+       unsigned int alloc_size = size + sizeof(struct block_hdr);

        void *ptr;
 
        void *ptr;
 

-       alloc_size = size + sizeof(*hdr);

 #ifdef SMALLOC_REDZONE
        alloc_size += sizeof(unsigned int);
 #endif
 
        ptr = __smalloc_pool(pool, alloc_size);
 #ifdef SMALLOC_REDZONE
        alloc_size += sizeof(unsigned int);
 #endif
 
        ptr = __smalloc_pool(pool, alloc_size);

-       if (!ptr)
-               return NULL;
+       if (ptr) {
+               struct block_hdr *hdr = ptr;

 
 

-       hdr = ptr;
-       hdr->size = alloc_size;
-       ptr += sizeof(*hdr);
+               hdr->size = alloc_size;
+               fill_redzone(hdr);

 
 

-       fill_redzone(hdr);
+               ptr += sizeof(*hdr);
+               memset(ptr, 0, size);
+       }

 
 

-       memset(ptr, 0, size);

        return ptr;
 }
 
        return ptr;
 }