projects
/
fio.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Update documentation on new terse format and add version number
[fio.git]
/
smalloc.c
diff --git
a/smalloc.c
b/smalloc.c
index e82ef1da0b59faab23a706db1257808c3fb10bbb..4cd8298eaa004d7a56d861aefcb1373ae7fd7001 100644
(file)
--- a/
smalloc.c
+++ b/
smalloc.c
@@
-10,9
+10,11
@@
#include <unistd.h>
#include <sys/types.h>
#include <limits.h>
#include <unistd.h>
#include <sys/types.h>
#include <limits.h>
+#include <fcntl.h>
#include "mutex.h"
#include "arch/arch.h"
#include "mutex.h"
#include "arch/arch.h"
+#include "os/os.h"
#define SMALLOC_REDZONE /* define to detect memory corruption */
#define SMALLOC_REDZONE /* define to detect memory corruption */
@@
-20,13
+22,14
@@
#define SMALLOC_BPI (sizeof(unsigned int) * 8)
#define SMALLOC_BPL (SMALLOC_BPB * SMALLOC_BPI)
#define SMALLOC_BPI (sizeof(unsigned int) * 8)
#define SMALLOC_BPL (SMALLOC_BPB * SMALLOC_BPI)
-#define INITIAL_SIZE
1024
*1024 /* new pool size */
+#define INITIAL_SIZE
8192
*1024 /* new pool size */
#define MAX_POOLS 128 /* maximum number of pools to setup */
#define SMALLOC_PRE_RED 0xdeadbeefU
#define SMALLOC_POST_RED 0x5aa55aa5U
unsigned int smalloc_pool_size = INITIAL_SIZE;
#define MAX_POOLS 128 /* maximum number of pools to setup */
#define SMALLOC_PRE_RED 0xdeadbeefU
#define SMALLOC_POST_RED 0x5aa55aa5U
unsigned int smalloc_pool_size = INITIAL_SIZE;
+const int int_mask = sizeof(int) - 1;
struct pool {
struct fio_mutex *lock; /* protects this pool */
struct pool {
struct fio_mutex *lock; /* protects this pool */
@@
-175,7
+178,7
@@
static int find_next_zero(int word, int start)
static int add_pool(struct pool *pool, unsigned int alloc_size)
{
static int add_pool(struct pool *pool, unsigned int alloc_size)
{
- int fd, bitmap_blocks;
+ int fd, bitmap_blocks
, ret
;
char file[] = "/tmp/.fio_smalloc.XXXXXX";
void *ptr;
char file[] = "/tmp/.fio_smalloc.XXXXXX";
void *ptr;
@@
-195,10
+198,18
@@
static int add_pool(struct pool *pool, unsigned int alloc_size)
bitmap_blocks = alloc_size / SMALLOC_BPL;
alloc_size += bitmap_blocks * sizeof(unsigned int);
pool->mmap_size = alloc_size;
bitmap_blocks = alloc_size / SMALLOC_BPL;
alloc_size += bitmap_blocks * sizeof(unsigned int);
pool->mmap_size = alloc_size;
-
+
pool->nr_blocks = bitmap_blocks;
pool->free_blocks = bitmap_blocks * SMALLOC_BPB;
pool->nr_blocks = bitmap_blocks;
pool->free_blocks = bitmap_blocks * SMALLOC_BPB;
+#ifdef FIO_HAVE_FALLOCATE
+ ret = posix_fallocate(fd, 0, alloc_size);
+ if (ret > 0) {
+ fprintf(stderr, "posix_fallocate pool file failed: %s\n", strerror(ret));
+ goto out_unlink;
+ }
+#endif
+
if (ftruncate(fd, alloc_size) < 0)
goto out_unlink;
if (ftruncate(fd, alloc_size) < 0)
goto out_unlink;
@@
-268,9
+279,19
@@
void scleanup(void)
}
#ifdef SMALLOC_REDZONE
}
#ifdef SMALLOC_REDZONE
+static void *postred_ptr(struct block_hdr *hdr)
+{
+ unsigned long ptr;
+
+ ptr = (unsigned long) hdr + hdr->size - sizeof(unsigned int);
+ ptr = (ptr + int_mask) & ~int_mask;
+
+ return (void *) ptr;
+}
+
static void fill_redzone(struct block_hdr *hdr)
{
static void fill_redzone(struct block_hdr *hdr)
{
- unsigned int *postred =
(void *) hdr + hdr->size - sizeof(unsigned int
);
+ unsigned int *postred =
postred_ptr(hdr
);
hdr->prered = SMALLOC_PRE_RED;
*postred = SMALLOC_POST_RED;
hdr->prered = SMALLOC_PRE_RED;
*postred = SMALLOC_POST_RED;
@@
-278,7
+299,7
@@
static void fill_redzone(struct block_hdr *hdr)
static void sfree_check_redzone(struct block_hdr *hdr)
{
static void sfree_check_redzone(struct block_hdr *hdr)
{
- unsigned int *postred =
(void *) hdr + hdr->size - sizeof(unsigned int
);
+ unsigned int *postred =
postred_ptr(hdr
);
if (hdr->prered != SMALLOC_PRE_RED) {
fprintf(stderr, "smalloc pre redzone destroyed!\n");
if (hdr->prered != SMALLOC_PRE_RED) {
fprintf(stderr, "smalloc pre redzone destroyed!\n");
@@
-414,8
+435,13
@@
static void *smalloc_pool(struct pool *pool, unsigned int size)
unsigned int alloc_size = size + sizeof(struct block_hdr);
void *ptr;
unsigned int alloc_size = size + sizeof(struct block_hdr);
void *ptr;
+ /*
+ * Round to int alignment, so that the postred pointer will
+ * be naturally aligned as well.
+ */
#ifdef SMALLOC_REDZONE
alloc_size += sizeof(unsigned int);
#ifdef SMALLOC_REDZONE
alloc_size += sizeof(unsigned int);
+ alloc_size = (alloc_size + int_mask) & ~int_mask;
#endif
ptr = __smalloc_pool(pool, alloc_size);
#endif
ptr = __smalloc_pool(pool, alloc_size);