Skip to content

M
MariaDB
Commit 567444ec authored by Bradley C. Kuszmaul's avatar Bradley C. Kuszmaul Committed by Yoni Fogel
Browse files
Options

Separate out the common malloc into newbrt/memory.c, and put the os-specific... 

Separate out the common malloc into newbrt/memory.c, and put the os-specific stuff into windows and linux subdirs.  Addresses #1343.

git-svn-id: file:///svn/toku/tokudb.1032b+1343@8558 c7de825b-a66e-492c-adef-691d508d4ae1
parent 5494788a
Show whitespace changes
Inline Side-by-side
Showing with 160 additions and 168 deletions
include/toku_portability.h
View file @ 567444ec
......@@ -96,6 +96,10 @@ void *realloc(void*, size_t) __attribute__((__deprecated__));
# endif
#endif
void *os_malloc(size_t);
void *os_realloc(void*,size_t);
void os_free(void*);
#if defined __cplusplus
};
#endif
......
linux/memory.c
View file @ 567444ec
......@@ -2,120 +2,22 @@
#ident "Copyright (c) 2007, 2008 Tokutek Inc. All rights reserved."
#include "toku_portability.h"
#include "memory.h"
#include <assert.h>
#include <string.h>
#include <malloc.h>
#include <errno.h>
int toku_memory_check=0;
int toku_calloc_counter = 0;
int toku_malloc_counter = 0;
int toku_realloc_counter = 0;
int toku_free_counter = 0;
typedef void *(*malloc_fun_t)(size_t);
typedef void (*free_fun_t)(void*);
typedef void *(*realloc_fun_t)(void*,size_t);
static malloc_fun_t t_malloc = 0;
static free_fun_t t_free = 0;
static realloc_fun_t t_realloc = 0;
void *toku_malloc(size_t size) {
toku_malloc_counter++;
if (t_malloc)
return t_malloc(size);
else
void *
os_malloc(size_t size)
{
return malloc(size);
}
void *toku_calloc(size_t nmemb, size_t size) {
toku_calloc_counter++;
return toku_malloc(nmemb*size);
}
void *toku_xmalloc(size_t size) {
void *r = toku_malloc(size);
if (r==0) abort();
return r;
}
void *toku_xrealloc(void *v, size_t size) {
void *r = toku_realloc(v, size);
if (r==0) abort();
return r;
}
void *toku_tagmalloc(size_t size, enum typ_tag typtag) {
//printf("%s:%d tagmalloc\n", __FILE__, __LINE__);
void *r = toku_malloc(size);
if (!r) return 0;
assert(size>sizeof(int));
((int*)r)[0] = typtag;
return r;
}
void *toku_realloc(void *p, size_t size) {
toku_realloc_counter++;
if (t_realloc)
return t_realloc(p, size);
else
void *
os_realloc(void *p, size_t size)
{
return realloc(p, size);
}
void toku_free(void* p) {
toku_free_counter++;
if (t_free)
t_free(p);
else
void
os_free(void* p)
{
free(p);
}
void toku_free_n(void* p, size_t size __attribute__((unused))) {
toku_free(p);
}
void *toku_memdup (const void *v, size_t len) {
void *r=toku_malloc(len);
memcpy(r,v,len);
return r;
}
char *toku_strdup (const char *s) {
return toku_memdup(s, strlen(s)+1);
}
void toku_memory_check_all_free (void) {
}
int toku_get_n_items_malloced (void) { return 0; }
void toku_print_malloced_items (void) {
}
void toku_malloc_report (void) {
}
void toku_malloc_cleanup (void) {
}
int
toku_set_func_malloc(malloc_fun_t f) {
t_malloc = f;
return 0;
}
int
toku_set_func_realloc(realloc_fun_t f) {
t_realloc = f;
return 0;
}
int
toku_set_func_free(free_fun_t f) {
t_free = f;
return 0;
}
newbrt/memory.c 0 → 100644
View file @ 567444ec
void *toku_malloc(size_t size) {
toku_malloc_counter++;
if (t_malloc)
return t_malloc(size);
else
return os_malloc(size);
}
void *
toku_calloc(size_t nmemb, size_t size)
{
size_t newsize = nmemb * size;
toku_calloc_counter++;
void *vp = toku_malloc(newsize);
if (vp) memset(vp, 0, newsize);
return vp;
}
void *
toku_xmalloc(size_t size) {
void *r = toku_malloc(size);
if (r==0) abort();
return r;
}
void *
toku_xrealloc(void *v, size_t size)
{
void *r = toku_realloc(v, size);
if (r==0) abort();
return r;
}
void *
toku_tagmalloc(size_t size, enum typ_tag typtag)
{
//printf("%s:%d tagmalloc\n", __FILE__, __LINE__);
void *r = toku_malloc(size);
if (!r) return 0;
assert(size>sizeof(int));
((int*)r)[0] = typtag;
return r;
}
void *
toku_realloc(void *p, size_t size)
{
toku_realloc_counter++;
if (t_realloc)
return t_realloc(p, size);
else
return os_realloc(p, size);
}
void
toku_free(void* p)
{
toku_free_counter++;
if (t_free)
t_free(p);
else
os_free(p);
}
void
toku_free_n(void* p, size_t size __attribute__((unused)))
{
toku_free(p);
}
void *
toku_memdup (const void *v, size_t len)
{
void *r=toku_malloc(len);
if (r) memcpy(r,v,len);
return r;
}
char *
toku_strdup (const char *s)
{
return toku_memdup(s, strlen(s)+1);
}
void
toku_memory_check_all_free (void)
{
}
int
toku_get_n_items_malloced (void)
{
return 0;
}
void
toku_print_malloced_items (void)
{
}
void
toku_malloc_report (void)
{
}
void
toku_malloc_cleanup (void)
{
}
int
toku_set_func_malloc(malloc_fun_t f) {
t_malloc = f;
return 0;
}
int
toku_set_func_realloc(realloc_fun_t f) {
t_realloc = f;
return 0;
}
int
toku_set_func_free(free_fun_t f) {
t_free = f;
return 0;
}
windows/memory.c
View file @ 567444ec
......@@ -17,6 +17,14 @@ int toku_malloc_counter = 0;
int toku_realloc_counter = 0;
int toku_free_counter = 0;
typedef void *(*malloc_fun_t)(size_t);
typedef void (*free_fun_t)(void*);
typedef void *(*realloc_fun_t)(void*,size_t);
static malloc_fun_t t_malloc = 0;
static free_fun_t t_free = 0;
static realloc_fun_t t_realloc = 0;
static inline size_t resize(size_t n) {
if (n >= 1*1024*1024)
n = (n+7) & ~7; // round up to make windbg !heap happy
......@@ -43,69 +51,20 @@ static inline size_t resize(size_t n) {
return n;
}
void *toku_calloc(size_t nmemb, size_t size) {
void *vp;
size_t newsize = resize(nmemb * size);
toku_calloc_counter++;
vp = malloc(newsize);
if (vp)
memset(vp, 0, newsize);
return vp;
}
void *toku_malloc(size_t size) {
toku_malloc_counter++;
void *
os_malloc(size_t size)
{
return malloc(resize(size));
}
void *toku_xmalloc(size_t size) {
void *r = toku_malloc(size);
if (r==0) abort();
return r;
}
void *toku_tagmalloc(size_t size, enum typ_tag typtag) {
//printf("%s:%d tagmalloc\n", __FILE__, __LINE__);
void *r = toku_malloc(size);
if (!r) return 0;
assert(size>sizeof(int));
((int*)r)[0] = typtag;
return r;
}
void *toku_realloc(void *p, size_t size) {
toku_realloc_counter++;
void *
os_realloc(void *p, size_t size)
{
return realloc(p, resize(size));
}
void toku_free(void* p) {
toku_free_counter++;
void
os_free(void* p)
{
free(p);
}
void toku_free_n(void* p, size_t size __attribute__((unused))) {
toku_free(p);
}
void *toku_memdup (const void *v, size_t len) {
void *r=toku_malloc(len);
memcpy(r,v,len);
return r;
}
char *toku_strdup (const char *s) {
return toku_memdup(s, strlen(s)+1);
}
void toku_memory_check_all_free (void) {
}
int toku_get_n_items_malloced (void) { return 0; }
void toku_print_malloced_items (void) {
}
void toku_malloc_report (void) {
}
void toku_malloc_cleanup (void) {
}
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7