projects
/
fio.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fio 2.2.1
[fio.git]
/
smalloc.c
diff --git
a/smalloc.c
b/smalloc.c
index d0f732baee6cc6515e26f554432fae87958c0bf6..1ba9353518813179fd3e277ae2cbeeec20a43129 100644
(file)
--- a/
smalloc.c
+++ b/
smalloc.c
@@
-17,6
+17,7
@@
#include "arch/arch.h"
#include "os/os.h"
#include "smalloc.h"
#include "arch/arch.h"
#include "os/os.h"
#include "smalloc.h"
+#include "log.h"
#define SMALLOC_REDZONE /* define to detect memory corruption */
#define SMALLOC_REDZONE /* define to detect memory corruption */
@@
-221,7
+222,7
@@
static int add_pool(struct pool *pool, unsigned int alloc_size)
nr_pools++;
return 0;
out_fail:
nr_pools++;
return 0;
out_fail:
-
fprintf(stderr,
"smalloc: failed adding pool\n");
+
log_err(
"smalloc: failed adding pool\n");
if (pool->map)
munmap(pool->map, pool->mmap_size);
return 1;
if (pool->map)
munmap(pool->map, pool->mmap_size);
return 1;
@@
-283,14
+284,14
@@
static void sfree_check_redzone(struct block_hdr *hdr)
unsigned int *postred = postred_ptr(hdr);
if (hdr->prered != SMALLOC_PRE_RED) {
unsigned int *postred = postred_ptr(hdr);
if (hdr->prered != SMALLOC_PRE_RED) {
- fprintf(stderr, "smalloc pre redzone destroyed!\n");
-
fprintf(stderr, "
ptr=%p, prered=%x, expected %x\n",
+ log_err("smalloc pre redzone destroyed!\n"
+
"
ptr=%p, prered=%x, expected %x\n",
hdr, hdr->prered, SMALLOC_PRE_RED);
assert(0);
}
if (*postred != SMALLOC_POST_RED) {
hdr, hdr->prered, SMALLOC_PRE_RED);
assert(0);
}
if (*postred != SMALLOC_POST_RED) {
- fprintf(stderr, "smalloc post redzone destroyed!\n");
-
fprintf(stderr,
" ptr=%p, postred=%x, expected %x\n",
+ log_err("smalloc post redzone destroyed!\n"
+
" ptr=%p, postred=%x, expected %x\n",
hdr, *postred, SMALLOC_POST_RED);
assert(0);
}
hdr, *postred, SMALLOC_POST_RED);
assert(0);
}
@@
-478,6
+479,17
@@
out:
return NULL;
}
return NULL;
}
+void *scalloc(size_t nmemb, size_t size)
+{
+ void *ret;
+
+ ret = smalloc(nmemb * size);
+ if (ret)
+ memset(ret, 0, nmemb * size);
+
+ return ret;
+}
+
char *smalloc_strdup(const char *str)
{
char *ptr;
char *smalloc_strdup(const char *str)
{
char *ptr;