caleb-brown/redict
1
0
Fork 0
mirror of https://codeberg.org/redict/redict.git synced 2025-01-22 08:08:53 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Rename source files and make targets

Browse Source
This commit is contained in:
Drew DeVault 2024-03-21 10:49:18 +01:00
parent b01802415d
commit b818f44621
75 changed files with 157 additions and 157 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
.gitignore vendored
View File

@ -5,13 +5,13 @@
*.d *.d
*.log *.log
dump.rdb dump.rdb
redis-benchmark redict-benchmark
redis-check-aof redict-check-aof
redis-check-rdb redict-check-rdb
redis-check-dump redict-check-dump
redis-cli redict-cli
redis-sentinel redict-sentinel
redis-server redict-server
doc-tools doc-tools
release release
misc/* misc/*
@ -22,8 +22,8 @@ SHORT_TERM_TODO
release.h release.h
src/transfer.sh src/transfer.sh
src/configs src/configs
redis.ds redict.ds
src/redis.conf src/redict.conf
src/nodes.conf src/nodes.conf
deps/lua/src/lua deps/lua/src/lua
deps/lua/src/luac deps/lua/src/luac
@ -40,4 +40,4 @@ Makefile.dep
.ccls .ccls
.ccls-cache/* .ccls-cache/*
compile_commands.json compile_commands.json
redis.code-workspace redict.code-workspace

134
src/Makefile
View File

@ -1,13 +1,13 @@
# Redis Makefile # Redict Makefile
# Copyright (C) 2009 Salvatore Sanfilippo <antirez at gmail dot com> # Copyright (C) 2009 Salvatore Sanfilippo <antirez at gmail dot com>
# This file is released under the BSD license, see the COPYING file # This file is released under the BSD license, see the COPYING file
# #
# The Makefile composes the final FINAL_CFLAGS and FINAL_LDFLAGS using # The Makefile composes the final FINAL_CFLAGS and FINAL_LDFLAGS using
# what is needed for Redis plus the standard CFLAGS and LDFLAGS passed. # what is needed for Redict plus the standard CFLAGS and LDFLAGS passed.
# However when building the dependencies (Jemalloc, Lua, Hiredis, ...) # However when building the dependencies (Jemalloc, Lua, Hiredis, ...)
# CFLAGS and LDFLAGS are propagated to the dependencies, so to pass # CFLAGS and LDFLAGS are propagated to the dependencies, so to pass
# flags only to be used when compiling / linking Redis itself REDIS_CFLAGS # flags only to be used when compiling / linking Redict itself REDICT_CFLAGS
# and REDIS_LDFLAGS are used instead (this is the case of 'make gcov'). # and REDICT_LDFLAGS are used instead (this is the case of 'make gcov').
# #
# Dependencies are stored in the Makefile.dep file. To rebuild this file # Dependencies are stored in the Makefile.dep file. To rebuild this file
# Just use 'make dep', but this is only needed by developers. # Just use 'make dep', but this is only needed by developers.
@ -35,7 +35,7 @@ DEPENDENCY_TARGETS=hiredis linenoise lua hdr_histogram fpconv
NODEPS:=clean distclean NODEPS:=clean distclean
# Default settings # Default settings
STD=-pedantic -DREDIS_STATIC='' STD=-pedantic -DREDICT_STATIC=''
# Use -Wno-c11-extensions on clang, either where explicitly used or on # Use -Wno-c11-extensions on clang, either where explicitly used or on
# platforms we can assume it's being used. # platforms we can assume it's being used.
@ -76,7 +76,7 @@ ifeq ($(uname_S),Linux)
MALLOC=jemalloc MALLOC=jemalloc
endif endif
# To get ARM stack traces if Redis crashes we need a special C flag. # To get ARM stack traces if Redict crashes we need a special C flag.
ifneq (,$(filter aarch64 armv%,$(uname_M))) ifneq (,$(filter aarch64 armv%,$(uname_M)))
CFLAGS+=-funwind-tables CFLAGS+=-funwind-tables
endif endif
@ -122,8 +122,8 @@ endif
# Override default settings if possible # Override default settings if possible
-include .make-settings -include .make-settings
FINAL_CFLAGS=$(STD) $(WARN) $(OPT) $(DEBUG) $(CFLAGS) $(REDIS_CFLAGS) FINAL_CFLAGS=$(STD) $(WARN) $(OPT) $(DEBUG) $(CFLAGS) $(REDICT_CFLAGS)
FINAL_LDFLAGS=$(LDFLAGS) $(OPT) $(REDIS_LDFLAGS) $(DEBUG) FINAL_LDFLAGS=$(LDFLAGS) $(OPT) $(REDICT_LDFLAGS) $(DEBUG)
FINAL_LIBS=-lm FINAL_LIBS=-lm
DEBUG=-g -ggdb DEBUG=-g -ggdb
@ -303,7 +303,7 @@ ifeq ($(BUILD_TLS),yes)
endif endif
TLS_MODULE= TLS_MODULE=
TLS_MODULE_NAME:=redis-tls$(PROG_SUFFIX).so TLS_MODULE_NAME:=redict-tls$(PROG_SUFFIX).so
TLS_MODULE_CFLAGS:=$(FINAL_CFLAGS) TLS_MODULE_CFLAGS:=$(FINAL_CFLAGS)
ifeq ($(BUILD_TLS),module) ifeq ($(BUILD_TLS),module)
FINAL_CFLAGS+=-DUSE_OPENSSL=$(BUILD_MODULE) $(OPENSSL_CFLAGS) FINAL_CFLAGS+=-DUSE_OPENSSL=$(BUILD_MODULE) $(OPENSSL_CFLAGS)
@ -323,9 +323,9 @@ else
endef endef
endif endif
REDIS_CC=$(QUIET_CC)$(CC) $(FINAL_CFLAGS) REDICT_CC=$(QUIET_CC)$(CC) $(FINAL_CFLAGS)
REDIS_LD=$(QUIET_LINK)$(CC) $(FINAL_LDFLAGS) REDICT_LD=$(QUIET_LINK)$(CC) $(FINAL_LDFLAGS)
REDIS_INSTALL=$(QUIET_INSTALL)$(INSTALL) REDICT_INSTALL=$(QUIET_INSTALL)$(INSTALL)
CCCOLOR="\033[34m" CCCOLOR="\033[34m"
LINKCOLOR="\033[34;1m" LINKCOLOR="\033[34;1m"
@ -341,7 +341,7 @@ QUIET_LINK = @printf ' %b %b\n' $(LINKCOLOR)LINK$(ENDCOLOR) $(BINCOLOR)$@$(EN
QUIET_INSTALL = @printf ' %b %b\n' $(LINKCOLOR)INSTALL$(ENDCOLOR) $(BINCOLOR)$@$(ENDCOLOR) 1>&2; QUIET_INSTALL = @printf ' %b %b\n' $(LINKCOLOR)INSTALL$(ENDCOLOR) $(BINCOLOR)$@$(ENDCOLOR) 1>&2;
endif endif
ifneq (, $(findstring LOG_REQ_RES, $(REDIS_CFLAGS))) ifneq (, $(findstring LOG_REQ_RES, $(REDICT_CFLAGS)))
COMMANDS_DEF_FILENAME=commands_with_reply_schema COMMANDS_DEF_FILENAME=commands_with_reply_schema
GEN_COMMANDS_FLAGS=--with-reply-schema GEN_COMMANDS_FLAGS=--with-reply-schema
else else
@ -349,24 +349,24 @@ else
GEN_COMMANDS_FLAGS= GEN_COMMANDS_FLAGS=
endif endif
REDIS_SERVER_NAME=redis-server$(PROG_SUFFIX) REDICT_SERVER_NAME=redict-server$(PROG_SUFFIX)
REDIS_SENTINEL_NAME=redis-sentinel$(PROG_SUFFIX) REDICT_SENTINEL_NAME=redict-sentinel$(PROG_SUFFIX)
REDIS_SERVER_OBJ=threads_mngr.o adlist.o quicklist.o ae.o anet.o dict.o kvstore.o server.o sds.o zmalloc.o lzf_c.o lzf_d.o pqsort.o zipmap.o sha1.o ziplist.o release.o networking.o util.o object.o db.o replication.o rdb.o t_string.o t_list.o t_set.o t_zset.o t_hash.o config.o aof.o pubsub.o multi.o debug.o sort.o intset.o syncio.o cluster.o cluster_legacy.o crc16.o endianconv.o slowlog.o eval.o bio.o rio.o rand.o memtest.o syscheck.o crcspeed.o crc64.o bitops.o sentinel.o notify.o setproctitle.o blocked.o hyperloglog.o latency.o sparkline.o redis-check-rdb.o redis-check-aof.o geo.o lazyfree.o module.o evict.o expire.o geohash.o geohash_helper.o childinfo.o defrag.o siphash.o rax.o t_stream.o listpack.o localtime.o lolwut.o lolwut5.o lolwut6.o acl.o tracking.o socket.o tls.o sha256.o timeout.o setcpuaffinity.o monotonic.o mt19937-64.o resp_parser.o call_reply.o script_lua.o script.o functions.o function_lua.o commands.o strl.o connection.o unix.o logreqres.o REDICT_SERVER_OBJ=threads_mngr.o adlist.o quicklist.o ae.o anet.o dict.o kvstore.o server.o sds.o zmalloc.o lzf_c.o lzf_d.o pqsort.o zipmap.o sha1.o ziplist.o release.o networking.o util.o object.o db.o replication.o rdb.o t_string.o t_list.o t_set.o t_zset.o t_hash.o config.o aof.o pubsub.o multi.o debug.o sort.o intset.o syncio.o cluster.o cluster_legacy.o crc16.o endianconv.o slowlog.o eval.o bio.o rio.o rand.o memtest.o syscheck.o crcspeed.o crc64.o bitops.o sentinel.o notify.o setproctitle.o blocked.o hyperloglog.o latency.o sparkline.o redict-check-rdb.o redict-check-aof.o geo.o lazyfree.o module.o evict.o expire.o geohash.o geohash_helper.o childinfo.o defrag.o siphash.o rax.o t_stream.o listpack.o localtime.o lolwut.o lolwut5.o lolwut6.o acl.o tracking.o socket.o tls.o sha256.o timeout.o setcpuaffinity.o monotonic.o mt19937-64.o resp_parser.o call_reply.o script_lua.o script.o functions.o function_lua.o commands.o strl.o connection.o unix.o logreqres.o
REDIS_CLI_NAME=redis-cli$(PROG_SUFFIX) REDICT_CLI_NAME=redict-cli$(PROG_SUFFIX)
REDIS_CLI_OBJ=anet.o adlist.o dict.o redis-cli.o zmalloc.o release.o ae.o redisassert.o crcspeed.o crc64.o siphash.o crc16.o monotonic.o cli_common.o mt19937-64.o strl.o cli_commands.o REDICT_CLI_OBJ=anet.o adlist.o dict.o redict-cli.o zmalloc.o release.o ae.o redictassert.o crcspeed.o crc64.o siphash.o crc16.o monotonic.o cli_common.o mt19937-64.o strl.o cli_commands.o
REDIS_BENCHMARK_NAME=redis-benchmark$(PROG_SUFFIX) REDICT_BENCHMARK_NAME=redict-benchmark$(PROG_SUFFIX)
REDIS_BENCHMARK_OBJ=ae.o anet.o redis-benchmark.o adlist.o dict.o zmalloc.o redisassert.o release.o crcspeed.o crc64.o siphash.o crc16.o monotonic.o cli_common.o mt19937-64.o strl.o REDICT_BENCHMARK_OBJ=ae.o anet.o redict-benchmark.o adlist.o dict.o zmalloc.o redictassert.o release.o crcspeed.o crc64.o siphash.o crc16.o monotonic.o cli_common.o mt19937-64.o strl.o
REDIS_CHECK_RDB_NAME=redis-check-rdb$(PROG_SUFFIX) REDICT_CHECK_RDB_NAME=redict-check-rdb$(PROG_SUFFIX)
REDIS_CHECK_AOF_NAME=redis-check-aof$(PROG_SUFFIX) REDICT_CHECK_AOF_NAME=redict-check-aof$(PROG_SUFFIX)
ALL_SOURCES=$(sort $(patsubst %.o,%.c,$(REDIS_SERVER_OBJ) $(REDIS_CLI_OBJ) $(REDIS_BENCHMARK_OBJ))) ALL_SOURCES=$(sort $(patsubst %.o,%.c,$(REDICT_SERVER_OBJ) $(REDICT_CLI_OBJ) $(REDICT_BENCHMARK_OBJ)))
all: $(REDIS_SERVER_NAME) $(REDIS_SENTINEL_NAME) $(REDIS_CLI_NAME) $(REDIS_BENCHMARK_NAME) $(REDIS_CHECK_RDB_NAME) $(REDIS_CHECK_AOF_NAME) $(TLS_MODULE) all: $(REDICT_SERVER_NAME) $(REDICT_SENTINEL_NAME) $(REDICT_CLI_NAME) $(REDICT_BENCHMARK_NAME) $(REDICT_CHECK_RDB_NAME) $(REDICT_CHECK_AOF_NAME) $(TLS_MODULE)
@echo "" @echo ""
@echo "Hint: It's a good idea to run 'make test' ;)" @echo "Hint: It's a good idea to run 'make test' ;)"
@echo "" @echo ""
Makefile.dep: Makefile.dep:
-$(REDIS_CC) -MM $(ALL_SOURCES) > Makefile.dep 2> /dev/null || true -$(REDICT_CC) -MM $(ALL_SOURCES) > Makefile.dep 2> /dev/null || true
ifeq (0, $(words $(findstring $(MAKECMDGOALS), $(NODEPS)))) ifeq (0, $(words $(findstring $(MAKECMDGOALS), $(NODEPS))))
-include Makefile.dep -include Makefile.dep
@ -383,8 +383,8 @@ persist-settings: distclean
echo USE_SYSTEMD=$(USE_SYSTEMD) >> .make-settings echo USE_SYSTEMD=$(USE_SYSTEMD) >> .make-settings
echo CFLAGS=$(CFLAGS) >> .make-settings echo CFLAGS=$(CFLAGS) >> .make-settings
echo LDFLAGS=$(LDFLAGS) >> .make-settings echo LDFLAGS=$(LDFLAGS) >> .make-settings
echo REDIS_CFLAGS=$(REDIS_CFLAGS) >> .make-settings echo REDICT_CFLAGS=$(REDICT_CFLAGS) >> .make-settings
echo REDIS_LDFLAGS=$(REDIS_LDFLAGS) >> .make-settings echo REDICT_LDFLAGS=$(REDICT_LDFLAGS) >> .make-settings
echo PREV_FINAL_CFLAGS=$(FINAL_CFLAGS) >> .make-settings echo PREV_FINAL_CFLAGS=$(FINAL_CFLAGS) >> .make-settings
echo PREV_FINAL_LDFLAGS=$(FINAL_LDFLAGS) >> .make-settings echo PREV_FINAL_LDFLAGS=$(FINAL_LDFLAGS) >> .make-settings
-(cd ../deps && $(MAKE) $(DEPENDENCY_TARGETS)) -(cd ../deps && $(MAKE) $(DEPENDENCY_TARGETS))
@ -404,42 +404,42 @@ ifneq ($(strip $(PREV_FINAL_LDFLAGS)), $(strip $(FINAL_LDFLAGS)))
.make-prerequisites: persist-settings .make-prerequisites: persist-settings
endif endif
# redis-server # redict-server
$(REDIS_SERVER_NAME): $(REDIS_SERVER_OBJ) $(REDICT_SERVER_NAME): $(REDICT_SERVER_OBJ)
$(REDIS_LD) -o $@ $^ ../deps/hiredis/libhiredis.a ../deps/lua/src/liblua.a ../deps/hdr_histogram/libhdrhistogram.a ../deps/fpconv/libfpconv.a $(FINAL_LIBS) $(REDICT_LD) -o $@ $^ ../deps/hiredis/libhiredis.a ../deps/lua/src/liblua.a ../deps/hdr_histogram/libhdrhistogram.a ../deps/fpconv/libfpconv.a $(FINAL_LIBS)
# redis-sentinel # redict-sentinel
$(REDIS_SENTINEL_NAME): $(REDIS_SERVER_NAME) $(REDICT_SENTINEL_NAME): $(REDICT_SERVER_NAME)
$(REDIS_INSTALL) $(REDIS_SERVER_NAME) $(REDIS_SENTINEL_NAME) $(REDICT_INSTALL) $(REDICT_SERVER_NAME) $(REDICT_SENTINEL_NAME)
# redis-check-rdb # redict-check-rdb
$(REDIS_CHECK_RDB_NAME): $(REDIS_SERVER_NAME) $(REDICT_CHECK_RDB_NAME): $(REDICT_SERVER_NAME)
$(REDIS_INSTALL) $(REDIS_SERVER_NAME) $(REDIS_CHECK_RDB_NAME) $(REDICT_INSTALL) $(REDICT_SERVER_NAME) $(REDICT_CHECK_RDB_NAME)
# redis-check-aof # redict-check-aof
$(REDIS_CHECK_AOF_NAME): $(REDIS_SERVER_NAME) $(REDICT_CHECK_AOF_NAME): $(REDICT_SERVER_NAME)
$(REDIS_INSTALL) $(REDIS_SERVER_NAME) $(REDIS_CHECK_AOF_NAME) $(REDICT_INSTALL) $(REDICT_SERVER_NAME) $(REDICT_CHECK_AOF_NAME)
# redis-tls.so # redict-tls.so
$(TLS_MODULE_NAME): $(REDIS_SERVER_NAME) $(TLS_MODULE_NAME): $(REDICT_SERVER_NAME)
$(QUIET_CC)$(CC) -o $@ tls.c -shared -fPIC $(TLS_MODULE_CFLAGS) $(TLS_CLIENT_LIBS) $(QUIET_CC)$(CC) -o $@ tls.c -shared -fPIC $(TLS_MODULE_CFLAGS) $(TLS_CLIENT_LIBS)
# redis-cli # redict-cli
$(REDIS_CLI_NAME): $(REDIS_CLI_OBJ) $(REDICT_CLI_NAME): $(REDICT_CLI_OBJ)
$(REDIS_LD) -o $@ $^ ../deps/hiredis/libhiredis.a ../deps/linenoise/linenoise.o $(FINAL_LIBS) $(TLS_CLIENT_LIBS) $(REDICT_LD) -o $@ $^ ../deps/hiredis/libhiredis.a ../deps/linenoise/linenoise.o $(FINAL_LIBS) $(TLS_CLIENT_LIBS)
# redis-benchmark # redict-benchmark
$(REDIS_BENCHMARK_NAME): $(REDIS_BENCHMARK_OBJ) $(REDICT_BENCHMARK_NAME): $(REDICT_BENCHMARK_OBJ)
$(REDIS_LD) -o $@ $^ ../deps/hiredis/libhiredis.a ../deps/hdr_histogram/libhdrhistogram.a $(FINAL_LIBS) $(TLS_CLIENT_LIBS) $(REDICT_LD) -o $@ $^ ../deps/hiredis/libhiredis.a ../deps/hdr_histogram/libhdrhistogram.a $(FINAL_LIBS) $(TLS_CLIENT_LIBS)
DEP = $(REDIS_SERVER_OBJ:%.o=%.d) $(REDIS_CLI_OBJ:%.o=%.d) $(REDIS_BENCHMARK_OBJ:%.o=%.d) DEP = $(REDICT_SERVER_OBJ:%.o=%.d) $(REDICT_CLI_OBJ:%.o=%.d) $(REDICT_BENCHMARK_OBJ:%.o=%.d)
-include $(DEP) -include $(DEP)
# Because the jemalloc.h header is generated as a part of the jemalloc build, # Because the jemalloc.h header is generated as a part of the jemalloc build,
# building it should complete before building any other object. Instead of # building it should complete before building any other object. Instead of
# depending on a single artifact, build all dependencies first. # depending on a single artifact, build all dependencies first.
%.o: %.c .make-prerequisites %.o: %.c .make-prerequisites
$(REDIS_CC) -MMD -o $@ -c $< $(REDICT_CC) -MMD -o $@ -c $<
# The following files are checked in and don't normally need to be rebuilt. They # The following files are checked in and don't normally need to be rebuilt. They
# are built only if python is available and their prereqs are modified. # are built only if python is available and their prereqs are modified.
@ -456,7 +456,7 @@ endif
commands.c: $(COMMANDS_DEF_FILENAME).def commands.c: $(COMMANDS_DEF_FILENAME).def
clean: clean:
rm -rf $(REDIS_SERVER_NAME) $(REDIS_SENTINEL_NAME) $(REDIS_CLI_NAME) $(REDIS_BENCHMARK_NAME) $(REDIS_CHECK_RDB_NAME) $(REDIS_CHECK_AOF_NAME) *.o *.gcda *.gcno *.gcov redis.info lcov-html Makefile.dep *.so rm -rf $(REDICT_SERVER_NAME) $(REDICT_SENTINEL_NAME) $(REDICT_CLI_NAME) $(REDICT_BENCHMARK_NAME) $(REDICT_CHECK_RDB_NAME) $(REDICT_CHECK_AOF_NAME) *.o *.gcda *.gcno *.gcov redict.info lcov-html Makefile.dep *.so
rm -f $(DEP) rm -f $(DEP)
.PHONY: clean .PHONY: clean
@ -469,16 +469,16 @@ distclean: clean
.PHONY: distclean .PHONY: distclean
test: $(REDIS_SERVER_NAME) $(REDIS_CHECK_AOF_NAME) $(REDIS_CLI_NAME) $(REDIS_BENCHMARK_NAME) test: $(REDICT_SERVER_NAME) $(REDICT_CHECK_AOF_NAME) $(REDICT_CLI_NAME) $(REDICT_BENCHMARK_NAME)
@(cd ..; ./runtest) @(cd ..; ./runtest)
test-modules: $(REDIS_SERVER_NAME) test-modules: $(REDICT_SERVER_NAME)
@(cd ..; ./runtest-moduleapi) @(cd ..; ./runtest-moduleapi)
test-sentinel: $(REDIS_SENTINEL_NAME) $(REDIS_CLI_NAME) test-sentinel: $(REDICT_SENTINEL_NAME) $(REDICT_CLI_NAME)
@(cd ..; ./runtest-sentinel) @(cd ..; ./runtest-sentinel)
test-cluster: $(REDIS_SERVER_NAME) $(REDIS_CLI_NAME) test-cluster: $(REDICT_SERVER_NAME) $(REDICT_CLI_NAME)
@(cd ..; ./runtest-cluster) @(cd ..; ./runtest-cluster)
check: test check: test
@ -486,13 +486,13 @@ check: test
lcov: lcov:
$(MAKE) gcov $(MAKE) gcov
@(set -e; cd ..; ./runtest --clients 1) @(set -e; cd ..; ./runtest --clients 1)
@geninfo -o redis.info . @geninfo -o redict.info .
@genhtml --legend -o lcov-html redis.info @genhtml --legend -o lcov-html redict.info
.PHONY: lcov .PHONY: lcov
bench: $(REDIS_BENCHMARK_NAME) bench: $(REDICT_BENCHMARK_NAME)
./$(REDIS_BENCHMARK_NAME) ./$(REDICT_BENCHMARK_NAME)
32bit: 32bit:
@echo "" @echo ""
@ -501,7 +501,7 @@ bench: $(REDIS_BENCHMARK_NAME)
$(MAKE) CFLAGS="-m32" LDFLAGS="-m32" $(MAKE) CFLAGS="-m32" LDFLAGS="-m32"
gcov: gcov:
$(MAKE) REDIS_CFLAGS="-fprofile-arcs -ftest-coverage -DCOVERAGE_TEST" REDIS_LDFLAGS="-fprofile-arcs -ftest-coverage" $(MAKE) REDICT_CFLAGS="-fprofile-arcs -ftest-coverage -DCOVERAGE_TEST" REDICT_LDFLAGS="-fprofile-arcs -ftest-coverage"
noopt: noopt:
$(MAKE) OPTIMIZATION="-O0" $(MAKE) OPTIMIZATION="-O0"
@ -510,16 +510,16 @@ valgrind:
$(MAKE) OPTIMIZATION="-O0" MALLOC="libc" $(MAKE) OPTIMIZATION="-O0" MALLOC="libc"
helgrind: helgrind:
$(MAKE) OPTIMIZATION="-O0" MALLOC="libc" CFLAGS="-D__ATOMIC_VAR_FORCE_SYNC_MACROS" REDIS_CFLAGS="-I/usr/local/include" REDIS_LDFLAGS="-L/usr/local/lib" $(MAKE) OPTIMIZATION="-O0" MALLOC="libc" CFLAGS="-D__ATOMIC_VAR_FORCE_SYNC_MACROS" REDICT_CFLAGS="-I/usr/local/include" REDICT_LDFLAGS="-L/usr/local/lib"
install: all install: all
@mkdir -p $(INSTALL_BIN) @mkdir -p $(INSTALL_BIN)
$(call MAKE_INSTALL,$(REDIS_SERVER_NAME),$(INSTALL_BIN)) $(call MAKE_INSTALL,$(REDICT_SERVER_NAME),$(INSTALL_BIN))
$(call MAKE_INSTALL,$(REDIS_BENCHMARK_NAME),$(INSTALL_BIN)) $(call MAKE_INSTALL,$(REDICT_BENCHMARK_NAME),$(INSTALL_BIN))
$(call MAKE_INSTALL,$(REDIS_CLI_NAME),$(INSTALL_BIN)) $(call MAKE_INSTALL,$(REDICT_CLI_NAME),$(INSTALL_BIN))
@ln -sf $(REDIS_SERVER_NAME) $(INSTALL_BIN)/$(REDIS_CHECK_RDB_NAME) @ln -sf $(REDICT_SERVER_NAME) $(INSTALL_BIN)/$(REDICT_CHECK_RDB_NAME)
@ln -sf $(REDIS_SERVER_NAME) $(INSTALL_BIN)/$(REDIS_CHECK_AOF_NAME) @ln -sf $(REDICT_SERVER_NAME) $(INSTALL_BIN)/$(REDICT_CHECK_AOF_NAME)
@ln -sf $(REDIS_SERVER_NAME) $(INSTALL_BIN)/$(REDIS_SENTINEL_NAME) @ln -sf $(REDICT_SERVER_NAME) $(INSTALL_BIN)/$(REDICT_SENTINEL_NAME)
uninstall: uninstall:
rm -f $(INSTALL_BIN)/{$(REDIS_SERVER_NAME),$(REDIS_BENCHMARK_NAME),$(REDIS_CLI_NAME),$(REDIS_CHECK_RDB_NAME),$(REDIS_CHECK_AOF_NAME),$(REDIS_SENTINEL_NAME)} rm -f $(INSTALL_BIN)/{$(REDICT_SERVER_NAME),$(REDICT_BENCHMARK_NAME),$(REDICT_CLI_NAME),$(REDICT_CHECK_RDB_NAME),$(REDICT_CHECK_AOF_NAME),$(REDICT_SENTINEL_NAME)}

2
src/ae.c
View File

@ -32,7 +32,7 @@
#include "ae.h" #include "ae.h"
#include "anet.h" #include "anet.h"
#include "redisassert.h" #include "redictassert.h"
#include <stdio.h> #include <stdio.h>
#include <sys/time.h> #include <sys/time.h>

2
src/dict.c
View File

@ -45,7 +45,7 @@
#include "dict.h" #include "dict.h"
#include "zmalloc.h" #include "zmalloc.h"
#include "redisassert.h" #include "redictassert.h"
#include "monotonic.h" #include "monotonic.h"
/* Using dictSetResizeEnabled() we make possible to disable /* Using dictSetResizeEnabled() we make possible to disable

2
src/functions.h
View File

@ -50,7 +50,7 @@
#include "server.h" #include "server.h"
#include "script.h" #include "script.h"
#include "redismodule.h" #include "redictmodule.h"
typedef struct functionLibInfo functionLibInfo; typedef struct functionLibInfo functionLibInfo;

2
src/intset.c
View File

@ -34,7 +34,7 @@
#include "intset.h" #include "intset.h"
#include "zmalloc.h" #include "zmalloc.h"
#include "endianconv.h" #include "endianconv.h"
#include "redisassert.h" #include "redictassert.h"
/* Note that these encodings are ordered, so: /* Note that these encodings are ordered, so:
* INTSET_ENC_INT16 < INTSET_ENC_INT32 < INTSET_ENC_INT64. */ * INTSET_ENC_INT16 < INTSET_ENC_INT32 < INTSET_ENC_INT64. */

