improve memory allocator

[nbds] / makefile

diff --git a/makefile b/makefile
index 9b71cf718dcab10667557e65818ac0c766516d6a..8d51bb3079d5fc0457d0f7fa41ef4a70b01e75ae 100644 (file)
--- a/makefile
+++ b/makefile
@@ -4,15 +4,20 @@
 ###################################################################################################
 # Makefile for building programs with whole-program interfile optimization
 ###################################################################################################
-OPT       := -fwhole-program -combine -03 #-DNDEBUG
-CFLAGS := -g -Wall -Werror -std=c99 $(OPT) -m64 -DTEST_STRING_KEYS #-DNBD32 #-DENABLE_TRACE
-INCS   := $(addprefix -I, include)
-TESTS  := output/map_test1 output/map_test2 output/txn_test
-EXES   := $(TESTS)
+CFLAGS0 := -Wall -Werror -std=gnu99 -lpthread #-m32 -DNBD32 
+CFLAGS1 := $(CFLAGS0) -g -O3 #-DNDEBUG #-fwhole-program -combine 
+CFLAGS2 := $(CFLAGS1) #-DENABLE_TRACE 
+CFLAGS3 := $(CFLAGS2) #-DLIST_USE_HAZARD_POINTER 
+CFLAGS  := $(CFLAGS3) #-DUSE_SYSTEM_MALLOC #-DTEST_STRING_KEYS 
+INCS    := $(addprefix -I, include)
+TESTS   := output/map_test2 output/map_test1 output/txn_test output/rcu_test output/haz_test 
+EXES    := $(TESTS)
 
-RUNTIME_SRCS := runtime/runtime.c runtime/rcu.c runtime/lwt.c runtime/mem.c datatype/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 
@@ -47,7 +52,7 @@ 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)
+       gcc $(CFLAGS) $(INCS) -combine -S -o $@.temp $($*_SRCS)
        grep -v "^L[BFM]\|^LCF" $@.temp > $@
        rm $@.temp