X-Git-Url: https://pd.if.org/git/?p=nbds;a=blobdiff_plain;f=makefile;h=d9863f2a0111bec1fc8069fcfff905bb347ac8eb;hp=1e4c1ec19a698680f3b6f0acfb1433d9ea0246ec;hb=HEAD;hpb=efd90a1b8a9d3bbb1bdd8e6ae41b3462e7193fb2

diff --git a/makefile b/makefile
index 1e4c1ec..d9863f2 100644
--- a/makefile
+++ b/makefile
@@ -1,63 +1,79 @@
 ###################################################################################################
 # Written by Josh Dybnis and released to the public domain, as explained at
 # http://creativecommons.org/licenses/publicdomain
-#
 ###################################################################################################
-# Makefile for building programs with whole-program interfile optimization 
+# Makefile for building programs with whole-program interfile optimization
 ###################################################################################################
-OPT	   := -fwhole-program -combine -03 #-DNDEBUG
-CFLAGS := -g -Wall -Werror -std=c99 -m64 -fnested-functions $(OPT) #-DENABLE_TRACE 
-INCS   := $(addprefix -I, include)
-TESTS  := output/rcu_test output/list_test output/ht_test
-EXES   := $(TESTS)
+CFLAGS0 := -Wall -Werror -std=gnu99 -lpthread #-m32 -DNBD32
+CFLAGS1 := $(CFLAGS0) -g #-DNDEBUG #-fwhole-program -combine
+CFLAGS2 := $(CFLAGS1) #-DENABLE_TRACE
+CFLAGS3 := $(CFLAGS2) #-DLIST_USE_HAZARD_POINTER
+CFLAGS  := $(CFLAGS3) #-DNBD_SINGLE_THREADED #-DUSE_SYSTEM_MALLOC #-DTEST_STRING_KEYS
+INCS    := $(addprefix -I, include)
+TESTS   := output/perf_test output/map_test1 output/map_test2 output/rcu_test output/txn_test #output/haz_test
+OBJS    := $(TESTS)
+
+RUNTIME_SRCS := runtime/runtime.c runtime/rcu.c runtime/lwt.c runtime/mem.c runtime/random.c \
+				datatype/nstring.c #runtime/hazard.c
+MAP_SRCS     := map/map.c map/list.c map/skiplist.c map/hashtable.c
 
-RUNTIME_SRCS   := runtime/runtime.c runtime/rcu.c runtime/lwt.c runtime/mem.c runtime/CuTest.c
-rcu_test_SRCS  := $(RUNTIME_SRCS)
-list_test_SRCS := $(RUNTIME_SRCS) struct/list.c
-ht_test_SRCS   := $(RUNTIME_SRCS) struct/ht.c struct/ht_test.c
+haz_test_SRCS  := $(RUNTIME_SRCS) test/haz_test.c
+rcu_test_SRCS  := $(RUNTIME_SRCS) test/rcu_test.c
+txn_test_SRCS  := $(RUNTIME_SRCS) $(MAP_SRCS) test/txn_test.c test/CuTest.c txn/txn.c
+map_test1_SRCS := $(RUNTIME_SRCS) $(MAP_SRCS) test/map_test1.c
+map_test2_SRCS := $(RUNTIME_SRCS) $(MAP_SRCS) test/map_test2.c test/CuTest.c
+perf_test_SRCS := $(RUNTIME_SRCS) $(MAP_SRCS) test/perf_test.c
 
-tests: $(TESTS) 
+tests: $(TESTS)
 
 ###################################################################################################
-# Run the tests
+# build and run tests
 ###################################################################################################
 test: $(addsuffix .log, $(TESTS))
 	@echo > /dev/null
 
-$(addsuffix .log, $(TESTS)) : %.log : % 
+$(addsuffix .log, $(TESTS)) : %.log : %
 	@echo "Running $*" && $* | tee $*.log
 
 ###################################################################################################
-# Rebuild an executable if any of it's source files need to be recompiled 
+# Rebuild an executable if any of it's source files need to be recompiled
 #
-# Note: Calculating dependancies as a side-effect of compilation is disabled. There is a bug in 
+# Note: Calculating dependencies as a side-effect of compilation is disabled. There is a bug in
 # 		gcc. Compilation fails when -MM -MF is used and there is more than one source file.
-#		-MM -MT $@.d -MF $@.d
+#		Otherwise "-MM -MT $@.d -MF $@.d" should be part of the command line for the compile.
+#
+#       Also, when calculating dependencies -combine is removed from CFLAGS because of another bug
+# 		in gcc. It chokes when -MM is used with -combine.
 ###################################################################################################
-$(EXES): output/% : output/%.d makefile
-	gcc $(CFLAGS) $(INCS) -DMAKE_$* -o $@ $($*_SRCS)
+$(OBJS): output/% : output/%.d makefile
+	gcc $(CFLAGS) $(INCS) -MM -MT $@ $($*_SRCS) > $@.d
+	gcc $(CFLAGS) $(INCS) -o $@ $($*_SRCS)
+
+asm: $(addsuffix .s, $(OBJS))
+
+$(addsuffix .s, $(OBJS)): output/%.s : output/%.d makefile
+	gcc $(CFLAGS:-combine:) $(INCS) -MM -MT $@ $($*_SRCS) > output/$*.d
+	gcc $(CFLAGS) $(INCS) -combine -S -o $@.temp $($*_SRCS)
+	grep -v "^L[BFM]\|^LCF" $@.temp > $@
+	rm $@.temp
 
 ###################################################################################################
-# Build tags file for vi
+# tags file for vi
 ###################################################################################################
 tags:
 	ctags -R .
 
 ###################################################################################################
-# 
+#
 ###################################################################################################
 clean:
 	rm -rfv output/*
 
-.PHONY: clean test tags
-
 ###################################################################################################
-# Generate the dependencies lists for each executable
-#
-# Note: -combine is removed from CFLAGS because of a bug in gcc. The compiler chokes when
-# 		-MM is used with -combine.
+# dummy rule for boostrapping dependency files
 ###################################################################################################
-$(addsuffix .d, $(EXES)) : output/%.d :
-	gcc $(CFLAGS:-combine:) $(INCS) -DMAKE_$* -MM -MT $@ $($*_SRCS) > $@
+$(addsuffix .d, $(OBJS)) : output/%.d :
+
+-include $(addsuffix .d, $(OBJS))
 
--include $(addsuffix .d, $(EXES))
+.PHONY: clean test tags asm