Commit 0399d06d authored by Rich Prohaska's avatar Rich Prohaska Committed by Yoni Fogel
Browse files

#4682 remove cilkarts code from the loader. refs[t:4682] 

git-svn-id: file:///svn/toku/tokudb@42090 c7de825b-a66e-492c-adef-691d508d4ae1
parent 1a382c07

newbrt/brt-cachetable-wrappers.h

+0 −5
Original line number Diff line number Diff line
@@ -6,12 +6,9 @@ 
#ident "Copyright (c) 2007-2011 Tokutek Inc.  All rights reserved."

#ident "The technology is licensed by the Massachusetts Institute of Technology, Rutgers State University of New Jersey, and the Research Foundation of State University of New York at Stony Brook under United States of America Serial No. 11/760379 and to the patents and/or patent applications resulting from it."



#include <c_dialects.h>

#include <brttypes.h>

#include "cachetable.h"



C_BEGIN



/**

 * Put an empty node (that is, no fields filled) into the cachetable. 

 * In the process, write dependent nodes out for checkpoint if
@@ -129,6 +126,4 @@ toku_unpin_brtnode(BRT brt, BRTNODE node); 
void

toku_unpin_brtnode_read_only(BRT brt, BRTNODE node);



C_END



#endif

newbrt/brt-flusher-internal.h

+0 −4
Original line number Diff line number Diff line
@@ -6,9 +6,6 @@ 
#ident "The technology is licensed by the Massachusetts Institute of Technology, Rutgers State University of New Jersey, and the Research Foundation of State University of New York at Stony Brook under United States of America Serial No. 11/760379 and to the patents and/or patent applications resulting from it."



#include <brttypes.h>

#include <c_dialects.h>



C_BEGIN



#define ft_flush_before_applying_inbox 1

#define ft_flush_before_child_pin 2
@@ -161,6 +158,5 @@ default_pick_child_after_split(struct brt_header *h, 
                               int childnumb,

                               void *extra);



C_END



#endif // End of header guardian.

newbrt/brt-flusher.h

+0 −5
Original line number Diff line number Diff line
@@ -7,9 +7,6 @@ 


// This must be first to make the 64-bit file mode work right in Linux

#include <brttypes.h>

#include <c_dialects.h>



C_BEGIN



typedef enum {

    BRT_FLUSHER_CLEANER_TOTAL_NODES = 0,     // total number of nodes whose buffers are potentially flushed by cleaner thread
@@ -146,6 +143,4 @@ toku_brt_hot_optimize(BRT brt, 
                      int (*progress_callback)(void *extra, float progress),

                      void *progress_extra);



C_END



#endif // End of header guardian.

newbrt/brt-internal.h

+0 −5
Original line number Diff line number Diff line
@@ -25,14 +25,11 @@ 
#include "omt.h"

#include "leafentry.h"

#include "block_table.h"

#include "c_dialects.h"

#include "mempool.h"

#include "compress.h"



// Uncomment the following to use quicklz



C_BEGIN



#ifndef BRT_FANOUT

#define BRT_FANOUT 16

#endif
@@ -969,6 +966,4 @@ void toku_flusher_thread_set_callback(void (*callback_f)(int, void*), void* extr 
void toku_brt_header_note_hot_begin(BRT brt);

void toku_brt_header_note_hot_complete(BRT brt, BOOL success, MSN msn_at_start_of_hot);



C_END



#endif

newbrt/brt.h

+0 −5
Original line number Diff line number Diff line
@@ -13,11 +13,8 @@ 
#include "cachetable.h"

#include "log.h"

#include "brt-search.h"

#include "c_dialects.h"

#include "compress.h"



C_BEGIN



// A callback function is invoked with the key, and the data.

// The pointers (to the bytevecs) must not be modified.  The data must be copied out before the callback function returns.

// Note: In the thread-safe version, the brt node remains locked while the callback function runs.  So return soon, and don't call the BRT code from the callback function.
@@ -314,6 +311,4 @@ int toku_brt_strerror_r(int error, char *buf, size_t buflen); 


extern BOOL garbage_collection_debug;



C_END



#endif