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

git-svn-id: file:///svn/toku/tokudb@48401 c7de825b-a66e-492c-adef-691d508d4ae1

src/tests/loader-stress-del.cc

@@ -14,6 +14,7 @@
 #include <db.h>
 #include <sys/stat.h>
 #include "ydb-internal.h"
+#include <memory.h>
 #include <dlfcn.h>
 
 DB_ENV *env;
@@ -40,18 +41,9 @@ size_t hiwater_start;
 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) {
     if (p) {
-	water-=malloc_usable_size_f(p);
+        water-=toku_malloc_usable_size(p);
     }
     free(p);
 }
@@ -59,18 +51,18 @@ static void my_free(void*p) {
 static void *my_malloc(size_t size) {
     void *r = malloc(size);
     if (r) {
-	water += malloc_usable_size_f(r);
+        water += toku_malloc_usable_size(r);
         if (water>hiwater) hiwater=water;
     }
     return r;
 }
 
 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);
     if (r) {
         water -= old_usable;
-	water += malloc_usable_size_f(r);
+        water += toku_malloc_usable_size(r);
     }
     return r;
 }

src/tests/loader-stress-test.cc

@@ -23,6 +23,7 @@
 #include <db.h>
 #include <sys/stat.h>
 #include "ydb-internal.h"
+#include <memory.h>
 #include <dlfcn.h>
 
 DB_ENV *env;
@@ -48,19 +49,9 @@ size_t water;
 size_t hiwater_start;
 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) {
     if (p) {
-	water-=malloc_usable_size_f(p);
+        water-=toku_malloc_usable_size(p);
     }
     free(p);
 }
@@ -68,18 +59,18 @@ static void my_free(void*p) {
 static void *my_malloc(size_t size) {
     void *r = malloc(size);
     if (r) {
-	water += malloc_usable_size_f(r);
+        water += toku_malloc_usable_size(r);
         if (water>hiwater) hiwater=water;
     }
     return r;
 }
 
 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);
     if (r) {
         water -= old_usable;
-	water += malloc_usable_size_f(r);
+        water += toku_malloc_usable_size(r);
     }
     return r;
 }