projects
/
fio.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
lib/axmap: a few fixes/cleanups
[fio.git]
/
smalloc.c
diff --git
a/smalloc.c
b/smalloc.c
index b6b367ae9a6b5be292f0db870c393b90d18137ab..cab7132511b1729b152278f119d300c83f54b5d2 100644
(file)
--- a/
smalloc.c
+++ b/
smalloc.c
@@
-13,6
+13,7
@@
#include <limits.h>
#include <fcntl.h>
#include <limits.h>
#include <fcntl.h>
+#include "fio.h"
#include "mutex.h"
#include "arch/arch.h"
#include "os/os.h"
#include "mutex.h"
#include "arch/arch.h"
#include "os/os.h"
@@
-26,7
+27,9
@@
#define SMALLOC_BPL (SMALLOC_BPB * SMALLOC_BPI)
#define INITIAL_SIZE 16*1024*1024 /* new pool size */
#define SMALLOC_BPL (SMALLOC_BPB * SMALLOC_BPI)
#define INITIAL_SIZE 16*1024*1024 /* new pool size */
-#define MAX_POOLS 8 /* maximum number of pools to setup */
+#define INITIAL_POOLS 8 /* maximum number of pools to setup */
+
+#define MAX_POOLS 16
#define SMALLOC_PRE_RED 0xdeadbeefU
#define SMALLOC_POST_RED 0x5aa55aa5U
#define SMALLOC_PRE_RED 0xdeadbeefU
#define SMALLOC_POST_RED 0x5aa55aa5U
@@
-149,12
+152,15
@@
static int find_next_zero(int word, int start)
return ffz(word) + start;
}
return ffz(word) + start;
}
-static
int
add_pool(struct pool *pool, unsigned int alloc_size)
+static
bool
add_pool(struct pool *pool, unsigned int alloc_size)
{
int bitmap_blocks;
int mmap_flags;
void *ptr;
{
int bitmap_blocks;
int mmap_flags;
void *ptr;
+ if (nr_pools == MAX_POOLS)
+ return false;
+
#ifdef SMALLOC_REDZONE
alloc_size += sizeof(unsigned int);
#endif
#ifdef SMALLOC_REDZONE
alloc_size += sizeof(unsigned int);
#endif
@@
-183,7
+189,7
@@
static int add_pool(struct pool *pool, unsigned int alloc_size)
goto out_fail;
pool->map = ptr;
goto out_fail;
pool->map = ptr;
- pool->bitmap = (
void *) ptr + (pool->nr_blocks * SMALLOC_BPL
);
+ pool->bitmap = (
unsigned int *)((char *) ptr + (pool->nr_blocks * SMALLOC_BPL)
);
memset(pool->bitmap, 0, bitmap_blocks * sizeof(unsigned int));
pool->lock = fio_mutex_init(FIO_MUTEX_UNLOCKED);
memset(pool->bitmap, 0, bitmap_blocks * sizeof(unsigned int));
pool->lock = fio_mutex_init(FIO_MUTEX_UNLOCKED);
@@
-191,21
+197,22
@@
static int add_pool(struct pool *pool, unsigned int alloc_size)
goto out_fail;
nr_pools++;
goto out_fail;
nr_pools++;
- return
0
;
+ return
true
;
out_fail:
log_err("smalloc: failed adding pool\n");
if (pool->map)
munmap(pool->map, pool->mmap_size);
out_fail:
log_err("smalloc: failed adding pool\n");
if (pool->map)
munmap(pool->map, pool->mmap_size);
- return
1
;
+ return
false
;
}
void sinit(void)
{
}
void sinit(void)
{
- int i, ret;
+ bool ret;
+ int i;
- for (i = 0; i <
MAX
_POOLS; i++) {
- ret = add_pool(&mp[
i], INITIAL_SIZE
);
- if (ret)
+ for (i = 0; i <
INITIAL
_POOLS; i++) {
+ ret = add_pool(&mp[
nr_pools], smalloc_pool_size
);
+ if (
!
ret)
break;
}
break;
}
@@
-242,7
+249,7
@@
static void *postred_ptr(struct block_hdr *hdr)
uintptr_t ptr;
ptr = (uintptr_t) hdr + hdr->size - sizeof(unsigned int);
uintptr_t ptr;
ptr = (uintptr_t) hdr + hdr->size - sizeof(unsigned int);
- ptr = (
ptr + int_mask) & ~int_mask
;
+ ptr = (
uintptr_t) PTR_ALIGN(ptr, int_mask)
;
return (void *) ptr;
}
return (void *) ptr;
}
@@
-444,6
+451,8
@@
void *smalloc(size_t size)
break;
} while (1);
break;
} while (1);
+ log_err("smalloc: OOM. Consider using --alloc-size to increase the "
+ "shared memory available.\n");
return NULL;
}
return NULL;
}