Commit 9385974d authored by Bradley C. Kuszmaul's avatar Bradley C. Kuszmaul Committed by Yoni Fogel

Cleaned up. Note that some stuff moved into the windows directory with...

Cleaned up.  Note that some stuff moved into the windows directory with symlinks from linux (since I know that symlinks work in linux, but maybe not in windows.)   Addresses #1348.

git-svn-id: file:///svn/toku/tokudb.1032b+1343@8560 c7de825b-a66e-492c-adef-691d508d4ae1
parent f9ff91ab
...@@ -100,6 +100,11 @@ void *os_malloc(size_t); ...@@ -100,6 +100,11 @@ void *os_malloc(size_t);
void *os_realloc(void*,size_t); void *os_realloc(void*,size_t);
void os_free(void*); void os_free(void*);
int toku_set_func_fsync (int (*fsync_function)(int));
int toku_set_func_malloc (void *(*)(size_t));
int toku_set_func_realloc (void *(*)(void*,size_t));
int toku_set_func_free (void (*)(void*));
#if defined __cplusplus #if defined __cplusplus
}; };
#endif #endif
......
../windows/memory.c
\ No newline at end of file
../windows/toku_assert.c
\ No newline at end of file
...@@ -49,13 +49,11 @@ BRT_SOURCES = \ ...@@ -49,13 +49,11 @@ BRT_SOURCES = \
log \ log \
log_code \ log_code \
memarena \ memarena \
memory \
mempool \ mempool \
omt \ omt \
recover \ recover \
roll \ roll \
threadpool \ threadpool \
toku_assert \
trace_mem \ trace_mem \
x1764 \ x1764 \
ybt \ ybt \
......
...@@ -121,9 +121,4 @@ void toku_pwrite_lock_destroy(void); ...@@ -121,9 +121,4 @@ void toku_pwrite_lock_destroy(void);
void maybe_preallocate_in_file (int fd, u_int64_t size); void maybe_preallocate_in_file (int fd, u_int64_t size);
// Effect: If file size is less than SIZE, make it bigger by either doubling it or growing by 16MB whichever is less. // Effect: If file size is less than SIZE, make it bigger by either doubling it or growing by 16MB whichever is less.
int toku_set_func_fsync (int (*fsync_function)(int));
int toku_set_func_malloc (void *(*)(size_t));
int toku_set_func_realloc (void *(*)(void*,size_t));
int toku_set_func_free (void (*)(void*));
#endif #endif
#include "toku_portability.h" #include "toku_portability.h"
#include "toku_assert.h"
#include "memory.h" #include "memory.h"
#include <string.h> #include <string.h>
#include <stdlib.h> #include <stdlib.h>
#include "toku_assert.h"
int toku_memory_check=0; int toku_memory_check=0;
......
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