Use frame pointer

[fio.git] / smalloc.c

diff --git a/smalloc.c b/smalloc.c
index dfddfba9fcc0eef0246af80b566fec0d8171c97f..7f3c10b137498d01f812e4807298b2f2b06e6870 100644 (file)
--- a/smalloc.c
+++ b/smalloc.c
@@ -12,6 +12,7 @@
 #include <limits.h>
 
 #include "mutex.h"
+#include "arch/arch.h"
 
 #define MP_SAFE                        /* define to make thread safe */
 #define SMALLOC_REDZONE                /* define to detect memory corruption */
@@ -21,7 +22,7 @@
 #define SMALLOC_BPL    (SMALLOC_BPB * SMALLOC_BPI)
 
 #define INITIAL_SIZE   1024*1024       /* new pool size */
-#define MAX_POOLS      4               /* maximum number of pools to setup */
+#define MAX_POOLS      128             /* maximum number of pools to setup */
 
 #define SMALLOC_PRE_RED                0xdeadbeefU
 #define SMALLOC_POST_RED       0x5aa55aa5U
@@ -173,39 +174,11 @@ static void clear_blocks(struct pool *pool, unsigned int pool_idx,
        blocks_iter(pool, pool_idx, idx, nr_blocks, mask_clear);
 }
 
-static inline int __ffs(int word)
-{
-       int r = 0;
-
-       if (!(word & 0xffff)) {
-               word >>= 16;
-               r += 16;
-       }
-       if (!(word & 0xff)) {
-               word >>= 8;
-               r += 8;
-       }
-       if (!(word & 0xf)) {
-               word >>= 4;
-               r += 4;
-       }
-       if (!(word & 3)) {
-               word >>= 2;
-               r += 2;
-       }
-       if (!(word & 1)) {
-               word >>= 1;
-               r += 1;
-       }
-
-       return r;
-}
-
 static int find_next_zero(int word, int start)
 {
        assert(word != -1U);
        word >>= (start + 1);
-       return __ffs(~word) + start + 1;
+       return ffz(word) + start + 1;
 }
 
 static int add_pool(struct pool *pool, unsigned int alloc_size)
@@ -253,9 +226,7 @@ static int add_pool(struct pool *pool, unsigned int alloc_size)
 
        pool->fd = fd;
 
-       global_write_lock();
        nr_pools++;
-       global_write_unlock();
        return 0;
 out_unlink:
        fprintf(stderr, "smalloc: failed adding pool\n");
@@ -469,7 +440,7 @@ void *smalloc(unsigned int size)
 {
        unsigned int i;
 
-       global_read_lock();
+       global_write_lock();
        i = last_pool;
 
        do {
@@ -478,7 +449,7 @@ void *smalloc(unsigned int size)
 
                        if (ptr) {
                                last_pool = i;
-                               global_read_unlock();
+                               global_write_unlock();
                                return ptr;
                        }
                }
@@ -491,15 +462,13 @@ void *smalloc(unsigned int size)
                        break;
                else {
                        i = nr_pools;
-                       global_read_unlock();
                        if (add_pool(&mp[nr_pools], size))
                                goto out;
-                       global_read_lock();
                }
        } while (1);
 
-       global_read_unlock();
 out:
+       global_write_unlock();
        return NULL;
 }