store the hash iterator on the heap instead of the stack

[redis.git] / Makefile

diff --git a/Makefile b/Makefile
index c6a61b1e4caaaa83409fa857553ae0b7fb833dc8..aea43f1dab049a0ad9b8a3234c77d19ded9aafa4 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -13,16 +13,20 @@ else
 endif
 CCOPT= $(CFLAGS) $(CCLINK) $(ARCH) $(PROF)
 DEBUG?= -g -rdynamic -ggdb 
 endif
 CCOPT= $(CFLAGS) $(CCLINK) $(ARCH) $(PROF)
 DEBUG?= -g -rdynamic -ggdb 

+HOST?= 127.0.0.1
+PORT?= 6379

 
 

-OBJ = adlist.o ae.o anet.o dict.o redis.o sds.o zmalloc.o lzf_c.o lzf_d.o pqsort.o
+OBJ = adlist.o ae.o anet.o dict.o redis.o sds.o zmalloc.o lzf_c.o lzf_d.o pqsort.o zipmap.o

 BENCHOBJ = ae.o anet.o redis-benchmark.o sds.o adlist.o zmalloc.o
 BENCHOBJ = ae.o anet.o redis-benchmark.o sds.o adlist.o zmalloc.o

-CLIOBJ = anet.o sds.o adlist.o redis-cli.o zmalloc.o
+CLIOBJ = anet.o sds.o adlist.o redis-cli.o zmalloc.o linenoise.o
+CHECKDUMPOBJ = redis-check-dump.o lzf_c.o lzf_d.o

 
 PRGNAME = redis-server
 BENCHPRGNAME = redis-benchmark
 CLIPRGNAME = redis-cli
 
 PRGNAME = redis-server
 BENCHPRGNAME = redis-benchmark
 CLIPRGNAME = redis-cli

+CHECKDUMPPRGNAME = redis-check-dump

 
 

-all: redis-server redis-benchmark redis-cli
+all: redis-server redis-benchmark redis-cli redis-check-dump

 
 # Deps (use make dep to generate this)
 adlist.o: adlist.c adlist.h zmalloc.h
 
 # Deps (use make dep to generate this)
 adlist.o: adlist.c adlist.h zmalloc.h


@@ -32,15 +36,19 @@ ae_kqueue.o: ae_kqueue.c
 ae_select.o: ae_select.c
 anet.o: anet.c fmacros.h anet.h
 dict.o: dict.c fmacros.h dict.h zmalloc.h
 ae_select.o: ae_select.c
 anet.o: anet.c fmacros.h anet.h
 dict.o: dict.c fmacros.h dict.h zmalloc.h

+linenoise.o: linenoise.c

 lzf_c.o: lzf_c.c lzfP.h
 lzf_d.o: lzf_d.c lzfP.h
 pqsort.o: pqsort.c
 redis-benchmark.o: redis-benchmark.c fmacros.h ae.h anet.h sds.h adlist.h \
   zmalloc.h
 lzf_c.o: lzf_c.c lzfP.h
 lzf_d.o: lzf_d.c lzfP.h
 pqsort.o: pqsort.c
 redis-benchmark.o: redis-benchmark.c fmacros.h ae.h anet.h sds.h adlist.h \
   zmalloc.h

-redis-cli.o: redis-cli.c fmacros.h anet.h sds.h adlist.h zmalloc.h
+redis-check-dump.o: redis-check-dump.c lzf.h
+redis-cli.o: redis-cli.c fmacros.h anet.h sds.h adlist.h zmalloc.h \
+  linenoise.h

 redis.o: redis.c fmacros.h config.h redis.h ae.h sds.h anet.h dict.h \
 redis.o: redis.c fmacros.h config.h redis.h ae.h sds.h anet.h dict.h \

-  adlist.h zmalloc.h lzf.h pqsort.h staticsymbols.h
+  adlist.h zmalloc.h lzf.h pqsort.h zipmap.h staticsymbols.h

 sds.o: sds.c sds.h zmalloc.h
 sds.o: sds.c sds.h zmalloc.h

+zipmap.o: zipmap.c zmalloc.h

 zmalloc.o: zmalloc.c config.h
 
 redis-server: $(OBJ)
 zmalloc.o: zmalloc.c config.h
 
 redis-server: $(OBJ)


@@ -57,11 +65,14 @@ redis-benchmark: $(BENCHOBJ)
 redis-cli: $(CLIOBJ)
        $(CC) -o $(CLIPRGNAME) $(CCOPT) $(DEBUG) $(CLIOBJ)
 
 redis-cli: $(CLIOBJ)
        $(CC) -o $(CLIPRGNAME) $(CCOPT) $(DEBUG) $(CLIOBJ)
 

+redis-check-dump: $(CHECKDUMPOBJ)
+       $(CC) -o $(CHECKDUMPPRGNAME) $(CCOPT) $(DEBUG) $(CHECKDUMPOBJ)
+

 .c.o:
        $(CC) -c $(CFLAGS) $(DEBUG) $(COMPILE_TIME) $<
 
 clean:
 .c.o:
        $(CC) -c $(CFLAGS) $(DEBUG) $(COMPILE_TIME) $<
 
 clean:

-       rm -rf $(PRGNAME) $(BENCHPRGNAME) $(CLIPRGNAME) *.o *.gcda *.gcno *.gcov
+       rm -rf $(PRGNAME) $(BENCHPRGNAME) $(CLIPRGNAME) $(CHECKDUMPPRGNAME) *.o *.gcda *.gcno *.gcov

 
 dep:
        $(CC) -MM *.c
 
 dep:
        $(CC) -MM *.c


@@ -70,16 +81,19 @@ staticsymbols:
        tclsh utils/build-static-symbols.tcl > staticsymbols.h
 
 test:
        tclsh utils/build-static-symbols.tcl > staticsymbols.h
 
 test:

-       tclsh test-redis.tcl
+       tclsh test-redis.tcl -p $(PORT) -h $(HOST)

 
 bench:
        ./redis-benchmark
 
 log:
 
 bench:
        ./redis-benchmark
 
 log:

-       git log '--pretty=format:%ad %s' --date=short > Changelog
+       git log '--pretty=format:%ad %s (%cn)' --date=short > Changelog

 
 32bit:
 
 32bit:

-       make ARCH="-arch i386"
+       @echo ""
+       @echo "WARNING: if it fails under Linux you probably need to install libc6-dev-i386"
+       @echo ""
+       make ARCH="-m32"

 
 gprof:
        make PROF="-pg"
 
 gprof:
        make PROF="-pg"