2
src/kvstore.c
View File

@ -43,7 +43,7 @@
#include "zmalloc.h" #include "zmalloc.h"
#include "kvstore.h" #include "kvstore.h"
#include "redisassert.h" #include "redictassert.h"
#include "monotonic.h" #include "monotonic.h"
#define UNUSED(V) ((void) V) #define UNUSED(V) ((void) V)

2
src/listpack.c
View File

@ -42,7 +42,7 @@
#include "listpack.h" #include "listpack.h"
#include "listpack_malloc.h" #include "listpack_malloc.h"
#include "redisassert.h" #include "redictassert.h"
#include "util.h" #include "util.h"
#define LP_HDR_SIZE 6 /* 32 bit total len + 16 bit number of elements. */ #define LP_HDR_SIZE 6 /* 32 bit total len + 16 bit number of elements. */

2
src/memtest.c
View File

@ -38,7 +38,7 @@
#include <stropts.h> #include <stropts.h>
#endif #endif
#include "config.h" #include "config.h"
#include "redisassert.h" #include "redictassert.h"
#if (ULONG_MAX == 4294967295UL) #if (ULONG_MAX == 4294967295UL)
#define MEMTEST_32BIT #define MEMTEST_32BIT

12
src/module.c
View File

@ -439,17 +439,17 @@ typedef struct RedisModuleKeyOptCtx {
} RedisModuleKeyOptCtx; } RedisModuleKeyOptCtx;
/* Data structures related to redis module configurations */ /* Data structures related to redis module configurations */
/* The function signatures for module config get callbacks. These are identical to the ones exposed in redismodule.h. */ /* The function signatures for module config get callbacks. These are identical to the ones exposed in redictmodule.h. */
typedef RedisModuleString * (*RedisModuleConfigGetStringFunc)(const char *name, void *privdata); typedef RedisModuleString * (*RedisModuleConfigGetStringFunc)(const char *name, void *privdata);
typedef long long (*RedisModuleConfigGetNumericFunc)(const char *name, void *privdata); typedef long long (*RedisModuleConfigGetNumericFunc)(const char *name, void *privdata);
typedef int (*RedisModuleConfigGetBoolFunc)(const char *name, void *privdata); typedef int (*RedisModuleConfigGetBoolFunc)(const char *name, void *privdata);
typedef int (*RedisModuleConfigGetEnumFunc)(const char *name, void *privdata); typedef int (*RedisModuleConfigGetEnumFunc)(const char *name, void *privdata);
/* The function signatures for module config set callbacks. These are identical to the ones exposed in redismodule.h. */ /* The function signatures for module config set callbacks. These are identical to the ones exposed in redictmodule.h. */
typedef int (*RedisModuleConfigSetStringFunc)(const char *name, RedisModuleString *val, void *privdata, RedisModuleString **err); typedef int (*RedisModuleConfigSetStringFunc)(const char *name, RedisModuleString *val, void *privdata, RedisModuleString **err);
typedef int (*RedisModuleConfigSetNumericFunc)(const char *name, long long val, void *privdata, RedisModuleString **err); typedef int (*RedisModuleConfigSetNumericFunc)(const char *name, long long val, void *privdata, RedisModuleString **err);
typedef int (*RedisModuleConfigSetBoolFunc)(const char *name, int val, void *privdata, RedisModuleString **err); typedef int (*RedisModuleConfigSetBoolFunc)(const char *name, int val, void *privdata, RedisModuleString **err);
typedef int (*RedisModuleConfigSetEnumFunc)(const char *name, int val, void *privdata, RedisModuleString **err); typedef int (*RedisModuleConfigSetEnumFunc)(const char *name, int val, void *privdata, RedisModuleString **err);
/* Apply signature, identical to redismodule.h */ /* Apply signature, identical to redictmodule.h */
typedef int (*RedisModuleConfigApplyFunc)(RedisModuleCtx *ctx, void *privdata, RedisModuleString **err); typedef int (*RedisModuleConfigApplyFunc)(RedisModuleCtx *ctx, void *privdata, RedisModuleString **err);
/* Struct representing a module config. These are stored in a list in the module struct */ /* Struct representing a module config. These are stored in a list in the module struct */
@ -786,7 +786,7 @@ int moduleDelKeyIfEmpty(RedisModuleKey *key) {
* *
* Note that all the exported APIs are called RM_<funcname> in the core * Note that all the exported APIs are called RM_<funcname> in the core
* and RedisModule_<funcname> in the module side (defined as function * and RedisModule_<funcname> in the module side (defined as function
* pointers in redismodule.h). In this way the dynamic linker does not * pointers in redictmodule.h). In this way the dynamic linker does not
* mess with our global function pointers, overriding it with the symbols * mess with our global function pointers, overriding it with the symbols
* defined in the main executable having the same names. * defined in the main executable having the same names.
* -------------------------------------------------------------------------- */ * -------------------------------------------------------------------------- */
@ -797,7 +797,7 @@ int RM_GetApi(const char *funcname, void **targetPtrPtr) {
* named API, otherwise REDISMODULE_OK. * named API, otherwise REDISMODULE_OK.
* *
* This function is not meant to be used by modules developer, it is only * This function is not meant to be used by modules developer, it is only
* used implicitly by including redismodule.h. */ * used implicitly by including redictmodule.h. */
dictEntry *he = dictFind(server.moduleapi, funcname); dictEntry *he = dictFind(server.moduleapi, funcname);
if (!he) return REDISMODULE_ERR; if (!he) return REDISMODULE_ERR;
*targetPtrPtr = dictGetVal(he); *targetPtrPtr = dictGetVal(he);
@ -11650,7 +11650,7 @@ int RM_SubscribeToServerEvent(RedisModuleCtx *ctx, RedisModuleEvent event, Redis
/* Protect in case of calls from contexts without a module reference. */ /* Protect in case of calls from contexts without a module reference. */
if (ctx->module == NULL) return REDISMODULE_ERR; if (ctx->module == NULL) return REDISMODULE_ERR;
if (event.id >= _REDISMODULE_EVENT_NEXT) return REDISMODULE_ERR; if (event.id >= _REDISMODULE_EVENT_NEXT) return REDISMODULE_ERR;
if (event.dataver > moduleEventVersions[event.id]) return REDISMODULE_ERR; /* Module compiled with a newer redismodule.h than we support */ if (event.dataver > moduleEventVersions[event.id]) return REDISMODULE_ERR; /* Module compiled with a newer redictmodule.h than we support */
/* Search an event matching this module and event ID. */ /* Search an event matching this module and event ID. */
listIter li; listIter li;

16
src/modules/Makefile
View File

@ -25,42 +25,42 @@ all: helloworld.so hellotype.so helloblock.so hellocluster.so hellotimer.so hell
.c.xo: .c.xo:
$(CC) -I. $(CFLAGS) $(SHOBJ_CFLAGS) -fPIC -c $< -o $@ $(CC) -I. $(CFLAGS) $(SHOBJ_CFLAGS) -fPIC -c $< -o $@
helloworld.xo: ../redismodule.h helloworld.xo: ../redictmodule.h
helloworld.so: helloworld.xo helloworld.so: helloworld.xo
$(LD) -o $@ $^ $(SHOBJ_LDFLAGS) $(LIBS) -lc $(LD) -o $@ $^ $(SHOBJ_LDFLAGS) $(LIBS) -lc
hellotype.xo: ../redismodule.h hellotype.xo: ../redictmodule.h
hellotype.so: hellotype.xo hellotype.so: hellotype.xo
$(LD) -o $@ $^ $(SHOBJ_LDFLAGS) $(LIBS) -lc $(LD) -o $@ $^ $(SHOBJ_LDFLAGS) $(LIBS) -lc
helloblock.xo: ../redismodule.h helloblock.xo: ../redictmodule.h
helloblock.so: helloblock.xo helloblock.so: helloblock.xo
$(LD) -o $@ $^ $(SHOBJ_LDFLAGS) $(LIBS) -lpthread -lc $(LD) -o $@ $^ $(SHOBJ_LDFLAGS) $(LIBS) -lpthread -lc
hellocluster.xo: ../redismodule.h hellocluster.xo: ../redictmodule.h
hellocluster.so: hellocluster.xo hellocluster.so: hellocluster.xo
$(LD) -o $@ $^ $(SHOBJ_LDFLAGS) $(LIBS) -lc $(LD) -o $@ $^ $(SHOBJ_LDFLAGS) $(LIBS) -lc
hellotimer.xo: ../redismodule.h hellotimer.xo: ../redictmodule.h
hellotimer.so: hellotimer.xo hellotimer.so: hellotimer.xo
$(LD) -o $@ $^ $(SHOBJ_LDFLAGS) $(LIBS) -lc $(LD) -o $@ $^ $(SHOBJ_LDFLAGS) $(LIBS) -lc
hellodict.xo: ../redismodule.h hellodict.xo: ../redictmodule.h
hellodict.so: hellodict.xo hellodict.so: hellodict.xo
$(LD) -o $@ $^ $(SHOBJ_LDFLAGS) $(LIBS) -lc $(LD) -o $@ $^ $(SHOBJ_LDFLAGS) $(LIBS) -lc
hellohook.xo: ../redismodule.h hellohook.xo: ../redictmodule.h
hellohook.so: hellohook.xo hellohook.so: hellohook.xo
$(LD) -o $@ $^ $(SHOBJ_LDFLAGS) $(LIBS) -lc $(LD) -o $@ $^ $(SHOBJ_LDFLAGS) $(LIBS) -lc
helloacl.xo: ../redismodule.h helloacl.xo: ../redictmodule.h
helloacl.so: helloacl.xo helloacl.so: helloacl.xo
$(LD) -o $@ $^ $(SHOBJ_LDFLAGS) $(LIBS) -lc $(LD) -o $@ $^ $(SHOBJ_LDFLAGS) $(LIBS) -lc

2
src/modules/helloacl.c
View File

@ -31,7 +31,7 @@
* POSSIBILITY OF SUCH DAMAGE. * POSSIBILITY OF SUCH DAMAGE.
*/ */
#include "../redismodule.h" #include "../redictmodule.h"
#include <pthread.h> #include <pthread.h>
#include <unistd.h> #include <unistd.h>

2
src/modules/helloblock.c
View File

@ -31,7 +31,7 @@
* POSSIBILITY OF SUCH DAMAGE. * POSSIBILITY OF SUCH DAMAGE.
*/ */
#include "../redismodule.h" #include "../redictmodule.h"
#include <stdio.h> #include <stdio.h>
#include <stdlib.h> #include <stdlib.h>
#include <pthread.h> #include <pthread.h>

2
src/modules/hellocluster.c
View File

@ -30,7 +30,7 @@
* POSSIBILITY OF SUCH DAMAGE. * POSSIBILITY OF SUCH DAMAGE.
*/ */
#include "../redismodule.h" #include "../redictmodule.h"
#include <stdio.h> #include <stdio.h>
#include <stdlib.h> #include <stdlib.h>
#include <ctype.h> #include <ctype.h>

2
src/modules/hellodict.c
View File

@ -33,7 +33,7 @@
* POSSIBILITY OF SUCH DAMAGE. * POSSIBILITY OF SUCH DAMAGE.
*/ */
#include "../redismodule.h" #include "../redictmodule.h"
#include <stdio.h> #include <stdio.h>
#include <stdlib.h> #include <stdlib.h>
#include <ctype.h> #include <ctype.h>

2
src/modules/hellohook.c
View File

@ -30,7 +30,7 @@
* POSSIBILITY OF SUCH DAMAGE. * POSSIBILITY OF SUCH DAMAGE.
*/ */
#include "../redismodule.h" #include "../redictmodule.h"
#include <stdio.h> #include <stdio.h>
#include <stdlib.h> #include <stdlib.h>
#include <ctype.h> #include <ctype.h>

2
src/modules/hellotimer.c
View File

@ -30,7 +30,7 @@
* POSSIBILITY OF SUCH DAMAGE. * POSSIBILITY OF SUCH DAMAGE.
*/ */
#include "../redismodule.h" #include "../redictmodule.h"
#include <stdio.h> #include <stdio.h>
#include <stdlib.h> #include <stdlib.h>
#include <ctype.h> #include <ctype.h>

2
src/modules/hellotype.c
View File

@ -35,7 +35,7 @@
* POSSIBILITY OF SUCH DAMAGE. * POSSIBILITY OF SUCH DAMAGE.
*/ */
#include "../redismodule.h" #include "../redictmodule.h"
#include <stdio.h> #include <stdio.h>
#include <stdlib.h> #include <stdlib.h>
#include <ctype.h> #include <ctype.h>

2
src/modules/helloworld.c
View File

@ -34,7 +34,7 @@
* POSSIBILITY OF SUCH DAMAGE. * POSSIBILITY OF SUCH DAMAGE.
*/ */
#include "../redismodule.h" #include "../redictmodule.h"
#include <stdio.h> #include <stdio.h>
#include <stdlib.h> #include <stdlib.h>
#include <ctype.h> #include <ctype.h>

2
src/monotonic.c
View File

@ -3,7 +3,7 @@
#include <stdlib.h> #include <stdlib.h>
#include <stdio.h> #include <stdio.h>
#include <time.h> #include <time.h>
#include "redisassert.h" #include "redictassert.h"
/* The function pointer for clock retrieval. */ /* The function pointer for clock retrieval. */
monotime (*getMonotonicUs)(void) = NULL; monotime (*getMonotonicUs)(void) = NULL;

2
src/quicklist.c
View File

@ -37,7 +37,7 @@
#include "listpack.h" #include "listpack.h"
#include "util.h" /* for ll2string */ #include "util.h" /* for ll2string */
#include "lzf.h" #include "lzf.h"
#include "redisassert.h" #include "redictassert.h"
#ifndef REDIS_STATIC #ifndef REDIS_STATIC
#define REDIS_STATIC static #define REDIS_STATIC static

2
src/rax.c
View File

@ -36,7 +36,7 @@
#include <errno.h> #include <errno.h>
#include <math.h> #include <math.h>
#include "rax.h" #include "rax.h"
#include "redisassert.h" #include "redictassert.h"
#ifndef RAX_MALLOC_INCLUDE #ifndef RAX_MALLOC_INCLUDE
#define RAX_MALLOC_INCLUDE "rax_malloc.h" #define RAX_MALLOC_INCLUDE "rax_malloc.h"

0
src/redis-benchmark.c → src/redict-benchmark.c
View File

0
src/redis-check-aof.c → src/redict-check-aof.c
View File

0
src/redis-check-rdb.c → src/redict-check-rdb.c
View File

0
src/redis-cli.c → src/redict-cli.c
View File

0
src/redis-trib.rb → src/redict-trib.rb
View File

2
src/redisassert.c → src/redictassert.c
View File

@ -2,7 +2,7 @@
* simply print stack trace to standard error stream. * simply print stack trace to standard error stream.
* *
* This file is shared by those modules that try to print some logs about stack trace * This file is shared by those modules that try to print some logs about stack trace
* but don't have their own implementations of functions in redisassert.h. * but don't have their own implementations of functions in redictassert.h.
* *
* ---------------------------------------------------------------------------- * ----------------------------------------------------------------------------
* *

0
src/redisassert.h → src/redictassert.h
View File

2
src/redismodule.h → src/redictmodule.h
View File

@ -532,7 +532,7 @@ typedef void (*RedisModuleEventCallback)(struct RedisModuleCtx *ctx, RedisModule
* 2 * 2
* } * }
* The reason for that is forward-compatibility: We want that module that * The reason for that is forward-compatibility: We want that module that
* compiled with a new redismodule.h to be able to work with a old server, * compiled with a new redictmodule.h to be able to work with a old server,
* unless the author explicitly decided to use the newer event type. * unless the author explicitly decided to use the newer event type.
*/ */
static const RedisModuleEvent static const RedisModuleEvent

2
src/sds.c
View File

@ -35,7 +35,7 @@
#include <string.h> #include <string.h>
#include <ctype.h> #include <ctype.h>
#include <limits.h> #include <limits.h>
#include "redisassert.h" #include "redictassert.h"
#include "sds.h" #include "sds.h"
#include "sdsalloc.h" #include "sdsalloc.h"
#include "util.h" #include "util.h"

2
src/server.h
View File

@ -82,7 +82,7 @@ typedef long long ustime_t; /* microsecond time type. */
#define REDISMODULE_CORE 1 #define REDISMODULE_CORE 1
typedef struct redisObject robj; typedef struct redisObject robj;
#include "redismodule.h" /* Redis modules API defines. */ #include "redictmodule.h" /* Redis modules API defines. */
/* Following includes allow test functions to be called from Redis main() */ /* Following includes allow test functions to be called from Redis main() */
#include "zipmap.h" #include "zipmap.h"

2
src/ziplist.c
View File

@ -190,7 +190,7 @@
#include "ziplist.h" #include "ziplist.h"
#include "config.h" #include "config.h"
#include "endianconv.h" #include "endianconv.h"
#include "redisassert.h" #include "redictassert.h"
#define ZIP_END 255 /* Special "end of ziplist" entry. */ #define ZIP_END 255 /* Special "end of ziplist" entry. */
#define ZIP_BIG_PREVLEN 254 /* ZIP_BIG_PREVLEN - 1 is the max number of bytes of #define ZIP_BIG_PREVLEN 254 /* ZIP_BIG_PREVLEN - 1 is the max number of bytes of

4
src/zmalloc.c
View File

@ -628,7 +628,7 @@ size_t zmalloc_get_rss(void) {
#if defined(USE_JEMALLOC) #if defined(USE_JEMALLOC)
#include "redisassert.h" #include "redictassert.h"
#define STRINGIFY_(x) #x #define STRINGIFY_(x) #x
#define STRINGIFY(x) STRINGIFY_(x) #define STRINGIFY(x) STRINGIFY_(x)
@ -910,7 +910,7 @@ size_t zmalloc_get_memory_size(void) {
#ifdef REDIS_TEST #ifdef REDIS_TEST
#include "testhelp.h" #include "testhelp.h"
#include "redisassert.h" #include "redictassert.h"
#define TEST(name) printf("test — %s\n", name); #define TEST(name) printf("test — %s\n", name);

2
tests/modules/Makefile
View File

@ -72,7 +72,7 @@ all: $(TEST_MODULES)
32bit: 32bit:
$(MAKE) CFLAGS="-m32" LDFLAGS="-m32" $(MAKE) CFLAGS="-m32" LDFLAGS="-m32"
%.xo: %.c ../../src/redismodule.h %.xo: %.c ../../src/redictmodule.h
$(CC) -I../../src $(CFLAGS) $(SHOBJ_CFLAGS) -fPIC -c $< -o $@ $(CC) -I../../src $(CFLAGS) $(SHOBJ_CFLAGS) -fPIC -c $< -o $@
%.so: %.xo %.so: %.xo

2
tests/modules/aclcheck.c
View File

@ -1,5 +1,5 @@
#include "redismodule.h" #include "redictmodule.h"
#include <errno.h> #include <errno.h>
#include <assert.h> #include <assert.h>
#include <string.h> #include <string.h>

2
tests/modules/auth.c
View File

@ -2,7 +2,7 @@
#define _BSD_SOURCE #define _BSD_SOURCE
#define _DEFAULT_SOURCE #define _DEFAULT_SOURCE
#include "redismodule.h" #include "redictmodule.h"
#include <string.h> #include <string.h>
#include <unistd.h> #include <unistd.h>

2
tests/modules/basics.c
View File

@ -30,7 +30,7 @@
* POSSIBILITY OF SUCH DAMAGE. * POSSIBILITY OF SUCH DAMAGE.
*/ */
#include "redismodule.h" #include "redictmodule.h"
#include <string.h> #include <string.h>
#include <stdlib.h> #include <stdlib.h>

2
tests/modules/blockedclient.c
View File

@ -3,7 +3,7 @@
#define _DEFAULT_SOURCE #define _DEFAULT_SOURCE
#include <unistd.h> #include <unistd.h>
#include "redismodule.h" #include "redictmodule.h"
#include <assert.h> #include <assert.h>
#include <stdio.h> #include <stdio.h>
#include <pthread.h> #include <pthread.h>

2
tests/modules/blockonbackground.c
View File

@ -1,5 +1,5 @@
#define _XOPEN_SOURCE 700 #define _XOPEN_SOURCE 700
#include "redismodule.h" #include "redictmodule.h"
#include <stdio.h> #include <stdio.h>
#include <stdlib.h> #include <stdlib.h>
#include <pthread.h> #include <pthread.h>

2
tests/modules/blockonkeys.c
View File

@ -1,4 +1,4 @@
#include "redismodule.h" #include "redictmodule.h"
#include <string.h> #include <string.h>
#include <strings.h> #include <strings.h>

2
tests/modules/cmdintrospection.c
View File

@ -1,4 +1,4 @@
#include "redismodule.h" #include "redictmodule.h"
#define UNUSED(V) ((void) V) #define UNUSED(V) ((void) V)

2
tests/modules/commandfilter.c
View File

@ -1,4 +1,4 @@
#include "redismodule.h" #include "redictmodule.h"
#include <string.h> #include <string.h>
#include <strings.h> #include <strings.h>

2
tests/modules/crash.c
View File

@ -1,4 +1,4 @@
#include "redismodule.h" #include "redictmodule.h"
#include <strings.h> #include <strings.h>
#include <sys/mman.h> #include <sys/mman.h>

2
tests/modules/datatype.c
View File

@ -7,7 +7,7 @@
#define _DEFAULT_SOURCE #define _DEFAULT_SOURCE
#include <unistd.h> #include <unistd.h>
#include "redismodule.h" #include "redictmodule.h"
static RedisModuleType *datatype = NULL; static RedisModuleType *datatype = NULL;
static int load_encver = 0; static int load_encver = 0;

2
tests/modules/datatype2.c
View File

@ -72,7 +72,7 @@
* *
**/ **/
#include "redismodule.h" #include "redictmodule.h"
#include <stdio.h> #include <stdio.h>
#include <stdlib.h> #include <stdlib.h>
#include <ctype.h> #include <ctype.h>

2
tests/modules/defragtest.c
View File

@ -1,7 +1,7 @@
/* A module that implements defrag callback mechanisms. /* A module that implements defrag callback mechanisms.
*/ */
#include "redismodule.h" #include "redictmodule.h"
#include <stdlib.h> #include <stdlib.h>
static RedisModuleType *FragType; static RedisModuleType *FragType;

2
tests/modules/eventloop.c
View File

@ -11,7 +11,7 @@
* 4- test.oneshot : Test for oneshot API * 4- test.oneshot : Test for oneshot API
*/ */
#include "redismodule.h" #include "redictmodule.h"
#include <stdlib.h> #include <stdlib.h>
#include <unistd.h> #include <unistd.h>
#include <fcntl.h> #include <fcntl.h>

2
tests/modules/fork.c
View File

@ -3,7 +3,7 @@
#define _BSD_SOURCE #define _BSD_SOURCE
#define _DEFAULT_SOURCE #define _DEFAULT_SOURCE
#include "redismodule.h" #include "redictmodule.h"
#include <string.h> #include <string.h>
#include <assert.h> #include <assert.h>
#include <unistd.h> #include <unistd.h>

2
tests/modules/getchannels.c
View File

@ -1,4 +1,4 @@
#include "redismodule.h" #include "redictmodule.h"
#include <strings.h> #include <strings.h>
#include <assert.h> #include <assert.h>
#include <unistd.h> #include <unistd.h>

2
tests/modules/getkeys.c
View File

@ -1,5 +1,5 @@
#include "redismodule.h" #include "redictmodule.h"
#include <strings.h> #include <strings.h>
#include <assert.h> #include <assert.h>
#include <unistd.h> #include <unistd.h>

2
tests/modules/hash.c
View File

@ -1,4 +1,4 @@
#include "redismodule.h" #include "redictmodule.h"
#include <strings.h> #include <strings.h>
#include <errno.h> #include <errno.h>
#include <stdlib.h> #include <stdlib.h>

2
tests/modules/hooks.c
View File

@ -30,7 +30,7 @@
* POSSIBILITY OF SUCH DAMAGE. * POSSIBILITY OF SUCH DAMAGE.
*/ */
#include "redismodule.h" #include "redictmodule.h"
#include <stdio.h> #include <stdio.h>
#include <string.h> #include <string.h>
#include <strings.h> #include <strings.h>

2
tests/modules/infotest.c
View File

@ -1,4 +1,4 @@
#include "redismodule.h" #include "redictmodule.h"
#include <string.h> #include <string.h>

2
tests/modules/keyspace_events.c
View File

@ -33,7 +33,7 @@
#define _BSD_SOURCE #define _BSD_SOURCE
#define _DEFAULT_SOURCE /* For usleep */ #define _DEFAULT_SOURCE /* For usleep */
#include "redismodule.h" #include "redictmodule.h"
#include <stdio.h> #include <stdio.h>
#include <string.h> #include <string.h>
#include <strings.h> #include <strings.h>

2
tests/modules/keyspecs.c
View File

@ -1,4 +1,4 @@
#include "redismodule.h" #include "redictmodule.h"
#define UNUSED(V) ((void) V) #define UNUSED(V) ((void) V)

2
tests/modules/list.c
View File

@ -1,4 +1,4 @@
#include "redismodule.h" #include "redictmodule.h"
#include <assert.h> #include <assert.h>
#include <errno.h> #include <errno.h>
#include <strings.h> #include <strings.h>

2
tests/modules/mallocsize.c
View File

@ -1,4 +1,4 @@
#include "redismodule.h" #include "redictmodule.h"
#include <string.h> #include <string.h>
#include <assert.h> #include <assert.h>
#include <unistd.h> #include <unistd.h>

2
tests/modules/misc.c
View File

@ -1,4 +1,4 @@
#include "redismodule.h" #include "redictmodule.h"
#include <string.h> #include <string.h>
#include <assert.h> #include <assert.h>

2
tests/modules/moduleauthtwo.c
View File

@ -1,4 +1,4 @@
#include "redismodule.h" #include "redictmodule.h"
#include <string.h> #include <string.h>

2
tests/modules/moduleconfigs.c
View File

@ -1,4 +1,4 @@
#include "redismodule.h" #include "redictmodule.h"
#include <strings.h> #include <strings.h>
int mutable_bool_val; int mutable_bool_val;
int immutable_bool_val; int immutable_bool_val;

2
tests/modules/moduleconfigstwo.c
View File

@ -1,4 +1,4 @@
#include "redismodule.h" #include "redictmodule.h"
#include <strings.h> #include <strings.h>
/* Second module configs module, for testing. /* Second module configs module, for testing.

2
tests/modules/postnotifications.c
View File

@ -48,7 +48,7 @@
#define _BSD_SOURCE #define _BSD_SOURCE
#define _DEFAULT_SOURCE /* For usleep */ #define _DEFAULT_SOURCE /* For usleep */
#include "redismodule.h" #include "redictmodule.h"
#include <stdio.h> #include <stdio.h>
#include <string.h> #include <string.h>
#include <unistd.h> #include <unistd.h>

2
tests/modules/propagate.c
View File

@ -37,7 +37,7 @@
* POSSIBILITY OF SUCH DAMAGE. * POSSIBILITY OF SUCH DAMAGE.
*/ */
#include "redismodule.h" #include "redictmodule.h"
#include <pthread.h> #include <pthread.h>
#include <errno.h> #include <errno.h>

2
tests/modules/publish.c
View File

@ -1,4 +1,4 @@
#include "redismodule.h" #include "redictmodule.h"
#include <string.h> #include <string.h>
#include <assert.h> #include <assert.h>
#include <unistd.h> #include <unistd.h>

2
tests/modules/rdbloadsave.c
View File

@ -1,4 +1,4 @@
#include "redismodule.h" #include "redictmodule.h"
#include <stdlib.h> #include <stdlib.h>
#include <unistd.h> #include <unistd.h>

2
tests/modules/reply.c
View File

@ -2,7 +2,7 @@
* A module the tests RM_ReplyWith family of commands * A module the tests RM_ReplyWith family of commands
*/ */
#include "redismodule.h" #include "redictmodule.h"
#include <math.h> #include <math.h>
int rw_string(RedisModuleCtx *ctx, RedisModuleString **argv, int argc) { int rw_string(RedisModuleCtx *ctx, RedisModuleString **argv, int argc) {

2
tests/modules/scan.c
View File

@ -1,4 +1,4 @@
#include "redismodule.h" #include "redictmodule.h"
#include <string.h> #include <string.h>
#include <assert.h> #include <assert.h>

2
tests/modules/stream.c
View File

@ -1,4 +1,4 @@
#include "redismodule.h" #include "redictmodule.h"
#include <string.h> #include <string.h>
#include <strings.h> #include <strings.h>

2
tests/modules/subcommands.c
View File

@ -1,4 +1,4 @@
#include "redismodule.h" #include "redictmodule.h"
#define UNUSED(V) ((void) V) #define UNUSED(V) ((void) V)

2
tests/modules/test_lazyfree.c
View File

@ -1,7 +1,7 @@
/* This module emulates a linked list for lazyfree testing of modules, which /* This module emulates a linked list for lazyfree testing of modules, which
is a simplified version of 'hellotype.c' is a simplified version of 'hellotype.c'
*/ */
#include "redismodule.h" #include "redictmodule.h"
#include <stdio.h> #include <stdio.h>
#include <stdlib.h> #include <stdlib.h>
#include <ctype.h> #include <ctype.h>

2
tests/modules/testrdb.c
View File

@ -1,4 +1,4 @@
#include "redismodule.h" #include "redictmodule.h"
#include <string.h> #include <string.h>
#include <assert.h> #include <assert.h>

2
tests/modules/timer.c
View File

@ -1,5 +1,5 @@
#include "redismodule.h" #include "redictmodule.h"
static void timer_callback(RedisModuleCtx *ctx, void *data) static void timer_callback(RedisModuleCtx *ctx, void *data)
{ {

2
tests/modules/usercall.c
View File

@ -1,4 +1,4 @@
#include "redismodule.h" #include "redictmodule.h"
#include <pthread.h> #include <pthread.h>
#include <assert.h> #include <assert.h>

2
tests/modules/zset.c
View File

@ -1,4 +1,4 @@
#include "redismodule.h" #include "redictmodule.h"
#include <math.h> #include <math.h>
#include <errno.h> #include <errno.h>