-
Notifications
You must be signed in to change notification settings - Fork 4
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- Loading branch information
Voskrese
authored
Dec 19, 2018
0 parents
commit 1fcc6ca
Showing
29 changed files
with
7,575 additions
and
0 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,24 @@ | ||
| ### 0.11.0 | ||
|
|
||
| * Increase the maximum multi-bulk reply depth to 7. | ||
|
|
||
| * Increase the read buffer size from 2k to 16k. | ||
|
|
||
| * Use poll(2) instead of select(2) to support large fds (>= 1024). | ||
|
|
||
| ### 0.10.1 | ||
|
|
||
| * Makefile overhaul. Important to check out if you override one or more | ||
| variables using environment variables or via arguments to the "make" tool. | ||
|
|
||
| * Issue #45: Fix potential memory leak for a multi bulk reply with 0 elements | ||
| being created by the default reply object functions. | ||
|
|
||
| * Issue #43: Don't crash in an asynchronous context when Redis returns an error | ||
| reply after the connection has been made (this happens when the maximum | ||
| number of connections is reached). | ||
|
|
||
| ### 0.10.0 | ||
|
|
||
| * See commit log. | ||
|
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,29 @@ | ||
| Copyright (c) 2009-2011, Salvatore Sanfilippo <antirez at gmail dot com> | ||
| Copyright (c) 2010-2011, Pieter Noordhuis <pcnoordhuis at gmail dot com> | ||
|
|
||
| All rights reserved. | ||
|
|
||
| Redistribution and use in source and binary forms, with or without | ||
| modification, are permitted provided that the following conditions are met: | ||
|
|
||
| * Redistributions of source code must retain the above copyright notice, | ||
| this list of conditions and the following disclaimer. | ||
|
|
||
| * Redistributions in binary form must reproduce the above copyright notice, | ||
| this list of conditions and the following disclaimer in the documentation | ||
| and/or other materials provided with the distribution. | ||
|
|
||
| * Neither the name of Redis nor the names of its contributors may be used | ||
| to endorse or promote products derived from this software without specific | ||
| prior written permission. | ||
|
|
||
| THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND | ||
| ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED | ||
| WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE | ||
| DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR | ||
| ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES | ||
| (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; | ||
| LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON | ||
| ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT | ||
| (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS | ||
| SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,166 @@ | ||
| # Hiredis Makefile | ||
| # Copyright (C) 2010-2011 Salvatore Sanfilippo <antirez at gmail dot com> | ||
| # Copyright (C) 2010-2011 Pieter Noordhuis <pcnoordhuis at gmail dot com> | ||
| # This file is released under the BSD license, see the COPYING file | ||
|
|
||
| OBJ=net.o hiredis.o sds.o async.o | ||
| EXAMPLES=hiredis-example hiredis-example-libevent hiredis-example-libev | ||
| TESTS=hiredis-test | ||
| LIBNAME=libhiredis | ||
|
|
||
| HIREDIS_MAJOR=0 | ||
| HIREDIS_MINOR=11 | ||
|
|
||
| # redis-server configuration used for testing | ||
| REDIS_PORT=56379 | ||
| REDIS_SERVER=redis-server | ||
| define REDIS_TEST_CONFIG | ||
| daemonize yes | ||
| pidfile /tmp/hiredis-test-redis.pid | ||
| port $(REDIS_PORT) | ||
| bind 127.0.0.1 | ||
| unixsocket /tmp/hiredis-test-redis.sock | ||
| endef | ||
| export REDIS_TEST_CONFIG | ||
|
|
||
| # Fallback to gcc when $CC is not in $PATH. | ||
| CC:=$(shell sh -c 'type $(CC) >/dev/null 2>/dev/null && echo $(CC) || echo gcc') | ||
| OPTIMIZATION?=-O3 | ||
| WARNINGS=-Wall -W -Wstrict-prototypes -Wwrite-strings | ||
| DEBUG?= -g -ggdb | ||
| REAL_CFLAGS=$(OPTIMIZATION) -fPIC $(CFLAGS) $(WARNINGS) $(DEBUG) $(ARCH) | ||
| REAL_LDFLAGS=$(LDFLAGS) $(ARCH) | ||
|
|
||
| DYLIBSUFFIX=so | ||
| STLIBSUFFIX=a | ||
| DYLIB_MINOR_NAME=$(LIBNAME).$(DYLIBSUFFIX).$(HIREDIS_MAJOR).$(HIREDIS_MINOR) | ||
| DYLIB_MAJOR_NAME=$(LIBNAME).$(DYLIBSUFFIX).$(HIREDIS_MAJOR) | ||
| DYLIBNAME=$(LIBNAME).$(DYLIBSUFFIX) | ||
| DYLIB_MAKE_CMD=$(CC) -shared -Wl,-soname,$(DYLIB_MINOR_NAME) -o $(DYLIBNAME) $(LDFLAGS) | ||
| STLIBNAME=$(LIBNAME).$(STLIBSUFFIX) | ||
| STLIB_MAKE_CMD=ar rcs $(STLIBNAME) | ||
|
|
||
| # Platform-specific overrides | ||
| uname_S := $(shell sh -c 'uname -s 2>/dev/null || echo not') | ||
| ifeq ($(uname_S),SunOS) | ||
| REAL_LDFLAGS+= -ldl -lnsl -lsocket | ||
| DYLIB_MAKE_CMD=$(CC) -G -o $(DYLIBNAME) -h $(DYLIB_MINOR_NAME) $(LDFLAGS) | ||
| INSTALL= cp -r | ||
| endif | ||
| ifeq ($(uname_S),Darwin) | ||
| DYLIBSUFFIX=dylib | ||
| DYLIB_MINOR_NAME=$(LIBNAME).$(HIREDIS_MAJOR).$(HIREDIS_MINOR).$(DYLIBSUFFIX) | ||
| DYLIB_MAJOR_NAME=$(LIBNAME).$(HIREDIS_MAJOR).$(DYLIBSUFFIX) | ||
| DYLIB_MAKE_CMD=$(CC) -shared -Wl,-install_name,$(DYLIB_MINOR_NAME) -o $(DYLIBNAME) $(LDFLAGS) | ||
| endif | ||
|
|
||
| all: $(DYLIBNAME) | ||
|
|
||
| # Deps (use make dep to generate this) | ||
| net.o: net.c fmacros.h net.h hiredis.h | ||
| async.o: async.c async.h hiredis.h sds.h dict.c dict.h | ||
| hiredis.o: hiredis.c fmacros.h hiredis.h net.h sds.h | ||
| sds.o: sds.c sds.h | ||
| test.o: test.c hiredis.h | ||
|
|
||
| $(DYLIBNAME): $(OBJ) | ||
| $(DYLIB_MAKE_CMD) $(OBJ) | ||
|
|
||
| $(STLIBNAME): $(OBJ) | ||
| $(STLIB_MAKE_CMD) $(OBJ) | ||
|
|
||
| dynamic: $(DYLIBNAME) | ||
| static: $(STLIBNAME) | ||
|
|
||
| # Binaries: | ||
| hiredis-example-libevent: examples/example-libevent.c adapters/libevent.h $(STLIBNAME) | ||
| $(CC) -o examples/$@ $(REAL_CFLAGS) $(REAL_LDFLAGS) -I. $< -levent $(STLIBNAME) | ||
|
|
||
| hiredis-example-libev: examples/example-libev.c adapters/libev.h $(STLIBNAME) | ||
| $(CC) -o examples/$@ $(REAL_CFLAGS) $(REAL_LDFLAGS) -I. $< -lev $(STLIBNAME) | ||
|
|
||
| ifndef AE_DIR | ||
| hiredis-example-ae: | ||
| @echo "Please specify AE_DIR (e.g. <redis repository>/src)" | ||
| @false | ||
| else | ||
| hiredis-example-ae: examples/example-ae.c adapters/ae.h $(STLIBNAME) | ||
| $(CC) -o examples/$@ $(REAL_CFLAGS) $(REAL_LDFLAGS) -I. -I$(AE_DIR) $< $(AE_DIR)/ae.o $(AE_DIR)/zmalloc.o $(AE_DIR)/../deps/jemalloc/lib/libjemalloc.a -pthread $(STLIBNAME) | ||
| endif | ||
|
|
||
| ifndef LIBUV_DIR | ||
| hiredis-example-libuv: | ||
| @echo "Please specify LIBUV_DIR (e.g. ../libuv/)" | ||
| @false | ||
| else | ||
| hiredis-example-libuv: examples/example-libuv.c adapters/libuv.h $(STLIBNAME) | ||
| $(CC) -o examples/$@ $(REAL_CFLAGS) $(REAL_LDFLAGS) -I. -I$(LIBUV_DIR)/include $< $(LIBUV_DIR)/.libs/libuv.a -lpthread $(STLIBNAME) | ||
| endif | ||
|
|
||
| hiredis-example: examples/example.c $(STLIBNAME) | ||
| $(CC) -o examples/$@ $(REAL_CFLAGS) $(REAL_LDFLAGS) -I. $< $(STLIBNAME) | ||
|
|
||
| examples: $(EXAMPLES) | ||
|
|
||
| hiredis-test: test.o $(STLIBNAME) | ||
| $(CC) -o $@ $(REAL_LDFLAGS) $< $(STLIBNAME) | ||
|
|
||
| test: hiredis-test | ||
| ./hiredis-test | ||
|
|
||
| check: hiredis-test | ||
| @echo "$$REDIS_TEST_CONFIG" | $(REDIS_SERVER) - | ||
| ./hiredis-test -h 127.0.0.1 -p $(REDIS_PORT) -s /tmp/hiredis-test-redis.sock || \ | ||
| ( kill `cat /tmp/hiredis-test-redis.pid` && false ) | ||
| kill `cat /tmp/hiredis-test-redis.pid` | ||
|
|
||
| .c.o: | ||
| $(CC) -std=c99 -pedantic -c $(REAL_CFLAGS) $< | ||
|
|
||
| clean: | ||
| rm -rf $(DYLIBNAME) $(STLIBNAME) $(TESTS) examples/hiredis-example* *.o *.gcda *.gcno *.gcov | ||
|
|
||
| dep: | ||
| $(CC) -MM *.c | ||
|
|
||
| # Installation related variables and target | ||
| PREFIX?=/usr/local | ||
| INSTALL_INCLUDE_PATH= $(PREFIX)/include/hiredis | ||
| INSTALL_LIBRARY_PATH= $(PREFIX)/lib | ||
|
|
||
| ifeq ($(uname_S),SunOS) | ||
| INSTALL?= cp -r | ||
| endif | ||
|
|
||
| INSTALL?= cp -a | ||
|
|
||
| install: $(DYLIBNAME) $(STLIBNAME) | ||
| mkdir -p $(INSTALL_INCLUDE_PATH) $(INSTALL_LIBRARY_PATH) | ||
| $(INSTALL) hiredis.h async.h adapters $(INSTALL_INCLUDE_PATH) | ||
| $(INSTALL) $(DYLIBNAME) $(INSTALL_LIBRARY_PATH)/$(DYLIB_MINOR_NAME) | ||
| cd $(INSTALL_LIBRARY_PATH) && ln -sf $(DYLIB_MINOR_NAME) $(DYLIB_MAJOR_NAME) | ||
| cd $(INSTALL_LIBRARY_PATH) && ln -sf $(DYLIB_MAJOR_NAME) $(DYLIBNAME) | ||
| $(INSTALL) $(STLIBNAME) $(INSTALL_LIBRARY_PATH) | ||
|
|
||
| 32bit: | ||
| @echo "" | ||
| @echo "WARNING: if this fails under Linux you probably need to install libc6-dev-i386" | ||
| @echo "" | ||
| $(MAKE) CFLAGS="-m32" LDFLAGS="-m32" | ||
|
|
||
| gprof: | ||
| $(MAKE) CFLAGS="-pg" LDFLAGS="-pg" | ||
|
|
||
| gcov: | ||
| $(MAKE) CFLAGS="-fprofile-arcs -ftest-coverage" LDFLAGS="-fprofile-arcs" | ||
|
|
||
| coverage: gcov | ||
| make check | ||
| mkdir -p tmp/lcov | ||
| lcov -d . -c -o tmp/lcov/hiredis.info | ||
| genhtml --legend -o tmp/lcov/report tmp/lcov/hiredis.info | ||
|
|
||
| noopt: | ||
| $(MAKE) OPTIMIZATION="" | ||
|
|
||
| .PHONY: all test check clean dep install 32bit gprof gcov noopt |
Oops, something went wrong.