Commit 5b3009ac authored by Leif Walsh's avatar Leif Walsh Committed by Yoni Fogel
Browse files

[t:4462] finishing PROF=1 work, tests seem to compile and run (though it's 

not a great idea to compile *all* of them, and valgrind gets whiny)


git-svn-id: file:///svn/toku/tokudb@39697 c7de825b-a66e-492c-adef-691d508d4ae1
parent 7a49843b

newbrt/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -155,7 +155,7 @@ check: bins 
	cd tests;$(MAKE) check



ifeq ($(PROF),1)

$(BINS): $(NEWBRT_A) $(LIBPORTABILITY_SO)

$(BINS): $(NEWBRT_A) $(LIBPORTABILITY_A)

else

$(BINS): $(NEWBRT_SO) $(LIBPORTABILITY_SO)

endif

newbrt/tests/Makefile

+4 −0
Original line number Diff line number Diff line
@@ -250,7 +250,11 @@ clean: 
	rm -f test_oexcl.c.tmp

	rm -f *.brt *.clean *.dirty *.tdb *.dat *.data *.out *.check.valgrind *.fastlog



ifeq ($(PROF),1)

$(BINS): LDFLAGS=$(TOKUROOT)lib/libnewbrt.$(AEXT) $(LIBPORTABILITY_A) $(ALWAYS_LINK)

else

$(BINS): LDFLAGS=-L../../lib -l$(LIBTOKUPORTABILITY) -lnewbrt $(ALWAYS_LINK) -Wl,-rpath,$(shell pwd)/$(TOKUROOT)lib

endif

$(BINS): test.h



foo:

src/tests/Makefile

+4 −0
Original line number Diff line number Diff line
@@ -653,7 +653,11 @@ TDB_CFLAGS= 


%.tdb$(BINSUF) %.tdbt$(BINSUF): TDB_CFLAGS= -DENVDIR=\"dir.$<.tdb\" -DUSE_TDB -DIS_TDB=1

%.tdb$(BINSUF) %.tdbt$(BINSUF): CPPFLAGS+=-I$(TOKUROOT)include

ifeq ($(PROF),1)

%.tdb$(BINSUF) %.tdbt$(BINSUF): LDFLAGS+=$(LIBPORTABILITY_A)

else

%.tdb$(BINSUF) %.tdbt$(BINSUF): LDFLAGS+=-l$(LIBTOKUPORTABILITY)

endif

loader-stress-test: CPPFLAGS+=-I$(TOKUROOT)include -DENVDIR=\"dir.$<\"

loader-stress-test: LOADLIBES+=-L../lib -ltokudb -Wl,-rpath,..

utils/Makefile

+5 −1
Original line number Diff line number Diff line
@@ -42,11 +42,15 @@ ifeq ($(OS_CHOICE),windows) 
$(UTILS): LINK_FILES+=$(WIN_YDB)

$(UTILS): $(WIN_YDB)

else

YDB_OBJS=$(wildcard ../src/*.$(OEXT))

 ifeq ($(PROF),1)

$(STATIC_UTILS) $(UTILS): LINK_FILES=$(YDB_OBJS) $(TOKUROOT)lib/libtokudb.$(AEXT) $(LOCKTREE) $(RANGETREE) $(TOKUROOT)lib/libnewbrt.$(AEXT) $(LIBPORTABILITY_A)

 else

$(UTILS): DLINK_FILES=$(TOKUROOT)lib/libtokudb.$(SOEXT) $(TOKUROOT)lib/libtokuportability.$(SOEXT)

NEWBRT_OBJS=$(patsubst %,../%,$(shell cat $(TOKUROOT)lib/newbrt.olist))

TOKUPORTABILITY_OBJS=$(patsubst %,../%,$(shell cat $(TOKUROOT)lib/tokuportability.olist))

YDB_OBJS=$(wildcard ../src/*.$(OEXT))

$(STATIC_UTILS): LINK_FILES+= $(NEWBRT_OBJS) $(TOKUPORTABILITY_OBJS) $(YDB_OBJS) ../src/lock_tree/locktree.a ../src/range_tree/rangetree.a

 endif



ifeq ($(BRTLOADER),cilk)

	DLINK_FILES += cilkrts stdc++