From 631539a5f2a304796a54d79cc38e71625f9f9ffa Mon Sep 17 00:00:00 2001 From: Pieter Noordhuis Date: Fri, 13 Apr 2012 17:34:31 -0700 Subject: [PATCH 1/8] Rename ADD_*FLAGS -> REDIS_*FLAGS, REDIS_*FLAGS -> FINAL_*FLAGS This reflects that REDIS_*FLAGS will only be used for compilation of Redis and not for its dependencies. Similarly, that FINAL_*FLAGS are composed of other variables and holds the options that are finally passed to the compiler and linker. --- src/Makefile | 60 ++++++++++++++++++++++++++-------------------------- 1 file changed, 30 insertions(+), 30 deletions(-) diff --git a/src/Makefile b/src/Makefile index 7d858561..5df4b4b7 100644 --- a/src/Makefile +++ b/src/Makefile @@ -2,12 +2,12 @@ # Copyright (C) 2009 Salvatore Sanfilippo # This file is released under the BSD license, see the COPYING file # -# The Makefile composes the final REDIS_CFLAGS and REDIS_LDFLAGS using +# The Makefile composes the final FINAL_CFLAGS and FINAL_LDFLAGS using # what is needed for Redis plus the standard CFLAGS and LDFLAGS passed. # However when building the dependencies (Jemalloc, Lua, Hiredis, ...) # CFLAGS and LDFLAGS are propagated to the dependencies, so to pass -# flags only to be used when compiling / linking Redis itself ADD_CFLAGS -# and ADD_LDFLAGS are used instead (this is the case of 'make gcov'). +# flags only to be used when compiling / linking Redis itself REDIS_CFLAGS +# and REDIS_LDFLAGS are used instead (this is the case of 'make gcov'). # # Dependencies are stored in the Makefile.dep file. To rebuild this file # Just use 'make dep', but this is only needed by developers. @@ -22,19 +22,19 @@ WARN= -Wall OPT= $(OPTIMIZATION) ifeq ($(uname_S),SunOS) - REDIS_CFLAGS= $(STD) $(WARN) $(OPT) $(DEBUG) $(CFLAGS) $(ADD_CFLAGS) -D__EXTENSIONS__ -D_XPG6 - REDIS_LDFLAGS= $(LDFLAGS) $(ADD_LDFLAGS) - REDIS_LIBS= $(LIBS) -ldl -lnsl -lsocket -lm -lpthread + FINAL_CFLAGS= $(STD) $(WARN) $(OPT) $(DEBUG) $(CFLAGS) $(REDIS_CFLAGS) -D__EXTENSIONS__ -D_XPG6 + FINAL_LDFLAGS= $(LDFLAGS) $(REDIS_LDFLAGS) + FINAL_LIBS= $(LIBS) -ldl -lnsl -lsocket -lm -lpthread DEBUG= -g -ggdb else - REDIS_CFLAGS= $(STD) $(WARN) $(OPT) $(DEBUG) $(CFLAGS) $(ADD_CFLAGS) - REDIS_LDFLAGS= $(LDFLAGS) $(ADD_LDFLAGS) - REDIS_LIBS= $(LIBS) -lm -pthread + FINAL_CFLAGS= $(STD) $(WARN) $(OPT) $(DEBUG) $(CFLAGS) $(REDIS_CFLAGS) + FINAL_LDFLAGS= $(LDFLAGS) $(REDIS_LDFLAGS) + FINAL_LIBS= $(LIBS) -lm -pthread DEBUG= -g -rdynamic -ggdb endif # Include paths to dependencies -REDIS_CFLAGS+= -I../deps/hiredis -I../deps/linenoise -I../deps/lua/src +FINAL_CFLAGS+= -I../deps/hiredis -I../deps/linenoise -I../deps/lua/src # Default allocator ifeq ($(uname_S),Linux) @@ -57,23 +57,23 @@ ifeq ($(USE_JEMALLOC),yes) endif ifeq ($(MALLOC),tcmalloc) - REDIS_CFLAGS+= -DUSE_TCMALLOC - REDIS_LIBS+= -ltcmalloc + FINAL_CFLAGS+= -DUSE_TCMALLOC + FINAL_LIBS+= -ltcmalloc endif ifeq ($(MALLOC),tcmalloc_minimal) - REDIS_CFLAGS+= -DUSE_TCMALLOC - REDIS_LIBS+= -ltcmalloc_minimal + FINAL_CFLAGS+= -DUSE_TCMALLOC + FINAL_LIBS+= -ltcmalloc_minimal endif ifeq ($(MALLOC),jemalloc) DEPENDENCY_TARGETS+= jemalloc - REDIS_CFLAGS+= -DUSE_JEMALLOC -I../deps/jemalloc/include - REDIS_LIBS+= ../deps/jemalloc/lib/libjemalloc.a -ldl + FINAL_CFLAGS+= -DUSE_JEMALLOC -I../deps/jemalloc/include + FINAL_LIBS+= ../deps/jemalloc/lib/libjemalloc.a -ldl endif -REDIS_CC=$(QUIET_CC)$(CC) $(REDIS_CFLAGS) -REDIS_LD=$(QUIET_LINK)$(CC) $(REDIS_LDFLAGS) +REDIS_CC=$(QUIET_CC)$(CC) $(FINAL_CFLAGS) +REDIS_LD=$(QUIET_LINK)$(CC) $(FINAL_LDFLAGS) PREFIX= /usr/local INSTALL_BIN= $(PREFIX)/bin @@ -121,18 +121,18 @@ dep: .make-prerequisites: @touch $@ -# Clean local objects and build dependencies when REDIS_CFLAGS is different -ifneq ($(shell sh -c '[ -f .make-cflags ] && cat .make-cflags || echo none'), $(REDIS_CFLAGS)) +# Clean local objects and build dependencies when FINAL_CFLAGS is different +ifneq ($(shell sh -c '[ -f .make-cflags ] && cat .make-cflags || echo none'), $(FINAL_CFLAGS)) .make-cflags: clean -(cd ../deps && $(MAKE) $(DEPENDENCY_TARGETS)) - -(echo "$(REDIS_CFLAGS)" > .make-cflags) + -(echo "$(FINAL_CFLAGS)" > .make-cflags) .make-prerequisites: .make-cflags endif -# Clean local objects when REDIS_LDFLAGS is different -ifneq ($(shell sh -c '[ -f .make-ldflags ] && cat .make-ldflags || echo none'), $(REDIS_LDFLAGS)) +# Clean local objects when FINAL_LDFLAGS is different +ifneq ($(shell sh -c '[ -f .make-ldflags ] && cat .make-ldflags || echo none'), $(FINAL_LDFLAGS)) .make-ldflags: clean - -(echo "$(REDIS_LDFLAGS)" > .make-ldflags) + -(echo "$(FINAL_LDFLAGS)" > .make-ldflags) .make-prerequisites: .make-ldflags endif @@ -145,23 +145,23 @@ endif # redis-server $(REDIS_SERVER_NAME): $(REDIS_SERVER_OBJ) - $(REDIS_LD) -o $@ $^ ../deps/lua/src/liblua.a $(REDIS_LIBS) + $(REDIS_LD) -o $@ $^ ../deps/lua/src/liblua.a $(FINAL_LIBS) # redis-cli $(REDIS_CLI_NAME): $(REDIS_CLI_OBJ) - $(REDIS_LD) -o $@ $^ ../deps/hiredis/libhiredis.a ../deps/linenoise/linenoise.o $(REDIS_LIBS) + $(REDIS_LD) -o $@ $^ ../deps/hiredis/libhiredis.a ../deps/linenoise/linenoise.o $(FINAL_LIBS) # redis-benchmark $(REDIS_BENCHMARK_NAME): $(REDIS_BENCHMARK_OBJ) - $(REDIS_LD) -o $@ $^ ../deps/hiredis/libhiredis.a $(REDIS_LIBS) + $(REDIS_LD) -o $@ $^ ../deps/hiredis/libhiredis.a $(FINAL_LIBS) # redis-check-dump $(REDIS_CHECK_DUMP_NAME): $(REDIS_CHECK_DUMP_OBJ) - $(REDIS_LD) -o $@ $^ $(REDIS_LIBS) + $(REDIS_LD) -o $@ $^ $(FINAL_LIBS) # redis-check-aof $(REDIS_CHECK_AOF_NAME): $(REDIS_CHECK_AOF_OBJ) - $(REDIS_LD) -o $@ $^ $(REDIS_LIBS) + $(REDIS_LD) -o $@ $^ $(FINAL_LIBS) # Because the jemalloc.h header is generated as a part of the jemalloc build, # building it should complete before building any other object. Instead of @@ -201,7 +201,7 @@ bench: $(REDIS_BENCHMARK_NAME) $(MAKE) CFLAGS="$(CFLAGS) -m32" LDFLAGS="$(LDFLAGS) -m32" gcov: - $(MAKE) ADD_CFLAGS="-fprofile-arcs -ftest-coverage -DCOVERAGE_TEST" ADD_LDFLAGS="-fprofile-arcs -ftest-coverage" + $(MAKE) REDIS_CFLAGS="-fprofile-arcs -ftest-coverage -DCOVERAGE_TEST" REDIS_LDFLAGS="-fprofile-arcs -ftest-coverage" noopt: $(MAKE) OPT="-O0" From 0342dd76476176bcbea1b49c20e49e40adbbe4a2 Mon Sep 17 00:00:00 2001 From: Pieter Noordhuis Date: Fri, 13 Apr 2012 17:38:12 -0700 Subject: [PATCH 2/8] The lcov target shouldn't clean This is not needed because every change in compiler/linker flags triggers a cleanup. --- src/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Makefile b/src/Makefile index 5df4b4b7..859e378e 100644 --- a/src/Makefile +++ b/src/Makefile @@ -184,7 +184,7 @@ test: $(REDIS_SERVER_NAME) $(REDIS_CHECK_AOF_NAME) @(cd ..; ./runtest) lcov: - $(MAKE) clean gcov + $(MAKE) gcov @(set -e; cd ..; ./runtest --clients 1) @geninfo -o redis.info . @genhtml --legend -o lcov-html redis.info From 166cf8a3b84c76e0870261dc9b29848ce7fc63aa Mon Sep 17 00:00:00 2001 From: Pieter Noordhuis Date: Fri, 13 Apr 2012 17:38:29 -0700 Subject: [PATCH 3/8] Ignore gcov/lcov artifacts --- src/.gitignore | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 src/.gitignore diff --git a/src/.gitignore b/src/.gitignore new file mode 100644 index 00000000..aee7aacf --- /dev/null +++ b/src/.gitignore @@ -0,0 +1,5 @@ +*.gcda +*.gcno +*.gcov +redis.info +lcov-html From c04278ba3b3cccf1df4d9fc7346c190fc8d0b14a Mon Sep 17 00:00:00 2001 From: Pieter Noordhuis Date: Fri, 13 Apr 2012 17:41:40 -0700 Subject: [PATCH 4/8] Question mark assignment is not needed --- src/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Makefile b/src/Makefile index 859e378e..9deeda4c 100644 --- a/src/Makefile +++ b/src/Makefile @@ -38,9 +38,9 @@ FINAL_CFLAGS+= -I../deps/hiredis -I../deps/linenoise -I../deps/lua/src # Default allocator ifeq ($(uname_S),Linux) - MALLOC?=jemalloc + MALLOC=jemalloc else - MALLOC?=libc + MALLOC=libc endif # Backwards compatibility for selecting an allocator From caba58512127599d49153c1dc100dac7574cda46 Mon Sep 17 00:00:00 2001 From: Pieter Noordhuis Date: Fri, 13 Apr 2012 17:43:06 -0700 Subject: [PATCH 5/8] First set defaults, then do composition --- src/Makefile | 31 ++++++++++++++++--------------- 1 file changed, 16 insertions(+), 15 deletions(-) diff --git a/src/Makefile b/src/Makefile index 9deeda4c..379599a6 100644 --- a/src/Makefile +++ b/src/Makefile @@ -17,25 +17,11 @@ uname_S := $(shell sh -c 'uname -s 2>/dev/null || echo not') OPTIMIZATION?=-O2 DEPENDENCY_TARGETS=hiredis linenoise lua +# Default settings STD= -std=c99 -pedantic WARN= -Wall OPT= $(OPTIMIZATION) -ifeq ($(uname_S),SunOS) - FINAL_CFLAGS= $(STD) $(WARN) $(OPT) $(DEBUG) $(CFLAGS) $(REDIS_CFLAGS) -D__EXTENSIONS__ -D_XPG6 - FINAL_LDFLAGS= $(LDFLAGS) $(REDIS_LDFLAGS) - FINAL_LIBS= $(LIBS) -ldl -lnsl -lsocket -lm -lpthread - DEBUG= -g -ggdb -else - FINAL_CFLAGS= $(STD) $(WARN) $(OPT) $(DEBUG) $(CFLAGS) $(REDIS_CFLAGS) - FINAL_LDFLAGS= $(LDFLAGS) $(REDIS_LDFLAGS) - FINAL_LIBS= $(LIBS) -lm -pthread - DEBUG= -g -rdynamic -ggdb -endif - -# Include paths to dependencies -FINAL_CFLAGS+= -I../deps/hiredis -I../deps/linenoise -I../deps/lua/src - # Default allocator ifeq ($(uname_S),Linux) MALLOC=jemalloc @@ -56,6 +42,21 @@ ifeq ($(USE_JEMALLOC),yes) MALLOC=jemalloc endif +ifeq ($(uname_S),SunOS) + FINAL_CFLAGS= $(STD) $(WARN) $(OPT) $(DEBUG) $(CFLAGS) $(REDIS_CFLAGS) -D__EXTENSIONS__ -D_XPG6 + FINAL_LDFLAGS= $(LDFLAGS) $(REDIS_LDFLAGS) + FINAL_LIBS= $(LIBS) -ldl -lnsl -lsocket -lm -lpthread + DEBUG= -g -ggdb +else + FINAL_CFLAGS= $(STD) $(WARN) $(OPT) $(DEBUG) $(CFLAGS) $(REDIS_CFLAGS) + FINAL_LDFLAGS= $(LDFLAGS) $(REDIS_LDFLAGS) + FINAL_LIBS= $(LIBS) -lm -pthread + DEBUG= -g -rdynamic -ggdb +endif + +# Include paths to dependencies +FINAL_CFLAGS+= -I../deps/hiredis -I../deps/linenoise -I../deps/lua/src + ifeq ($(MALLOC),tcmalloc) FINAL_CFLAGS+= -DUSE_TCMALLOC FINAL_LIBS+= -ltcmalloc From 620357fc8f36c704db0084ecad84f68cec9f170b Mon Sep 17 00:00:00 2001 From: Pieter Noordhuis Date: Fri, 13 Apr 2012 17:44:34 -0700 Subject: [PATCH 6/8] Remove unused LIBS variable --- src/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Makefile b/src/Makefile index 379599a6..402ef77c 100644 --- a/src/Makefile +++ b/src/Makefile @@ -45,12 +45,12 @@ endif ifeq ($(uname_S),SunOS) FINAL_CFLAGS= $(STD) $(WARN) $(OPT) $(DEBUG) $(CFLAGS) $(REDIS_CFLAGS) -D__EXTENSIONS__ -D_XPG6 FINAL_LDFLAGS= $(LDFLAGS) $(REDIS_LDFLAGS) - FINAL_LIBS= $(LIBS) -ldl -lnsl -lsocket -lm -lpthread + FINAL_LIBS= -ldl -lnsl -lsocket -lm -lpthread DEBUG= -g -ggdb else FINAL_CFLAGS= $(STD) $(WARN) $(OPT) $(DEBUG) $(CFLAGS) $(REDIS_CFLAGS) FINAL_LDFLAGS= $(LDFLAGS) $(REDIS_LDFLAGS) - FINAL_LIBS= $(LIBS) -lm -pthread + FINAL_LIBS= -lm -pthread DEBUG= -g -rdynamic -ggdb endif From 34c943b39592fb0f811d20d2458b256f52547de2 Mon Sep 17 00:00:00 2001 From: Pieter Noordhuis Date: Fri, 13 Apr 2012 17:46:28 -0700 Subject: [PATCH 7/8] Don't set flags recursively --- src/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Makefile b/src/Makefile index 402ef77c..d067c1e6 100644 --- a/src/Makefile +++ b/src/Makefile @@ -199,7 +199,7 @@ bench: $(REDIS_BENCHMARK_NAME) @echo "" @echo "WARNING: if it fails under Linux you probably need to install libc6-dev-i386" @echo "" - $(MAKE) CFLAGS="$(CFLAGS) -m32" LDFLAGS="$(LDFLAGS) -m32" + $(MAKE) CFLAGS="-m32" LDFLAGS="-m32" gcov: $(MAKE) REDIS_CFLAGS="-fprofile-arcs -ftest-coverage -DCOVERAGE_TEST" REDIS_LDFLAGS="-fprofile-arcs -ftest-coverage" From 7e7b69fee1c87b4802394a8637bb1dc0b474614c Mon Sep 17 00:00:00 2001 From: Pieter Noordhuis Date: Fri, 13 Apr 2012 17:50:38 -0700 Subject: [PATCH 8/8] Persist `make` settings and trigger rebuild if anything changes --- src/Makefile | 41 +++++++++++++++++++++++------------------ 1 file changed, 23 insertions(+), 18 deletions(-) diff --git a/src/Makefile b/src/Makefile index d067c1e6..a0913688 100644 --- a/src/Makefile +++ b/src/Makefile @@ -42,6 +42,9 @@ ifeq ($(USE_JEMALLOC),yes) MALLOC=jemalloc endif +# Override default settings if possible +-include .make-settings + ifeq ($(uname_S),SunOS) FINAL_CFLAGS= $(STD) $(WARN) $(OPT) $(DEBUG) $(CFLAGS) $(REDIS_CFLAGS) -D__EXTENSIONS__ -D_XPG6 FINAL_LDFLAGS= $(LDFLAGS) $(REDIS_LDFLAGS) @@ -118,30 +121,32 @@ dep: .PHONY: dep +persist-settings: distclean + echo STD=$(STD) >> .make-settings + echo WARN=$(WARN) >> .make-settings + echo OPT=$(OPT) >> .make-settings + echo MALLOC=$(MALLOC) >> .make-settings + echo CFLAGS=$(CFLAGS) >> .make-settings + echo LDFLAGS=$(LDFLAGS) >> .make-settings + echo REDIS_CFLAGS=$(REDIS_CFLAGS) >> .make-settings + echo REDIS_LDFLAGS=$(REDIS_LDFLAGS) >> .make-settings + echo PREV_FINAL_CFLAGS=$(FINAL_CFLAGS) >> .make-settings + echo PREV_FINAL_LDFLAGS=$(FINAL_LDFLAGS) >> .make-settings + -(cd ../deps && $(MAKE) $(DEPENDENCY_TARGETS)) + +.PHONY: persist-settings + # Prerequisites target .make-prerequisites: @touch $@ -# Clean local objects and build dependencies when FINAL_CFLAGS is different -ifneq ($(shell sh -c '[ -f .make-cflags ] && cat .make-cflags || echo none'), $(FINAL_CFLAGS)) -.make-cflags: clean - -(cd ../deps && $(MAKE) $(DEPENDENCY_TARGETS)) - -(echo "$(FINAL_CFLAGS)" > .make-cflags) -.make-prerequisites: .make-cflags +# Clean everything, persist settings and build dependencies if anything changed +ifneq ($(strip $(PREV_FINAL_CFLAGS)), $(strip $(FINAL_CFLAGS))) +.make-prerequisites: persist-settings endif -# Clean local objects when FINAL_LDFLAGS is different -ifneq ($(shell sh -c '[ -f .make-ldflags ] && cat .make-ldflags || echo none'), $(FINAL_LDFLAGS)) -.make-ldflags: clean - -(echo "$(FINAL_LDFLAGS)" > .make-ldflags) -.make-prerequisites: .make-ldflags -endif - -# Clean local objects when MALLOC is different -ifneq ($(shell sh -c '[ -f .make-malloc ] && cat .make-malloc || echo none'), $(MALLOC)) -.make-malloc: clean - -(echo "$(MALLOC)" > .make-malloc) -.make-prerequisites: .make-malloc +ifneq ($(strip $(PREV_FINAL_LDFLAGS)), $(strip $(FINAL_LDFLAGS))) +.make-prerequisites: persist-settings endif # redis-server