Closes #513

Integrated tlogn lock tree into tokudb.

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

src/Makefile

@@ -52,7 +52,7 @@ ydb.o: ../include/db.h ../newbrt/cachetable.h ../newbrt/brt.h ../newbrt/log.c
 
 DBBINS = ydb.o errors.o elocks.o ../newbrt/brt.o ../newbrt/brt-serialize.o ../newbrt/brt-verify.o ../newbrt/cachetable.o ../newbrt/fifo.o ../newbrt/key.o ../newbrt/memory.o ../newbrt/mempool.o ../newbrt/pma.o ../newbrt/ybt.o ../newbrt/primes.o ../newbrt/log.o ../newbrt/fingerprint.o ../newbrt/log_code.o ../newbrt/roll.o ../newbrt/toku_assert.o
 
-RANGETREE_BINS = range_tree/rangetree.o
+RANGETREE_BINS = range_tree/rangetree.o range_tree/tokuredblack.o
 LOCKTREE_BINS  = lock_tree/locktree.o lock_tree/rth.o lock_tree/lth.o $(RANGETREE_BINS)
 
 

src/lock_tree/Makefile

@@ -47,7 +47,7 @@ clean:
 
 BINS = locktree.o rth.o lth.o
 
-locktree.o: $(LT_LINEAR)
+locktree.o: $(LT_TLOG)
 	cp $< $@
 
 locktree_global_readset.o: locktree.c locktree.h

src/range_tree/Makefile

@@ -5,19 +5,7 @@ OPTFLAGS = -O2
 
 LIBNAME=libtokurange
 
-EXPORTMAP = -Wl,--version-script=rangeexport.map
-VISIBILITY = -fvisibility=hidden
-
-ifneq ($(OSX),)
-LIBRARY=$(LIBNAME).dylib
-SHARED=-dynamiclib
-RPATHNAME=-install_name @rpath/$(LIBRARY)
-CFLAGS+=-fno-common
-else
-LIBRARY=$(LIBNAME).so
-SHARED=-shared $(EXPORTMAP)
-RPATHNAME=
-endif
+VISIBILITY = #-fvisibility=hidden
 
 ifneq ($(GCOV),)
  GCOV_FLAGS = -fprofile-arcs -ftest-coverage
@@ -37,14 +25,13 @@ CFLAGS+=-fno-common
 endif
 
 .PHONY: install
-install: linear.o rangetree.o log_nooverlap.o tokuredblack.o $(LIBRARY) #log.o 
-	cp $(LIBRARY) ../../lib/
+install: linear.o log_nooverlap.o tokuredblack.o rangetree.o #log.o 
 
 clean:
 	rm -rf *.o *.gcno *.gcda *.gcov
 	cd tests && make clean
 
-rangetree.o: linear.o
+rangetree.o: log_nooverlap.o
 	cp $< $@
 
 HEADERS=rangetree.h rangetree-internal.h
@@ -56,6 +43,3 @@ log.o: log.c                        $(HEADERS)
 log_nooverlap.o: log_nooverlap.c    $(HEADERS)
 
 tokuredblack.o:  tokuredblack.c     $(HEADERS) tokuredblack.h
-
-$(LIBRARY): tokuredblack.o
-	cc  $(CPPFLAGS) $^ $(SHARED) -o $@ $(CFLAGS) $(RPATHNAME)

src/range_tree/tests/Makefile

@@ -32,7 +32,7 @@ RUN_TLOG_TESTS = $(patsubst %.tlog,%.tlogrun,$(TLOG_TESTS))
 RUN_LIN_TESTS  = $(patsubst %.lin,%.linrun,$(LIN_TESTS))
 RUN_ALL_TESTS  = $(RUN_LIN_TESTS) $(RUN_TLOG_TESTS) $(RUN_LOG_TESTS)
 
-.PHONY: default all check check.lin check.log tests.lin tests.log tests.tlog
+.PHONY: default all check check.lin check.tlog check.log tests.lin tests.log tests.tlog
 
 default: check
 
@@ -86,14 +86,14 @@ endif
 	$(MAYBEATSIGN) $(VGRIND) ./$< $(VERBVERBOSE)
 
 LINEAR_BINS = ../linear.o
-TLOG_BINS   = ../log_nooverlap.o
+TLOG_BINS   = ../log_nooverlap.o ../tokuredblack.o
 LOG_BINS    = ../log.o
 HEADERS=../rangetree.h ../rangetree-internal.h test.h
 
 %.lin: %.c  $(HEADERS) $(LINEAR_BINS)
 	cc  -DDIR=\"dir.$<.lin\" $(CFLAGS) $(CPPFLAGS) $< -o $@ $(LINEAR_BINS)
-%.tlog: %.c $(HEADERS) $(TLOG_BINS) ../libtokurange.so
-	cc  -L../ -ltokurange -Wl,-rpath,.. -DDIR=\"dir.$<.log\" $(CFLAGS) $(CPPFLAGS) $< -o $@ $(TLOG_BINS) -DTOKU_RT_NOOVERLAPS
+%.tlog: %.c $(HEADERS) $(TLOG_BINS)
+	cc  -DDIR=\"dir.$<.log\" $(CFLAGS) $(CPPFLAGS) $< -o $@ $(TLOG_BINS) -DTOKU_RT_NOOVERLAPS
 %.log: %.c  $(HEADERS) $(LOG_BINS)
 	cc  -DDIR=\"dir.$<.log\" $(CFLAGS) $(CPPFLAGS) $< -o $@ $(LOG_BINS)