projects
/
fio.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge https://bitbucket.org/vincentfu/fio-steadystate into steady-state-2
[fio.git]
/
smalloc.c
diff --git
a/smalloc.c
b/smalloc.c
index b6b367ae9a6b5be292f0db870c393b90d18137ab..d038ac64ccfb8dedbe2801ed3630dafbb121b97c 100644
(file)
--- a/
smalloc.c
+++ b/
smalloc.c
@@
-26,7
+26,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
+151,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
@@
-191,21
+196,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;
}
@@
-444,6
+450,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;
}