From 4f9aeee6c7414bec2e1d8a9d3508dbd21f4d3394 Mon Sep 17 00:00:00 2001 From: Joshua Haberman Date: Mon, 14 Feb 2011 10:24:33 -0800 Subject: More completely fixed the 0-key thing. Unfortunately this degrades hash table lookup performance by about 8%, which affects the streaming benchmark for googlemessage1 by about 5%. We could get this back at the cost of some memory, but it would be nice to avoid that. --- Makefile | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index 92f1cd8..13cd4c2 100644 --- a/Makefile +++ b/Makefile @@ -40,7 +40,7 @@ LDLIBS=-lpthread src/libupb.a # of the scheme we use that compiles the same source file multiple times with # different -D options, which can include different header files. deps: gen-deps.sh Makefile $(CORE) $(STREAM) - @CPPFLAGS="$(CPPFLAGS)" ./gen-deps.sh $(CORE) $(STREAM) + @CPPFLAGS="$(CPPFLAGS)" ./gen-deps.sh $(CORE) $(STREAM) $(TOOLS) @echo Regenerating dependencies for src/... $(ALLSRC): perf-cppflags @@ -68,6 +68,9 @@ STREAM= \ src/upb_msg.c \ src/upb_glue.c \ +TOOLS= \ + src/upbc.c + # Parts of core that are yet to be converted. OTHERSRC=src/upb_encoder.c src/upb_text.c @@ -222,13 +225,13 @@ tests/t.test_vs_proto2.googlemessage2: \ tests/test_table: tests/test_table.cc @# Includes which is a deprecated header. @echo CXX $< - $(CXX) $(CXXFLAGS) $(CPPFLAGS) -Wno-deprecated -o $@ $< $(LIBUPB) + @$(CXX) $(CXXFLAGS) $(CPPFLAGS) -Wno-deprecated -o $@ $< $(LIBUPB) tests/tests: src/libupb.a # Tools tools: src/upbc -tools/upbc: $(LIBUPB) +src/upbc: $(LIBUPB) # Benchmarks. ################################################################## -- cgit v1.2.3