mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-02-02 12:01:42 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

refs #5537 replace non-abstracted function calls with calls into the portability layer

Browse source 
git-svn-id: file:///svn/toku/tokudb@48401 c7de825b-a66e-492c-adef-691d508d4ae1
This commit is contained in:
Leif Walsh 2013-04-17 00:01:12 -04:00 • committed by Yoni Fogel
parent 6e7e267038
commit 4a329a8f28
2 changed files with 16 additions and 33 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
src/tests/loader-stress-del.cc
View file

@ -14,6 +14,7 @@
#include <db.h> #include <db.h>
#include <sys/stat.h> #include <sys/stat.h>
#include "ydb-internal.h" #include "ydb-internal.h"
#include <memory.h>
#include <dlfcn.h> #include <dlfcn.h>
DB_ENV *env; DB_ENV *env;
@ -40,18 +41,9 @@ size_t hiwater_start;
static long long mcount = 0, fcount=0; static long long mcount = 0, fcount=0;
typedef size_t (*malloc_usable_size_fun_t)(void *p);
#if defined(HAVE_MALLOC_USABLE_SIZE)
extern "C" size_t malloc_usable_size(void *p);
static malloc_usable_size_fun_t malloc_usable_size_f = malloc_usable_size;
#elif defined(HAVE_MALLOC_SIZE)
extern "C" size_t malloc_size(void *p);
static malloc_usable_size_fun_t malloc_usable_size_f = malloc_size;
#endif
static void my_free(void*p) { static void my_free(void*p) {
if (p) { if (p) {
water-=malloc_usable_size_f(p); water-=toku_malloc_usable_size(p);
} }
free(p); free(p);
} }
@ -59,18 +51,18 @@ static void my_free(void*p) {
static void *my_malloc(size_t size) { static void *my_malloc(size_t size) {
void *r = malloc(size); void *r = malloc(size);
if (r) { if (r) {
water += malloc_usable_size_f(r); water += toku_malloc_usable_size(r);
if (water>hiwater) hiwater=water; if (water>hiwater) hiwater=water;
} }
return r; return r;
} }
static void *my_realloc(void *p, size_t size) { static void *my_realloc(void *p, size_t size) {
size_t old_usable = p ? malloc_usable_size_f(p) : 0; size_t old_usable = p ? toku_malloc_usable_size(p) : 0;
void *r = realloc(p, size); void *r = realloc(p, size);
if (r) { if (r) {
water -= old_usable; water -= old_usable;
water += malloc_usable_size_f(r); water += toku_malloc_usable_size(r);
} }
return r; return r;
} }
@ -580,7 +572,7 @@ int test_main(int argc, char * const *argv) {
toku_free(progress_infos); toku_free(progress_infos);
} }
if (footprint_print) { if (footprint_print) {
printf("%s:%d Hiwater=%ld water=%ld (extra hiwater=%ldM) mcount=%lld fcount=%lld\n", __FILE__, __LINE__, hiwater, water, (hiwater-hiwater_start)/(1024*1024), mcount, fcount); printf("%s:%d Hiwater=%ld water=%ld (extra hiwater=%ldM) mcount=%lld fcount=%lld\n", __FILE__, __LINE__, hiwater, water, (hiwater-hiwater_start)/(1024*1024), mcount, fcount);
typedef void (*malloc_stats_fun_t)(void); typedef void (*malloc_stats_fun_t)(void);
malloc_stats_fun_t malloc_stats_f = (malloc_stats_fun_t) dlsym(RTLD_DEFAULT, "malloc_stats"); malloc_stats_fun_t malloc_stats_f = (malloc_stats_fun_t) dlsym(RTLD_DEFAULT, "malloc_stats");
if (malloc_stats_f) { if (malloc_stats_f) {

25
src/tests/loader-stress-test.cc
View file

@ -23,6 +23,7 @@
#include <db.h> #include <db.h>
#include <sys/stat.h> #include <sys/stat.h>
#include "ydb-internal.h" #include "ydb-internal.h"
#include <memory.h>
#include <dlfcn.h> #include <dlfcn.h>
DB_ENV *env; DB_ENV *env;
@ -48,19 +49,9 @@ size_t water;
size_t hiwater_start; size_t hiwater_start;
static long long mcount = 0, fcount=0; static long long mcount = 0, fcount=0;
typedef size_t (*malloc_usable_size_fun_t)(void *p);
#if defined(HAVE_MALLOC_USABLE_SIZE)
extern "C" size_t malloc_usable_size(void *p);
static malloc_usable_size_fun_t malloc_usable_size_f = malloc_usable_size;
#elif defined(HAVE_MALLOC_SIZE)
extern "C" size_t malloc_size(void *p);
static malloc_usable_size_fun_t malloc_usable_size_f = malloc_size;
#endif
static void my_free(void*p) { static void my_free(void*p) {
if (p) { if (p) {
water-=malloc_usable_size_f(p); water-=toku_malloc_usable_size(p);
} }
free(p); free(p);
} }
@ -68,18 +59,18 @@ static void my_free(void*p) {
static void *my_malloc(size_t size) { static void *my_malloc(size_t size) {
void *r = malloc(size); void *r = malloc(size);
if (r) { if (r) {
water += malloc_usable_size_f(r); water += toku_malloc_usable_size(r);
if (water>hiwater) hiwater=water; if (water>hiwater) hiwater=water;
} }
return r; return r;
} }
static void *my_realloc(void *p, size_t size) { static void *my_realloc(void *p, size_t size) {
size_t old_usable = p ? malloc_usable_size_f(p) : 0; size_t old_usable = p ? toku_malloc_usable_size(p) : 0;
void *r = realloc(p, size); void *r = realloc(p, size);
if (r) { if (r) {
water -= old_usable; water -= old_usable;
water += malloc_usable_size_f(r); water += toku_malloc_usable_size(r);
} }
return r; return r;
} }
@ -564,7 +555,7 @@ int test_main(int argc, char * const *argv) {
toku_free(progress_infos); toku_free(progress_infos);
} }
if (footprint_print) { if (footprint_print) {
printf("%s:%d Hiwater=%ld water=%ld (extra hiwater=%ldM) mcount=%lld fcount=%lld\n", __FILE__, __LINE__, hiwater, water, (hiwater-hiwater_start)/(1024*1024), mcount, fcount); printf("%s:%d Hiwater=%ld water=%ld (extra hiwater=%ldM) mcount=%lld fcount=%lld\n", __FILE__, __LINE__, hiwater, water, (hiwater-hiwater_start)/(1024*1024), mcount, fcount);
typedef void (*malloc_stats_fun_t)(void); typedef void (*malloc_stats_fun_t)(void);
malloc_stats_fun_t malloc_stats_f = (malloc_stats_fun_t) dlsym(RTLD_DEFAULT, "malloc_stats"); malloc_stats_fun_t malloc_stats_f = (malloc_stats_fun_t) dlsym(RTLD_DEFAULT, "malloc_stats");
if (malloc_stats_f) { if (malloc_stats_f) {