add hazard pointer implementation. buggy

[nbds] / makefile

diff --git a/makefile b/makefile
index dfabc2db889269431a709505caf47cd89a97c932..ebcaae63cf06fe3e60eefca8c779fbe5efc0b532 100644 (file)
--- a/makefile
+++ b/makefile
@@ -5,18 +5,19 @@
 # Makefile for building programs with whole-program interfile optimization
 ###################################################################################################
 OPT       := -fwhole-program -combine -03 #-DNDEBUG
-CFLAGS := -g -Wall -Werror -std=c99 -m64 $(OPT) #-DENABLE_TRACE
+CFLAGS := -g -Wall -Werror -std=c99 $(OPT) -m64 #-DLIST_USE_HAZARD_POINTER -DENABLE_TRACE #-DTEST_STRING_KEYS #-DNBD32 
 INCS   := $(addprefix -I, include)
-TESTS  := output/ll_test output/sl_test output/ht_test output/rcu_test
+TESTS  := output/map_test2 output/map_test1 output/txn_test 
 EXES   := $(TESTS)
 
-RUNTIME_SRCS  := runtime/runtime.c runtime/rcu.c runtime/lwt.c runtime/mem.c
-TEST_SRCS     := $(RUNTIME_SRCS)
-rcu_test_SRCS := $(TEST_SRCS) test/rcu_test.c
-txn_test_SRCS := $(TEST_SRCS) struct/hashtable.c txn/txn.c
-ll_test_SRCS  := $(TEST_SRCS) struct/list.c test/ll_test.c struct/nstring.c
-sl_test_SRCS  := $(TEST_SRCS) struct/skiplist.c test/sl_test.c struct/nstring.c
-ht_test_SRCS  := $(TEST_SRCS) struct/hashtable.c test/ht_test.c test/CuTest.c struct/nstring.c
+RUNTIME_SRCS := runtime/runtime.c runtime/rcu.c runtime/lwt.c runtime/mem.c datatype/nstring.c runtime/hazard.c
+MAP_SRCS     := map/map.c map/list.c map/skiplist.c map/hashtable.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
 
 tests: $(TESTS)
 
@@ -43,6 +44,14 @@ $(EXES): output/% : output/%.d makefile
        gcc $(CFLAGS:-combine:) $(INCS) -MM -MT $@ $($*_SRCS) > $@.d
        gcc $(CFLAGS) $(INCS) -o $@ $($*_SRCS)
 
+asm: $(addsuffix .s, $(EXES))
+
+$(addsuffix .s, $(EXES)): output/%.s : output/%.d makefile
+       gcc $(CFLAGS:-combine:) $(INCS) -MM -MT $@ $($*_SRCS) > output/$*.d
+       gcc $(CFLAGS) $(INCS) -S -o $@.temp $($*_SRCS)
+       grep -v "^L[BFM]\|^LCF" $@.temp > $@
+       rm $@.temp
+
 ###################################################################################################
 # tags file for vi
 ###################################################################################################
@@ -62,4 +71,4 @@ $(addsuffix .d, $(EXES)) : output/%.d :
 
 -include $(addsuffix .d, $(EXES))
 
-.PHONY: clean test tags
+.PHONY: clean test tags asm