gvsafronov/futriix
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
futriix/src/Makefile

558 lines
18 KiB
Makefile
Raw Normal View History

first commit
2009-03-22 10:30:00 +01:00
# Redis Makefile
# Copyright (C) 2009 Salvatore Sanfilippo <antirez at gmail dot com>
# This file is released under the BSD license, see the COPYING file
Makefile now introduces Redis-specific CFLAGS / LDFLAGS. Gcov target fixed. Added comments to describe how it works.
2012-04-12 11:09:38 +02:00
#
Rename ADD_*FLAGS -> REDIS_*FLAGS, REDIS_*FLAGS -> FINAL_*FLAGS This reflects that REDIS_*FLAGS will only be used for compilation of Redis and not for its dependencies. Similarly, that FINAL_*FLAGS are composed of other variables and holds the options that are finally passed to the compiler and linker.
2012-04-13 17:34:31 -07:00
# The Makefile composes the final FINAL_CFLAGS and FINAL_LDFLAGS using
changed redis_flags names to keydb in makefile Former-commit-id: 07273936271536e4a57efdb7a31bc34e5b8d50f1
2021-06-14 16:09:42 +00:00
# what is needed for KeyDB plus the standard CFLAGS and LDFLAGS passed.
Makefile now introduces Redis-specific CFLAGS / LDFLAGS. Gcov target fixed. Added comments to describe how it works.
2012-04-12 11:09:38 +02:00
# However when building the dependencies (Jemalloc, Lua, Hiredis, ...)
# CFLAGS and LDFLAGS are propagated to the dependencies, so to pass
changed redis_flags names to keydb in makefile Former-commit-id: 07273936271536e4a57efdb7a31bc34e5b8d50f1
2021-06-14 16:09:42 +00:00
# flags only to be used when compiling / linking KeyDB itself KEYDB_CFLAGS
# and KEYDB_LDFLAGS are used instead (this is the case of 'make gcov').
Makefile now introduces Redis-specific CFLAGS / LDFLAGS. Gcov target fixed. Added comments to describe how it works.
2012-04-12 11:09:38 +02:00
#
# Dependencies are stored in the Makefile.dep file. To rebuild this file
# Just use 'make dep', but this is only needed by developers.
first commit
2009-03-22 10:30:00 +01:00
enable TLS build by default (#43) * enable TLS build by default * move export to src folder * fix comments
2022-02-11 16:36:42 -08:00
# we ship KeyDB with TLS by default
# export it here as both this file and deps/Makefile uses it
export BUILD_TLS ?= yes
buliding of release.h moved into an external script. Avoided recompialtion of redis.c if git sha1 is the same as the previous one
2010-05-18 00:36:48 +02:00
release_hdr := $(shell sh -c './mkreleasehdr.sh')
Merged Solaris patches provided by Alan Harder
2009-10-26 16:25:07 +01:00
uname_S := $(shell sh -c 'uname -s 2>/dev/null || echo not')
ARM: Avoid memcpy() in MurmurHash64A() if we are using 64 bit ARM. However note that in architectures supporting 64 bit unaligned accesses memcpy(...,...,8) is likely translated to a simple word memory movement anyway.
2017-02-19 14:59:39 +00:00
uname_M := $(shell sh -c 'uname -m 2>/dev/null || echo not')
Reenable LTO Former-commit-id: e7c1e1c9d8021f48c4081a9dfb84dba9da2521fc
2021-06-25 06:10:13 +00:00
OPTIMIZATION?=-O2 -flto
Merge branch 'unstable' into keydbpro Former-commit-id: 205d8f18d2bb8df5253bab40578b006b7aa73fd5
2021-05-28 23:32:46 +00:00
DEPENDENCY_TARGETS=hiredis linenoise lua hdr_histogram rocksdb
Makefile: don't build dependencies file for clean, distclean.
2016-07-06 12:56:43 +02:00
NODEPS:=clean distclean
build: fix sunos build, compile lua with __C99FEATURES__=1
2011-10-30 03:20:00 +00:00
First set defaults, then do composition
2012-04-13 17:43:06 -07:00
# Default settings
Implement redisAtomic to replace _Atomic C11 builtin (#7707) Redis 6.0 introduces I/O threads, it is so cool and efficient, we use C11 _Atomic to establish inter-thread synchronization without mutex. But the compiler that must supports C11 _Atomic can compile redis code, that brings a lot of inconvenience since some common platforms can't support by default such as CentOS7, so we want to implement redis atomic type to make it more portable. We have implemented our atomic variable for redis that only has 'relaxed' operations in src/atomicvar.h, so we implement some operations with 'sequentially-consistent', just like the default behavior of C11 _Atomic that can establish inter-thread synchronization. And we replace all uses of C11 _Atomic with redis atomic variable. Our implementation of redis atomic variable uses C11 _Atomic, __atomic or __sync macros if available, it supports most common platforms, and we will detect automatically which feature we use. In Makefile we use a dummy file to detect if the compiler supports C11 _Atomic. Now for gcc, we can compile redis code theoretically if your gcc version is not less than 4.1.2(starts to support __sync_xxx operations). Otherwise, we remove use mutex fallback to implement redis atomic variable for performance and test. You will get compiling errors if your compiler doesn't support all features of above. For cover redis atomic variable tests, we add other CI jobs that build redis on CentOS6 and CentOS7 and workflow daily jobs that run the tests on them. For them, we just install gcc by default in order to cover different compiler versions, gcc is 4.4.7 by default installation on CentOS6 and 4.8.5 on CentOS7. We restore the feature that we can test redis with Helgrind to find data race errors. But you need install Valgrind in the default path configuration firstly before running your tests, since we use macros in helgrind.h to tell Helgrind inter-thread happens-before relationship explicitly for avoiding false positives. Please open an issue on github if you find data race errors relate to this commit. Unrelated: - Fix redefinition of typedef 'RedisModuleUserChangedFunc' For some old version compilers, they will report errors or warnings, if we re-define function type.
2020-09-17 21:01:45 +08:00
STD=-pedantic -DREDIS_STATIC=''
Print nicer error messages for uncaught exceptions Former-commit-id: 23b0268a7fc1f7116e96905502895a445d2caf76
2019-05-18 20:22:16 -04:00
CXX_STD=-std=c++14 -pedantic -fno-rtti -D__STDC_FORMAT_MACROS
only FreeBSD change/little warning addressing
2018-11-08 10:13:52 +00:00
ifneq (,$(findstring clang,$(CC)))
Cleanup clang warnings. (#8546)
2021-02-24 10:10:02 +02:00
STD+=-Wno-c11-extensions
else
only FreeBSD change/little warning addressing
2018-11-08 10:13:52 +00:00
ifneq (,$(findstring FreeBSD,$(uname_S)))
STD+=-Wno-c11-extensions
endif
Fix clang build. Some math functions require c11 standard.
2018-10-30 13:23:43 +00:00
endif
fix warnings for mac build Former-commit-id: 570fbd014944a655f6c8e7216f2b9226f378c7c7
2021-07-15 20:14:14 +00:00
WARN=-Wall -W -Wno-missing-field-initializers -Wno-address-of-packed-member -Wno-atomic-alignment
Remove extra spaces
2013-03-16 18:44:38 +11:00
OPT=$(OPTIMIZATION)
Clean up Makefiles Remove unused variables. Instead of overriding non-standard variables such as ARCH and PROF, use standard variables CFLAGS and LDFLAGS to override Makefile settings. Move dependencies generated by `make dep` to a separate file.
2012-03-24 19:25:03 -07:00
Implement redisAtomic to replace _Atomic C11 builtin (#7707) Redis 6.0 introduces I/O threads, it is so cool and efficient, we use C11 _Atomic to establish inter-thread synchronization without mutex. But the compiler that must supports C11 _Atomic can compile redis code, that brings a lot of inconvenience since some common platforms can't support by default such as CentOS7, so we want to implement redis atomic type to make it more portable. We have implemented our atomic variable for redis that only has 'relaxed' operations in src/atomicvar.h, so we implement some operations with 'sequentially-consistent', just like the default behavior of C11 _Atomic that can establish inter-thread synchronization. And we replace all uses of C11 _Atomic with redis atomic variable. Our implementation of redis atomic variable uses C11 _Atomic, __atomic or __sync macros if available, it supports most common platforms, and we will detect automatically which feature we use. In Makefile we use a dummy file to detect if the compiler supports C11 _Atomic. Now for gcc, we can compile redis code theoretically if your gcc version is not less than 4.1.2(starts to support __sync_xxx operations). Otherwise, we remove use mutex fallback to implement redis atomic variable for performance and test. You will get compiling errors if your compiler doesn't support all features of above. For cover redis atomic variable tests, we add other CI jobs that build redis on CentOS6 and CentOS7 and workflow daily jobs that run the tests on them. For them, we just install gcc by default in order to cover different compiler versions, gcc is 4.4.7 by default installation on CentOS6 and 4.8.5 on CentOS7. We restore the feature that we can test redis with Helgrind to find data race errors. But you need install Valgrind in the default path configuration firstly before running your tests, since we use macros in helgrind.h to tell Helgrind inter-thread happens-before relationship explicitly for avoiding false positives. Please open an issue on github if you find data race errors relate to this commit. Unrelated: - Fix redefinition of typedef 'RedisModuleUserChangedFunc' For some old version compilers, they will report errors or warnings, if we re-define function type.
2020-09-17 21:01:45 +08:00
# Detect if the compiler supports C11 _Atomic
C11_ATOMIC := $(shell sh -c 'echo "\#include <stdatomic.h>" > foo.c; \
Fix C11 detection in the makefile (#7822) 445a4b6 introudced a makefile script that detects if the toolchain supports c11, and it looked that it was passing on MacOS and fails on Ubuntu, looks like Ubuntu's Dash was spawning a background process, deleted foo.c before gcc tried to compile it.
2020-09-21 11:17:48 +03:00
$(CC) -std=c11 -c foo.c -o foo.o > /dev/null 2>&1; \
Implement redisAtomic to replace _Atomic C11 builtin (#7707) Redis 6.0 introduces I/O threads, it is so cool and efficient, we use C11 _Atomic to establish inter-thread synchronization without mutex. But the compiler that must supports C11 _Atomic can compile redis code, that brings a lot of inconvenience since some common platforms can't support by default such as CentOS7, so we want to implement redis atomic type to make it more portable. We have implemented our atomic variable for redis that only has 'relaxed' operations in src/atomicvar.h, so we implement some operations with 'sequentially-consistent', just like the default behavior of C11 _Atomic that can establish inter-thread synchronization. And we replace all uses of C11 _Atomic with redis atomic variable. Our implementation of redis atomic variable uses C11 _Atomic, __atomic or __sync macros if available, it supports most common platforms, and we will detect automatically which feature we use. In Makefile we use a dummy file to detect if the compiler supports C11 _Atomic. Now for gcc, we can compile redis code theoretically if your gcc version is not less than 4.1.2(starts to support __sync_xxx operations). Otherwise, we remove use mutex fallback to implement redis atomic variable for performance and test. You will get compiling errors if your compiler doesn't support all features of above. For cover redis atomic variable tests, we add other CI jobs that build redis on CentOS6 and CentOS7 and workflow daily jobs that run the tests on them. For them, we just install gcc by default in order to cover different compiler versions, gcc is 4.4.7 by default installation on CentOS6 and 4.8.5 on CentOS7. We restore the feature that we can test redis with Helgrind to find data race errors. But you need install Valgrind in the default path configuration firstly before running your tests, since we use macros in helgrind.h to tell Helgrind inter-thread happens-before relationship explicitly for avoiding false positives. Please open an issue on github if you find data race errors relate to this commit. Unrelated: - Fix redefinition of typedef 'RedisModuleUserChangedFunc' For some old version compilers, they will report errors or warnings, if we re-define function type.
2020-09-17 21:01:45 +08:00
if [ -f foo.o ]; then echo "yes"; rm foo.o; fi; rm foo.c')
ifeq ($(C11_ATOMIC),yes)
STD+=-std=c11
else
STD+=-std=c99
endif
use `install` as default installer (except on SunOS)
2013-03-20 22:05:59 +11:00
PREFIX?=/usr/local
INSTALL_BIN=$(PREFIX)/bin
INSTALL=install
Auto-detect and link libsystemd at compile-time This adds Makefile/build-system support for USE_SYSTEMD=(yes|no|*). This variable's value determines whether or not libsystemd will be linked at build-time. If USE_SYSTEMD is set to "yes", make will use PKG_CONFIG to check for libsystemd's presence, and fail the build early if it isn't installed/detected properly. If USE_SYSTEM is set to "no", libsystemd will *not* be linked, even if support for it is available on the system redis is being built on. For any other value that USE_SYSTEM might assume (e.g. "auto"), PKG_CONFIG will try to determine libsystemd's presence, and set up the build process to link against it, if it was indicated as being installed/available. This approach has a number of repercussions of its own, most importantly the following: If you build redis on a system that actually has systemd support, but no libsystemd-dev package(s) installed, you'll end up *without* support for systemd notification/status reporting support in redis-server. This changes established runtime behaviour. I'm not sure if the build system and/or the server binary should indicate this. I'm also wondering if not actually having systemd-notify-support, but requesting it via the server's config, should result in a fatal error now.
2019-05-30 18:44:17 +02:00
PKG_CONFIG?=pkg-config
use `install` as default installer (except on SunOS)
2013-03-20 22:05:59 +11:00
ARM: Use libc malloc by default. I'm not sure how much test Jemalloc gets on ARM, moreover compiling Redis with Jemalloc support in not very powerful devices, like most ARMs people will build Redis on, is extremely slow. It is possible to enable Jemalloc build anyway if needed by using "make MALLOC=jemalloc".
2017-02-19 15:02:37 +00:00
# Default allocator defaults to Jemalloc if it's not an ARM
MALLOC=libc
ifneq ($(uname_M),armv6l)
ifneq ($(uname_M),armv7l)
Rebuild source when allocator changes To do so, the Makefile stores the contents of the MALLOC environment variable in a file named .make-malloc. When the contents of this file and the MALLOC variable are not equal, it forces a rebuild of the Redis source tree. A side-effect of this change is that choosing an allocator can now be done using the single MALLOC variable instead of USE_TCMALLOC, USE_JEMALLOC and so forth. These variables continue to work for backwards compatibility.
2011-11-15 13:09:31 -08:00
ifeq ($(uname_S),Linux)
Change default back to jemalloc (until defrag is implemented) and fix compile errors
2019-02-21 01:36:38 -05:00
MALLOC=jemalloc
ARM: Use libc malloc by default. I'm not sure how much test Jemalloc gets on ARM, moreover compiling Redis with Jemalloc support in not very powerful devices, like most ARMs people will build Redis on, is extremely slow. It is possible to enable Jemalloc build anyway if needed by using "make MALLOC=jemalloc".
2017-02-19 15:02:37 +00:00
endif
endif
Rebuild source when allocator changes To do so, the Makefile stores the contents of the MALLOC environment variable in a file named .make-malloc. When the contents of this file and the MALLOC variable are not equal, it forces a rebuild of the Redis source tree. A side-effect of this change is that choosing an allocator can now be done using the single MALLOC variable instead of USE_TCMALLOC, USE_JEMALLOC and so forth. These variables continue to work for backwards compatibility.
2011-11-15 13:09:31 -08:00
endif
Option to disable ASM spinlock Former-commit-id: 01ff36fc289449d6e0bf20731de079b6957bfac8
2019-02-26 00:00:04 -05:00
USEASM?=true
Merge main with oss release sep29 2022 (#521) * need to include stdint for uintptr_t * need to include stdint for uintptr_t * use atomic_load for g_pserver->mstime * use atomic_load for g_pserver->mstime * Integrate readwritelock with Pro Code * Integrate readwritelock with Pro Code * Defensive asserts for RWLock * Defensive asserts for RWLock * Save and restore master info in rdb to allow active replica partial sync (#371) * save replid for all masters in rdb * expanded rdbSaveInfo to hold multiple master structs * parse repl-masters from rdb * recover replid info from rdb in active replica mode, attempt partial sync * save offset from rdb into correct variable * don't change replid based on master in active rep * save and load psync info from correct fields * Save and restore master info in rdb to allow active replica partial sync (#371) * save replid for all masters in rdb * expanded rdbSaveInfo to hold multiple master structs * parse repl-masters from rdb * recover replid info from rdb in active replica mode, attempt partial sync * save offset from rdb into correct variable * don't change replid based on master in active rep * save and load psync info from correct fields * placement new instead of memcpy * placement new instead of memcpy * Remove asserts, RW lock can go below zero in cases of aeAcquireLock * Remove asserts, RW lock can go below zero in cases of aeAcquireLock * Inclusive language * Inclusive language * update packaging for OS merge * update packaging for OS merge * modify dockerfile to build within image * modify dockerfile to build within image * Make active client balancing a configurable option * Make active client balancing a configurable option * With TLS throttle accepts if server is under heavy load - do not change non TLS behavior * With TLS throttle accepts if server is under heavy load - do not change non TLS behavior * Only run the tls-name-validation test if --tls is passed into runtest * Only run the tls-name-validation test if --tls is passed into runtest * Fix KeyDB not building with TLS < 1.1.1 * Fix KeyDB not building with TLS < 1.1.1 * update changelog to use replica as terminology * update changelog to use replica as terminology * update copyright * update copyright * update deb copyright * update deb copyright * call aeThreadOnline() earlier * call aeThreadOnline() earlier * Removed mergeReplicationId * Removed mergeReplicationId * acceptTLS is threadsafe like the non TLS version * acceptTLS is threadsafe like the non TLS version * setup Machamp ci * setup Machamp ci * make build_test.sh executable * make build_test.sh executable * PSYNC production fixes * PSYNC production fixes * fix the Machamp build * fix the Machamp build * break into tests into steps * break into tests into steps * Added multimaster test * Added multimaster test * Update ci.yml Change min tested version to 18.04 * Update ci.yml Change min tested version to 18.04 * fork lock for all threads, use fastlock for readwritelock * fork lock for all threads, use fastlock for readwritelock * hide forklock object in ae * hide forklock object in ae * only need to include readwritelock in ae * only need to include readwritelock in ae * time thread lock uses fastlock instead of std::mutex * time thread lock uses fastlock instead of std::mutex * set thread as offline when waiting for time thread lock * set thread as offline when waiting for time thread lock * update README resource links * update README resource links * Fix MALLOC=memkind build issues * Fix MALLOC=memkind build issues * Fix module test break * Fix module test break * Eliminate firewall dialogs on mac for regular and cluster tests. There are still issues with the sentinel tests but attempting to bind only to localhost causes failures * Eliminate firewall dialogs on mac for regular and cluster tests. There are still issues with the sentinel tests but attempting to bind only to localhost causes failures * remove unused var in networking.cpp * remove unused var in networking.cpp * check ziplist len to avoid crash on empty ziplist convert * check ziplist len to avoid crash on empty ziplist convert * remove nullptr subtraction * remove nullptr subtraction * cannot mod a pointer * cannot mod a pointer * need to include stdint for uintptr_t * need to include stdint for uintptr_t * use atomic_load for g_pserver->mstime * use atomic_load for g_pserver->mstime * Integrate readwritelock with Pro Code * Integrate readwritelock with Pro Code * Defensive asserts for RWLock * Defensive asserts for RWLock * Save and restore master info in rdb to allow active replica partial sync (#371) * save replid for all masters in rdb * expanded rdbSaveInfo to hold multiple master structs * parse repl-masters from rdb * recover replid info from rdb in active replica mode, attempt partial sync * save offset from rdb into correct variable * don't change replid based on master in active rep * save and load psync info from correct fields * Save and restore master info in rdb to allow active replica partial sync (#371) * save replid for all masters in rdb * expanded rdbSaveInfo to hold multiple master structs * parse repl-masters from rdb * recover replid info from rdb in active replica mode, attempt partial sync * save offset from rdb into correct variable * don't change replid based on master in active rep * save and load psync info from correct fields * placement new instead of memcpy * placement new instead of memcpy * Remove asserts, RW lock can go below zero in cases of aeAcquireLock * Remove asserts, RW lock can go below zero in cases of aeAcquireLock * Inclusive language * Inclusive language * call aeThreadOnline() earlier * call aeThreadOnline() earlier * Removed mergeReplicationId * Removed mergeReplicationId * Make active client balancing a configurable option * Make active client balancing a configurable option * With TLS throttle accepts if server is under heavy load - do not change non TLS behavior * With TLS throttle accepts if server is under heavy load - do not change non TLS behavior * acceptTLS is threadsafe like the non TLS version * acceptTLS is threadsafe like the non TLS version * PSYNC production fixes * PSYNC production fixes * Ensure we are responsive during storagecache clears * Ensure we are responsive during storagecache clears * Ensure recreated tables use the same settings as ones made at boot * Ensure recreated tables use the same settings as ones made at boot * Converted some existing PSYNC tests for multimaster * Converted some existing PSYNC tests for multimaster * Inclusive language fix * Inclusive language fix * Cleanup test suite * Cleanup test suite * Updated test replica configs so tests make sense * Updated test replica configs so tests make sense * active-rep test reliability * active-rep test reliability * Quick fix to make psync tests work * Quick fix to make psync tests work * Fix PSYNC test crashes * Fix PSYNC test crashes * Ensure we force moves not copies when ingesting bulk insert files * Ensure we force moves not copies when ingesting bulk insert files * Disable async for hget commands as it is not ready * Disable FLASH * Fix crash in save of masterinfo * Fix musl/Alpine build failures * Remove unnecessary libs * update readme * update readme * remove Enterprise references * Limit max overage to 20% during RDB save * Delete COPYING to replace with BSD license * update deb master changelog * Update license * Fix Readme typo from github org transition Replace mention of scratch-file-path with db-s3-object * Fix reference counting failure in the dict. This is caused by std::swap also swapping refcounts * Fix assertion in async rehash * Prevent crash on shutdown by avoiding dtors (they are unnecessary anyways) * Initialize noshrink, it was dangling * Prevent us from starting a rehash when one wasn't already in progress. This can cause severe issues for snapshots * Avoid unnecessary rehashing when a rehash is abandoned * Dictionary use correct acquire/release semantics * Add fence barriers for the repl backlog (important for AARCH64 and other weak memory models) * Silence TSAN errors on ustime and mstime. Every CPU we support is atomic on aligned ints, but correctness matters * Disable async commands by default * Fix TSAN warnings on the repl backlog * Merge OSS back into pro * Fix unmerged files * Fix O(n^2) algorithm in the GC cleanup logic * Fix crash in expire when a snapshot is in flight. Caused by a perf optimization getting the expire map out of sync with the val * On Alpine we must have a reasonable stack size * Revert ci.yml to unstable branch version * Implements the soft shutdown feature to allow clients to cooperatively disconnect preventing disruption during shutdown * Ensure clean shutdown with multiple threads * update dockerfiles * update deb pkg references and changelog * update gem reference * lpGetInteger returns int64_t, avoid overflow (#10068) Fix #9410 Crucial for the ms and sequence deltas, but I changed all calls, just in case (e.g. "flags") Before this commit: `ms_delta` and `seq_delta` could have overflown, causing `currid` to be wrong, which in turn would cause `streamTrim` to trim the entire rax node (see new test) * Fix issue #454 (BSD build break) * Do not allow commands to run in background when in eval, Issue #452 * Fix certificate leak during connection when tls-allowlists are used * Fix issue #480 * Fix crash running INFO command while a disk based backlog is set * check tracking per db * fix warnings * Fix a race when undoConnectWithMaster changes mi->repl_transfer_s but the connection is not yet closed and the event handler runs * Fix a race in processChanges/trackChanges with rdbLoadRio by acquiring the lock when trackChanges is set * Fix ASAN use after free * Additional fixes * Fix integer overflow of the track changes counter * Fix P99 latency issue for TLS where we leave work for the next event loop tlsProcessPendingData() needs to be called before we execute queued commands because it may enqueue more commands * Fix race removing key cache * Prevent crash on load in long running KeyDB instances * Fixes a crash where the server assertion failed when the key exists in DB during RDB load * Remove old assertion which is commented out. * avoid from instatiating EpochHolder multiple times to improve performance and cpu utilization * avoid from instatiating EpochHolder multiple times to improve performance and cpu utilization * src\redis-cli.c: fix potential null pointer dereference found by cppcheck src\redis-cli.c:5488:35: warning: Either the condition '!table' is redundant or there is possible null pointer dereference: table. [nullPointerRedundantCheck] * Fix Issue #486 * Workaround bug in snapshot sync - abort don't crash * Improve reliability of async parts of the soft shutdown tests * Improve reliability of fragmentation tests * Verify that partial syncs do indeed occur * Fix O(n) algorithm in INFO command * Remove incorrect assert that fires when the repl backlog is used fully * Make building flash optional * Remove unneeded gitlab CI file * [BUG] Moves key to another DB, the source key was removed if the move failed due to the key exists in the destination db #497 (#498) Co-authored-by: Paul Chen <mingchen@Mings-MacBook-Pro.local> * trigger repl_curr_off!= master_repl_offset assert failure when having pending write case * use debug for logging the message instead * rocksdb log using up the diskspace on flash (#519) * Fix OpenSSL 3.0.x related issues. (#10291) * Drop obsolete initialization calls. * Use decoder API for DH parameters. * Enable auto DH parameters if not explicitly used, which should be the preferred configuration going forward. * remove unnecessary forward declaration * remove internal ci stuff * remove more internal ci/publishing * submodule update step * use with syntax instead * bump ci ubuntu old ver as latest is now 22.04 * include submodules on all ci jobs * install all deps for all ci jobs Co-authored-by: Vivek Saini <vsaini@snapchat.com> Co-authored-by: Christian Legge <christian@eqalpha.com> Co-authored-by: benschermel <bschermel@snapchat.com> Co-authored-by: John Sully <john@csquare.ca> Co-authored-by: zliang <zliang@snapchat.com> Co-authored-by: malavan <malavan@eqalpha.com> Co-authored-by: John Sully <jsully@snapchat.com> Co-authored-by: jfinity <38383673+jfinity@users.noreply.github.com> Co-authored-by: benschermel <43507366+benschermel@users.noreply.github.com> Co-authored-by: guybe7 <guy.benoish@redislabs.com> Co-authored-by: Karthick Ariyaratnam (A) <k00809413@china.huawei.com> Co-authored-by: root <paul.chen1@huawei.com> Co-authored-by: Ilya Shipitsin <chipitsine@gmail.com> Co-authored-by: Paul Chen <32553156+paulmchen@users.noreply.github.com> Co-authored-by: Paul Chen <mingchen@Mings-MacBook-Pro.local> Co-authored-by: Yossi Gottlieb <yossigo@gmail.com>
2022-12-14 12:17:36 -05:00
ENABLE_FLASH?=no
Add support for sanitizers and fix issues they have found Former-commit-id: 58971a430dd3e4e8c39c7b5288211bc2ba7699ed
2019-07-18 18:39:42 -04:00
Fixed non-empty check in src/Makefile Per [GNU Make Manual](https://www.gnu.org/software/make/manual/html_node/Conditional-Syntax.html). To properly check for non-empty variable, one must strip whitespaces. Signed-off-by: Hanif Bin Ariffin <hanif.ariffin.4326@gmail.com> Former-commit-id: 05e0f323456b8e667d10dabfa804757a2fc81b04
2020-10-05 21:57:42 +08:00
ifneq ($(strip $(SANITIZE)),)
Fix memory leak in mvccRestore Former-commit-id: 92da1cbd0a08b66264f170a9b57ef7270f270157
2021-02-07 23:38:09 +00:00
CFLAGS+= -fsanitize=$(SANITIZE) -DSANITIZE -fno-omit-frame-pointer
CXXFLAGS+= -fsanitize=$(SANITIZE) -DSANITIZE -fno-omit-frame-pointer
Add support for sanitizers and fix issues they have found Former-commit-id: 58971a430dd3e4e8c39c7b5288211bc2ba7699ed
2019-07-18 18:39:42 -04:00
LDFLAGS+= -fsanitize=$(SANITIZE)
MALLOC=libc
USEASM=false
endif
Merge main with oss release sep29 2022 (#521) * need to include stdint for uintptr_t * need to include stdint for uintptr_t * use atomic_load for g_pserver->mstime * use atomic_load for g_pserver->mstime * Integrate readwritelock with Pro Code * Integrate readwritelock with Pro Code * Defensive asserts for RWLock * Defensive asserts for RWLock * Save and restore master info in rdb to allow active replica partial sync (#371) * save replid for all masters in rdb * expanded rdbSaveInfo to hold multiple master structs * parse repl-masters from rdb * recover replid info from rdb in active replica mode, attempt partial sync * save offset from rdb into correct variable * don't change replid based on master in active rep * save and load psync info from correct fields * Save and restore master info in rdb to allow active replica partial sync (#371) * save replid for all masters in rdb * expanded rdbSaveInfo to hold multiple master structs * parse repl-masters from rdb * recover replid info from rdb in active replica mode, attempt partial sync * save offset from rdb into correct variable * don't change replid based on master in active rep * save and load psync info from correct fields * placement new instead of memcpy * placement new instead of memcpy * Remove asserts, RW lock can go below zero in cases of aeAcquireLock * Remove asserts, RW lock can go below zero in cases of aeAcquireLock * Inclusive language * Inclusive language * update packaging for OS merge * update packaging for OS merge * modify dockerfile to build within image * modify dockerfile to build within image * Make active client balancing a configurable option * Make active client balancing a configurable option * With TLS throttle accepts if server is under heavy load - do not change non TLS behavior * With TLS throttle accepts if server is under heavy load - do not change non TLS behavior * Only run the tls-name-validation test if --tls is passed into runtest * Only run the tls-name-validation test if --tls is passed into runtest * Fix KeyDB not building with TLS < 1.1.1 * Fix KeyDB not building with TLS < 1.1.1 * update changelog to use replica as terminology * update changelog to use replica as terminology * update copyright * update copyright * update deb copyright * update deb copyright * call aeThreadOnline() earlier * call aeThreadOnline() earlier * Removed mergeReplicationId * Removed mergeReplicationId * acceptTLS is threadsafe like the non TLS version * acceptTLS is threadsafe like the non TLS version * setup Machamp ci * setup Machamp ci * make build_test.sh executable * make build_test.sh executable * PSYNC production fixes * PSYNC production fixes * fix the Machamp build * fix the Machamp build * break into tests into steps * break into tests into steps * Added multimaster test * Added multimaster test * Update ci.yml Change min tested version to 18.04 * Update ci.yml Change min tested version to 18.04 * fork lock for all threads, use fastlock for readwritelock * fork lock for all threads, use fastlock for readwritelock * hide forklock object in ae * hide forklock object in ae * only need to include readwritelock in ae * only need to include readwritelock in ae * time thread lock uses fastlock instead of std::mutex * time thread lock uses fastlock instead of std::mutex * set thread as offline when waiting for time thread lock * set thread as offline when waiting for time thread lock * update README resource links * update README resource links * Fix MALLOC=memkind build issues * Fix MALLOC=memkind build issues * Fix module test break * Fix module test break * Eliminate firewall dialogs on mac for regular and cluster tests. There are still issues with the sentinel tests but attempting to bind only to localhost causes failures * Eliminate firewall dialogs on mac for regular and cluster tests. There are still issues with the sentinel tests but attempting to bind only to localhost causes failures * remove unused var in networking.cpp * remove unused var in networking.cpp * check ziplist len to avoid crash on empty ziplist convert * check ziplist len to avoid crash on empty ziplist convert * remove nullptr subtraction * remove nullptr subtraction * cannot mod a pointer * cannot mod a pointer * need to include stdint for uintptr_t * need to include stdint for uintptr_t * use atomic_load for g_pserver->mstime * use atomic_load for g_pserver->mstime * Integrate readwritelock with Pro Code * Integrate readwritelock with Pro Code * Defensive asserts for RWLock * Defensive asserts for RWLock * Save and restore master info in rdb to allow active replica partial sync (#371) * save replid for all masters in rdb * expanded rdbSaveInfo to hold multiple master structs * parse repl-masters from rdb * recover replid info from rdb in active replica mode, attempt partial sync * save offset from rdb into correct variable * don't change replid based on master in active rep * save and load psync info from correct fields * Save and restore master info in rdb to allow active replica partial sync (#371) * save replid for all masters in rdb * expanded rdbSaveInfo to hold multiple master structs * parse repl-masters from rdb * recover replid info from rdb in active replica mode, attempt partial sync * save offset from rdb into correct variable * don't change replid based on master in active rep * save and load psync info from correct fields * placement new instead of memcpy * placement new instead of memcpy * Remove asserts, RW lock can go below zero in cases of aeAcquireLock * Remove asserts, RW lock can go below zero in cases of aeAcquireLock * Inclusive language * Inclusive language * call aeThreadOnline() earlier * call aeThreadOnline() earlier * Removed mergeReplicationId * Removed mergeReplicationId * Make active client balancing a configurable option * Make active client balancing a configurable option * With TLS throttle accepts if server is under heavy load - do not change non TLS behavior * With TLS throttle accepts if server is under heavy load - do not change non TLS behavior * acceptTLS is threadsafe like the non TLS version * acceptTLS is threadsafe like the non TLS version * PSYNC production fixes * PSYNC production fixes * Ensure we are responsive during storagecache clears * Ensure we are responsive during storagecache clears * Ensure recreated tables use the same settings as ones made at boot * Ensure recreated tables use the same settings as ones made at boot * Converted some existing PSYNC tests for multimaster * Converted some existing PSYNC tests for multimaster * Inclusive language fix * Inclusive language fix * Cleanup test suite * Cleanup test suite * Updated test replica configs so tests make sense * Updated test replica configs so tests make sense * active-rep test reliability * active-rep test reliability * Quick fix to make psync tests work * Quick fix to make psync tests work * Fix PSYNC test crashes * Fix PSYNC test crashes * Ensure we force moves not copies when ingesting bulk insert files * Ensure we force moves not copies when ingesting bulk insert files * Disable async for hget commands as it is not ready * Disable FLASH * Fix crash in save of masterinfo * Fix musl/Alpine build failures * Remove unnecessary libs * update readme * update readme * remove Enterprise references * Limit max overage to 20% during RDB save * Delete COPYING to replace with BSD license * update deb master changelog * Update license * Fix Readme typo from github org transition Replace mention of scratch-file-path with db-s3-object * Fix reference counting failure in the dict. This is caused by std::swap also swapping refcounts * Fix assertion in async rehash * Prevent crash on shutdown by avoiding dtors (they are unnecessary anyways) * Initialize noshrink, it was dangling * Prevent us from starting a rehash when one wasn't already in progress. This can cause severe issues for snapshots * Avoid unnecessary rehashing when a rehash is abandoned * Dictionary use correct acquire/release semantics * Add fence barriers for the repl backlog (important for AARCH64 and other weak memory models) * Silence TSAN errors on ustime and mstime. Every CPU we support is atomic on aligned ints, but correctness matters * Disable async commands by default * Fix TSAN warnings on the repl backlog * Merge OSS back into pro * Fix unmerged files * Fix O(n^2) algorithm in the GC cleanup logic * Fix crash in expire when a snapshot is in flight. Caused by a perf optimization getting the expire map out of sync with the val * On Alpine we must have a reasonable stack size * Revert ci.yml to unstable branch version * Implements the soft shutdown feature to allow clients to cooperatively disconnect preventing disruption during shutdown * Ensure clean shutdown with multiple threads * update dockerfiles * update deb pkg references and changelog * update gem reference * lpGetInteger returns int64_t, avoid overflow (#10068) Fix #9410 Crucial for the ms and sequence deltas, but I changed all calls, just in case (e.g. "flags") Before this commit: `ms_delta` and `seq_delta` could have overflown, causing `currid` to be wrong, which in turn would cause `streamTrim` to trim the entire rax node (see new test) * Fix issue #454 (BSD build break) * Do not allow commands to run in background when in eval, Issue #452 * Fix certificate leak during connection when tls-allowlists are used * Fix issue #480 * Fix crash running INFO command while a disk based backlog is set * check tracking per db * fix warnings * Fix a race when undoConnectWithMaster changes mi->repl_transfer_s but the connection is not yet closed and the event handler runs * Fix a race in processChanges/trackChanges with rdbLoadRio by acquiring the lock when trackChanges is set * Fix ASAN use after free * Additional fixes * Fix integer overflow of the track changes counter * Fix P99 latency issue for TLS where we leave work for the next event loop tlsProcessPendingData() needs to be called before we execute queued commands because it may enqueue more commands * Fix race removing key cache * Prevent crash on load in long running KeyDB instances * Fixes a crash where the server assertion failed when the key exists in DB during RDB load * Remove old assertion which is commented out. * avoid from instatiating EpochHolder multiple times to improve performance and cpu utilization * avoid from instatiating EpochHolder multiple times to improve performance and cpu utilization * src\redis-cli.c: fix potential null pointer dereference found by cppcheck src\redis-cli.c:5488:35: warning: Either the condition '!table' is redundant or there is possible null pointer dereference: table. [nullPointerRedundantCheck] * Fix Issue #486 * Workaround bug in snapshot sync - abort don't crash * Improve reliability of async parts of the soft shutdown tests * Improve reliability of fragmentation tests * Verify that partial syncs do indeed occur * Fix O(n) algorithm in INFO command * Remove incorrect assert that fires when the repl backlog is used fully * Make building flash optional * Remove unneeded gitlab CI file * [BUG] Moves key to another DB, the source key was removed if the move failed due to the key exists in the destination db #497 (#498) Co-authored-by: Paul Chen <mingchen@Mings-MacBook-Pro.local> * trigger repl_curr_off!= master_repl_offset assert failure when having pending write case * use debug for logging the message instead * rocksdb log using up the diskspace on flash (#519) * Fix OpenSSL 3.0.x related issues. (#10291) * Drop obsolete initialization calls. * Use decoder API for DH parameters. * Enable auto DH parameters if not explicitly used, which should be the preferred configuration going forward. * remove unnecessary forward declaration * remove internal ci stuff * remove more internal ci/publishing * submodule update step * use with syntax instead * bump ci ubuntu old ver as latest is now 22.04 * include submodules on all ci jobs * install all deps for all ci jobs Co-authored-by: Vivek Saini <vsaini@snapchat.com> Co-authored-by: Christian Legge <christian@eqalpha.com> Co-authored-by: benschermel <bschermel@snapchat.com> Co-authored-by: John Sully <john@csquare.ca> Co-authored-by: zliang <zliang@snapchat.com> Co-authored-by: malavan <malavan@eqalpha.com> Co-authored-by: John Sully <jsully@snapchat.com> Co-authored-by: jfinity <38383673+jfinity@users.noreply.github.com> Co-authored-by: benschermel <43507366+benschermel@users.noreply.github.com> Co-authored-by: guybe7 <guy.benoish@redislabs.com> Co-authored-by: Karthick Ariyaratnam (A) <k00809413@china.huawei.com> Co-authored-by: root <paul.chen1@huawei.com> Co-authored-by: Ilya Shipitsin <chipitsine@gmail.com> Co-authored-by: Paul Chen <32553156+paulmchen@users.noreply.github.com> Co-authored-by: Paul Chen <mingchen@Mings-MacBook-Pro.local> Co-authored-by: Yossi Gottlieb <yossigo@gmail.com>
2022-12-14 12:17:36 -05:00
ifeq ($(ENABLE_FLASH),yes)
FINAL_LIBS+= -lz -lcrypto -lbz2 -lzstd -llz4 -lsnappy
CXXFLAGS+= -I../deps/rocksdb/include/ -DENABLE_ROCKSDB
STORAGE_OBJ+= storage/rocksdb.o storage/rocksdbfactory.o
FINAL_LIBS+= ../deps/rocksdb/librocksdb.a
DEPENDENCY_TARGETS+= rocksdb
endif
Add checked build support to makefile Former-commit-id: 7e27c371679d780137a5d39b03b9472651ddf686
2021-03-14 03:18:24 +00:00
ifeq ($(CHECKED),true)
CXXFLAGS+= -DCHECKED_BUILD
endif
Add license key lib for aarch64 Former-commit-id: 8b804d91e3dc810b6d8cc585dd3747ba962ead18
2020-01-06 19:16:48 +00:00
ARM build fix: Don't use X64 asm here Former-commit-id: b775ebb382240876234e179b73866c7d63a209d6
2019-03-20 04:14:33 +00:00
# Do we use our assembly spinlock? X64 only
Rewrite our spinlock in assembly, pretty big performance improvement Former-commit-id: 40d7a701feefd36e9e3fdb6d516228c4a70fcf3d
2019-02-25 18:21:27 -05:00
ifeq ($(uname_S),Linux)
ARM build fix: Don't use X64 asm here Former-commit-id: b775ebb382240876234e179b73866c7d63a209d6
2019-03-20 04:14:33 +00:00
ifeq ($(uname_M),x86_64)
fixed 32bit compatibility in Makefile Former-commit-id: f5ee64f9aaeb3f3773de2435191bcff0855154e4
2021-08-12 19:21:30 +00:00
ifneq ($(TARGET32), true)
Option to disable ASM spinlock Former-commit-id: 01ff36fc289449d6e0bf20731de079b6957bfac8
2019-02-26 00:00:04 -05:00
ifeq ($(USEASM),true)
Rewrite our spinlock in assembly, pretty big performance improvement Former-commit-id: 40d7a701feefd36e9e3fdb6d516228c4a70fcf3d
2019-02-25 18:21:27 -05:00
ASM_OBJ+= fastlock_x64.o
CFLAGS+= -DASM_SPINLOCK
CXXFLAGS+= -DASM_SPINLOCK
endif
endif
Option to disable ASM spinlock Former-commit-id: 01ff36fc289449d6e0bf20731de079b6957bfac8
2019-02-26 00:00:04 -05:00
endif
ARM build fix: Don't use X64 asm here Former-commit-id: b775ebb382240876234e179b73866c7d63a209d6
2019-03-20 04:14:33 +00:00
endif
Rewrite our spinlock in assembly, pretty big performance improvement Former-commit-id: 40d7a701feefd36e9e3fdb6d516228c4a70fcf3d
2019-02-25 18:21:27 -05:00
Makefile ignores env CXXFLAGS Former-commit-id: 0ab29f7394be270f958c01cc66d26da14eb32f2c
2019-03-19 19:29:14 -04:00
ifeq ($(COMPILER_NAME),clang)
CXXFLAGS+= -stdlib=libc++
endif
changed redis_flags names to keydb in makefile Former-commit-id: 07273936271536e4a57efdb7a31bc34e5b8d50f1
2021-06-14 16:09:42 +00:00
# To get ARM stack traces if KeyDB crashes we need a special C flag.
Fixed stack trace generation on aarch64 Change-Id: I9801239c98cb7362ed07e8b9ec2ba7e45749dba7 Signed-off-by: Jun He <jun.he@arm.com>
2017-07-03 07:18:32 +00:00
ifneq (,$(filter aarch64 armv,$(uname_M)))
ARM: Fix stack trace generation on crash.
2017-06-26 10:36:12 +02:00
CFLAGS+=-funwind-tables
Enusre CXXFLAGS has the same settings as CFLAGS Former-commit-id: cda8d42a7656138e15788f262663a67ca4d8bc49
2019-12-17 17:49:51 -05:00
CXXFLAGS+=-funwind-tables
Fix again stack generation on the Raspberry Pi. The fix was removed by c8ca71d40 attempting to fix the stack generation on ARM64, without testing if it would still work on ARM32. Now it should work both sides.
2018-10-19 10:39:57 +02:00
else
ifneq (,$(findstring armv,$(uname_M)))
CFLAGS+=-funwind-tables
Enusre CXXFLAGS has the same settings as CFLAGS Former-commit-id: cda8d42a7656138e15788f262663a67ca4d8bc49
2019-12-17 17:49:51 -05:00
CXXFLAGS+=-funwind-tables
Fix again stack generation on the Raspberry Pi. The fix was removed by c8ca71d40 attempting to fix the stack generation on ARM64, without testing if it would still work on ARM32. Now it should work both sides.
2018-10-19 10:39:57 +02:00
endif
ARM: Fix stack trace generation on crash.
2017-06-26 10:36:12 +02:00
endif
Rebuild source when allocator changes To do so, the Makefile stores the contents of the MALLOC environment variable in a file named .make-malloc. When the contents of this file and the MALLOC variable are not equal, it forces a rebuild of the Redis source tree. A side-effect of this change is that choosing an allocator can now be done using the single MALLOC variable instead of USE_TCMALLOC, USE_JEMALLOC and so forth. These variables continue to work for backwards compatibility.
2011-11-15 13:09:31 -08:00
# Backwards compatibility for selecting an allocator
support for compiling with tcmalloc
2010-10-22 00:06:44 +02:00
ifeq ($(USE_TCMALLOC),yes)
Spaces to tabs
2013-03-16 18:35:20 +11:00
MALLOC=tcmalloc
Rebuild source when allocator changes To do so, the Makefile stores the contents of the MALLOC environment variable in a file named .make-malloc. When the contents of this file and the MALLOC variable are not equal, it forces a rebuild of the Redis source tree. A side-effect of this change is that choosing an allocator can now be done using the single MALLOC variable instead of USE_TCMALLOC, USE_JEMALLOC and so forth. These variables continue to work for backwards compatibility.
2011-11-15 13:09:31 -08:00
endif
ifeq ($(USE_TCMALLOC_MINIMAL),yes)
Spaces to tabs
2013-03-16 18:35:20 +11:00
MALLOC=tcmalloc_minimal
Rebuild source when allocator changes To do so, the Makefile stores the contents of the MALLOC environment variable in a file named .make-malloc. When the contents of this file and the MALLOC variable are not equal, it forces a rebuild of the Redis source tree. A side-effect of this change is that choosing an allocator can now be done using the single MALLOC variable instead of USE_TCMALLOC, USE_JEMALLOC and so forth. These variables continue to work for backwards compatibility.
2011-11-15 13:09:31 -08:00
endif
ifeq ($(USE_JEMALLOC),yes)
Spaces to tabs
2013-03-16 18:35:20 +11:00
MALLOC=jemalloc
Rebuild source when allocator changes To do so, the Makefile stores the contents of the MALLOC environment variable in a file named .make-malloc. When the contents of this file and the MALLOC variable are not equal, it forces a rebuild of the Redis source tree. A side-effect of this change is that choosing an allocator can now be done using the single MALLOC variable instead of USE_TCMALLOC, USE_JEMALLOC and so forth. These variables continue to work for backwards compatibility.
2011-11-15 13:09:31 -08:00
endif
Allow forcing non-jemalloc build
2014-11-13 15:12:08 -05:00
ifeq ($(USE_JEMALLOC),no)
MALLOC=libc
endif
Add option to build pro without license checks Former-commit-id: 0713518d2f34559a06db31a9023228b91ce60af3
2020-03-01 22:16:25 -05:00
ifeq ($(NO_LICENSE_CHECK),yes)
CXXFLAGS+=-DNO_LICENSE_CHECK=1
endif
Persist `make` settings and trigger rebuild if anything changes
2012-04-13 17:50:38 -07:00
# Override default settings if possible
-include .make-settings
Fix mac build breaks and remove license checks (won't work on mac)
2022-03-07 14:50:31 -05:00
DEBUG=-g -ggdb
added REDIS_CFLAGS to makefile for backwards compatibility Former-commit-id: b2fb4f4b9bba28f45828ead5670fc206a4c2a2f6
2021-07-14 21:51:44 +00:00
FINAL_CFLAGS=$(STD) $(WARN) $(OPT) $(DEBUG) $(CFLAGS) $(KEYDB_CFLAGS) $(REDIS_CFLAGS)
FINAL_CXXFLAGS=$(CXX_STD) $(WARN) $(OPT) $(DEBUG) $(CXXFLAGS) $(KEYDB_CFLAGS) $(REDIS_CFLAGS)
changed redis_flags names to keydb in makefile Former-commit-id: 07273936271536e4a57efdb7a31bc34e5b8d50f1
2021-06-14 16:09:42 +00:00
FINAL_LDFLAGS=$(LDFLAGS) $(KEYDB_LDFLAGS) $(DEBUG)
Fix mac build breaks and remove license checks (won't work on mac)
2022-03-07 14:50:31 -05:00
FINAL_LIBS+=-lm -lz -lcrypto -lbz2 -lzstd -llz4 -lsnappy
Slightly refactor CFLAGS/LDFLAGS/LIBS This way, we can avoid -rdynamic and -pthread warnings on darwin.
2013-03-16 18:33:42 +11:00
MacOS Build Break Fix Former-commit-id: d6738ffa5df6dd4d6cdf9f717d30f163d3dc0129
2020-04-22 01:21:35 -04:00
ifneq ($(uname_S),Darwin)
FINAL_LIBS+=-latomic
Fix Pi build needing -latomic. Issue #6275.
2019-11-29 17:35:59 +01:00
endif
Remove redundant -latomic on arm64. (#8867) (cherry picked from commit ebfbb091096b6f36cf82e9f6e6583b10fd5b5acb)
2021-04-26 18:43:57 +03:00
# Linux ARM32 needs -latomic at linking time
Fix Pi build needing -latomic. Issue #6275.
2019-11-29 17:35:59 +01:00
ifneq (,$(findstring armv,$(uname_M)))
add backtrace for alpine using libunwind Former-commit-id: c583ffff412b9df705b7c96e68e3908b645c7d43
2021-07-19 17:20:52 +00:00
FINAL_LIBS+=-latomic
Fix Pi build needing -latomic. Issue #6275.
2019-11-29 17:35:59 +01:00
endif
MacOS Build Break Fix Former-commit-id: d6738ffa5df6dd4d6cdf9f717d30f163d3dc0129
2020-04-22 01:21:35 -04:00
First set defaults, then do composition
2012-04-13 17:43:06 -07:00
ifeq ($(uname_S),SunOS)
Makefile: remove odd syntax not compatible with some make versions. See issue #1448.
2013-12-12 15:19:08 +01:00
# SunOS
Several (mostly Solaris-related) cleanups (#8171) * Allow runtest-moduleapi use a different 'make', for systems where GNU Make is 'gmake'. * Fix issue with builds on Solaris re-building everything from scratch due to CFLAGS/LDFLAGS not stored. * Fix compile failure on Solaris due to atomicvar and a bunch of warnings. * Fix garbled log timestamps on Solaris.
2020-12-13 17:09:54 +02:00
ifeq ($(findstring -m32,$(FINAL_CFLAGS)),)
CFLAGS+=-m64
Enusre CXXFLAGS has the same settings as CFLAGS Former-commit-id: cda8d42a7656138e15788f262663a67ca4d8bc49
2019-12-17 17:49:51 -05:00
CXXFLAGS+= -m64
Several (mostly Solaris-related) cleanups (#8171) * Allow runtest-moduleapi use a different 'make', for systems where GNU Make is 'gmake'. * Fix issue with builds on Solaris re-building everything from scratch due to CFLAGS/LDFLAGS not stored. * Fix compile failure on Solaris due to atomicvar and a bunch of warnings. * Fix garbled log timestamps on Solaris.
2020-12-13 17:09:54 +02:00
endif
ifeq ($(findstring -m32,$(FINAL_LDFLAGS)),)
LDFLAGS+=-m64
Makefile: fix building with Solaris C compiler, 64 bit.
2017-02-24 00:00:13 +08:00
endif
DEBUG=-g
DEBUG_FLAGS=-g
Enusre CXXFLAGS has the same settings as CFLAGS Former-commit-id: cda8d42a7656138e15788f262663a67ca4d8bc49
2019-12-17 17:49:51 -05:00
export CFLAGS CXXFLAGS LDFLAGS DEBUG DEBUG_FLAGS
use `install` as default installer (except on SunOS)
2013-03-20 22:05:59 +11:00
INSTALL=cp -pf
Slightly refactor CFLAGS/LDFLAGS/LIBS This way, we can avoid -rdynamic and -pthread warnings on darwin.
2013-03-16 18:33:42 +11:00
FINAL_CFLAGS+= -D__EXTENSIONS__ -D_XPG6
Enusre CXXFLAGS has the same settings as CFLAGS Former-commit-id: cda8d42a7656138e15788f262663a67ca4d8bc49
2019-12-17 17:49:51 -05:00
FINAL_CXXFLAGS+= -D__EXTENSIONS__ -D_XPG6
Add "-lrt" in Makefile for Solaris. This fix is from @NanXiao, however I was not able to retain authorship because the Pull Request original repository was removed.
2015-01-09 11:53:47 +01:00
FINAL_LIBS+= -ldl -lnsl -lsocket -lresolv -lpthread -lrt
First set defaults, then do composition
2012-04-13 17:43:06 -07:00
else
Makefile: remove odd syntax not compatible with some make versions. See issue #1448.
2013-12-12 15:19:08 +01:00
ifeq ($(uname_S),Darwin)
BSDs don't have -ldl
2016-06-14 13:46:42 +00:00
# Darwin
FINAL_LIBS+= -ldl
Fix TLS build on macOS arm64 systems (#8197) Homebrew for darwin-arm64 uses /opt/homebrew instead of /usr/local as the prefix, so that it can coexist with darwin-x86_64 using Rosetta 2.
2020-12-23 08:46:23 +01:00
# Homebrew's OpenSSL is not linked to /usr/local to avoid
# conflicts with the system's LibreSSL installation so it
# must be referenced explicitly during build.
ifeq ($(uname_M),arm64)
# Homebrew arm64 uses /opt/homebrew as HOMEBREW_PREFIX
Allow to override OPENSSL_PREFIX (#9567) While the original issue was on Linux, this should work for other platforms as well.
2021-09-30 07:51:19 -05:00
OPENSSL_PREFIX?=/opt/homebrew/opt/openssl
Fix TLS build on macOS arm64 systems (#8197) Homebrew for darwin-arm64 uses /opt/homebrew instead of /usr/local as the prefix, so that it can coexist with darwin-x86_64 using Rosetta 2.
2020-12-23 08:46:23 +01:00
else
# Homebrew x86/ppc uses /usr/local as HOMEBREW_PREFIX
Allow to override OPENSSL_PREFIX (#9567) While the original issue was on Linux, this should work for other platforms as well.
2021-09-30 07:51:19 -05:00
OPENSSL_PREFIX?=/usr/local/opt/openssl
Fix TLS build on macOS arm64 systems (#8197) Homebrew for darwin-arm64 uses /opt/homebrew instead of /usr/local as the prefix, so that it can coexist with darwin-x86_64 using Rosetta 2.
2020-12-23 08:46:23 +01:00
endif
Add support for compiling on AIX Closes #1900
2014-07-29 16:39:37 -05:00
else
ifeq ($(uname_S),AIX)
# AIX
FINAL_LDFLAGS+= -Wl,-bexpall
BSDs don't have -ldl
2016-06-14 13:46:42 +00:00
FINAL_LIBS+=-ldl -pthread -lcrypt -lbsd
else
ifeq ($(uname_S),OpenBSD)
# OpenBSD
FINAL_LIBS+= -lpthread
OpenBSD support. Special treatment here as backtrace support is optional, cannot be found via pkg-config and similar neither.
2018-11-25 08:10:26 +00:00
ifeq ($(USE_BACKTRACE),yes)
FINAL_CFLAGS+= -DUSE_BACKTRACE -I/usr/local/include
Enusre CXXFLAGS has the same settings as CFLAGS Former-commit-id: cda8d42a7656138e15788f262663a67ca4d8bc49
2019-12-17 17:49:51 -05:00
FINAL_CXXFLAGS+= -DUSE_BACKTRACE -I/usr/local/include
OpenBSD support. Special treatment here as backtrace support is optional, cannot be found via pkg-config and similar neither.
2018-11-25 08:10:26 +00:00
FINAL_LDFLAGS+= -L/usr/local/lib
FINAL_LIBS+= -lexecinfo
add backtrace for alpine using libunwind Former-commit-id: c583ffff412b9df705b7c96e68e3908b645c7d43
2021-07-19 17:20:52 +00:00
endif
OpenBSD support. Special treatment here as backtrace support is optional, cannot be found via pkg-config and similar neither.
2018-11-25 08:10:26 +00:00
BSDs don't have -ldl
2016-06-14 13:46:42 +00:00
else
Further NetBSD update and build fixes. (#7831) mainly backtrace and register dump support. (cherry picked from commit c3edaa79413bdf908abb56f088217c01f347ecff)
2020-09-23 08:00:31 +01:00
ifeq ($(uname_S),NetBSD)
# NetBSD
FINAL_LIBS+= -lpthread
ifeq ($(USE_BACKTRACE),yes)
FINAL_CFLAGS+= -DUSE_BACKTRACE -I/usr/pkg/include
FINAL_LDFLAGS+= -L/usr/pkg/lib
FINAL_LIBS+= -lexecinfo
add backtrace for alpine using libunwind Former-commit-id: c583ffff412b9df705b7c96e68e3908b645c7d43
2021-07-19 17:20:52 +00:00
endif
Further NetBSD update and build fixes. (#7831) mainly backtrace and register dump support. (cherry picked from commit c3edaa79413bdf908abb56f088217c01f347ecff)
2020-09-23 08:00:31 +01:00
else
BSDs don't have -ldl
2016-06-14 13:46:42 +00:00
ifeq ($(uname_S),FreeBSD)
# FreeBSD
Backtrace/register dump on BSD. FreeBSD/DragonFlyBSD does have backtrace only it does not belong to libc.
2018-11-24 15:49:45 +00:00
FINAL_LIBS+= -lpthread -lexecinfo
DragonFlyBSD little build fix
2018-11-11 18:49:55 +00:00
else
ifeq ($(uname_S),DragonFly)
Further NetBSD update and build fixes. (#7831) mainly backtrace and register dump support. (cherry picked from commit c3edaa79413bdf908abb56f088217c01f347ecff)
2020-09-23 08:00:31 +01:00
# DragonFly
Backtrace/register dump on BSD. FreeBSD/DragonFlyBSD does have backtrace only it does not belong to libc.
2018-11-24 15:49:45 +00:00
FINAL_LIBS+= -lpthread -lexecinfo
NetBSD build update. This platform supports CPU affinity (but not OpenBSD).
2020-05-12 21:19:12 +01:00
else
ifeq ($(uname_S),OpenBSD)
# OpenBSD
FINAL_LIBS+= -lpthread -lexecinfo
else
ifeq ($(uname_S),NetBSD)
# NetBSD
FINAL_LIBS+= -lpthread -lexecinfo
Add support for Haiku OS (#7435) (cherry picked from commit f971a5d8ed58547f01325611c0189745a904c9cc)
2020-09-29 13:52:13 +01:00
else
ifeq ($(uname_S),Haiku)
# Haiku
FINAL_CFLAGS+= -DBSD_SOURCE
FINAL_LDFLAGS+= -lbsd -lnetwork
FINAL_LIBS+= -lpthread
Makefile: remove odd syntax not compatible with some make versions. See issue #1448.
2013-12-12 15:19:08 +01:00
else
# All the other OSes (notably Linux)
Slightly refactor CFLAGS/LDFLAGS/LIBS This way, we can avoid -rdynamic and -pthread warnings on darwin.
2013-03-16 18:33:42 +11:00
FINAL_LDFLAGS+= -rdynamic
OS X build fixes Former-commit-id: 1dff223c713cba0b336f34328d223ddd675a3781
2019-03-24 18:06:57 -04:00
FINAL_LIBS+=-ldl -pthread -lrt -luuid
Add ability to compile KeyDB without MOTD and curl Former-commit-id: f3794d2c420423ca7dcc51688c478f8ada290786
2020-11-13 20:51:30 +00:00
ifneq ($(NO_MOTD),yes)
Fix mac build breaks Former-commit-id: 16a89f21dc0beb23b7eb8f2e378d076da918c0d6
2019-06-27 15:04:09 -04:00
FINAL_CFLAGS += -DMOTD
Enusre CXXFLAGS has the same settings as CFLAGS Former-commit-id: cda8d42a7656138e15788f262663a67ca4d8bc49
2019-12-17 17:49:51 -05:00
FINAL_CXXFLAGS += -DMOTD
Add ability to compile KeyDB without MOTD and curl Former-commit-id: f3794d2c420423ca7dcc51688c478f8ada290786
2020-11-13 20:51:30 +00:00
FINAL_LIBS+=-lcurl
endif
BSDs don't have -ldl
2016-06-14 13:46:42 +00:00
endif
endif
First set defaults, then do composition
2012-04-13 17:43:06 -07:00
endif
Makefile: remove odd syntax not compatible with some make versions. See issue #1448.
2013-12-12 15:19:08 +01:00
endif
Add support for compiling on AIX Closes #1900
2014-07-29 16:39:37 -05:00
endif
DragonFlyBSD little build fix
2018-11-11 18:49:55 +00:00
endif
NetBSD build update. This platform supports CPU affinity (but not OpenBSD).
2020-05-12 21:19:12 +01:00
endif
endif
Further NetBSD update and build fixes. (#7831) mainly backtrace and register dump support. (cherry picked from commit c3edaa79413bdf908abb56f088217c01f347ecff)
2020-09-23 08:00:31 +01:00
endif
Add support for Haiku OS (#7435) (cherry picked from commit f971a5d8ed58547f01325611c0189745a904c9cc)
2020-09-29 13:52:13 +01:00
endif
Allow to override OPENSSL_PREFIX (#9567) While the original issue was on Linux, this should work for other platforms as well.
2021-09-30 07:51:19 -05:00
ifdef OPENSSL_PREFIX
OPENSSL_CFLAGS=-I$(OPENSSL_PREFIX)/include
Fix mac build breaks and remove license checks (won't work on mac)
2022-03-07 14:50:31 -05:00
OPENSSL_CXXFLAGS=-I$(OPENSSL_PREFIX)/include
Allow to override OPENSSL_PREFIX (#9567) While the original issue was on Linux, this should work for other platforms as well.
2021-09-30 07:51:19 -05:00
OPENSSL_LDFLAGS=-L$(OPENSSL_PREFIX)/lib
# Also export OPENSSL_PREFIX so it ends up in deps sub-Makefiles
export OPENSSL_PREFIX
endif
First set defaults, then do composition
2012-04-13 17:43:06 -07:00
# Include paths to dependencies
Fix mac build breaks and remove license checks (won't work on mac)
2022-03-07 14:50:31 -05:00
FINAL_CFLAGS+= -I../deps/hiredis -I../deps/linenoise -I../deps/lua/src -I../deps/hdr_histogram
FINAL_CXXFLAGS+= -I../deps/hiredis -I../deps/linenoise -I../deps/lua/src -I../deps/hdr_histogram -I../deps/rocksdb/include/ -I../deps/concurrentqueue
First set defaults, then do composition
2012-04-13 17:43:06 -07:00
Auto-detect and link libsystemd at compile-time This adds Makefile/build-system support for USE_SYSTEMD=(yes|no|*). This variable's value determines whether or not libsystemd will be linked at build-time. If USE_SYSTEMD is set to "yes", make will use PKG_CONFIG to check for libsystemd's presence, and fail the build early if it isn't installed/detected properly. If USE_SYSTEM is set to "no", libsystemd will *not* be linked, even if support for it is available on the system redis is being built on. For any other value that USE_SYSTEM might assume (e.g. "auto"), PKG_CONFIG will try to determine libsystemd's presence, and set up the build process to link against it, if it was indicated as being installed/available. This approach has a number of repercussions of its own, most importantly the following: If you build redis on a system that actually has systemd support, but no libsystemd-dev package(s) installed, you'll end up *without* support for systemd notification/status reporting support in redis-server. This changes established runtime behaviour. I'm not sure if the build system and/or the server binary should indicate this. I'm also wondering if not actually having systemd-notify-support, but requesting it via the server's config, should result in a fatal error now.
2019-05-30 18:44:17 +02:00
# Determine systemd support and/or build preference (defaulting to auto-detection)
BUILD_WITH_SYSTEMD=no
Clean up building with USE_SYSTEMD. (#8073) When USE_SYSTEMD=yes is specified, try to use pkg-config to determine libsystemd linker flags. If not found, silently fall back to simply using "-lsystemd". We now use a LIBSYSTEMD_LIBS variable so users can explicitly override it and specify their own library. If USE_SYSTEMD is unspecified the old behavior of auto-enabling it if both pkg-config and libsystemd are available is retained.
2020-11-22 14:40:38 +02:00
LIBSYSTEMD_LIBS=-lsystemd
Auto-detect and link libsystemd at compile-time This adds Makefile/build-system support for USE_SYSTEMD=(yes|no|*). This variable's value determines whether or not libsystemd will be linked at build-time. If USE_SYSTEMD is set to "yes", make will use PKG_CONFIG to check for libsystemd's presence, and fail the build early if it isn't installed/detected properly. If USE_SYSTEM is set to "no", libsystemd will *not* be linked, even if support for it is available on the system redis is being built on. For any other value that USE_SYSTEM might assume (e.g. "auto"), PKG_CONFIG will try to determine libsystemd's presence, and set up the build process to link against it, if it was indicated as being installed/available. This approach has a number of repercussions of its own, most importantly the following: If you build redis on a system that actually has systemd support, but no libsystemd-dev package(s) installed, you'll end up *without* support for systemd notification/status reporting support in redis-server. This changes established runtime behaviour. I'm not sure if the build system and/or the server binary should indicate this. I'm also wondering if not actually having systemd-notify-support, but requesting it via the server's config, should result in a fatal error now.
2019-05-30 18:44:17 +02:00
# If 'USE_SYSTEMD' in the environment is neither "no" nor "yes", try to
# auto-detect libsystemd's presence and link accordingly.
ifneq ($(USE_SYSTEMD),no)
LIBSYSTEMD_PKGCONFIG := $(shell $(PKG_CONFIG) --exists libsystemd && echo $$?)
# If libsystemd cannot be detected, continue building without support for it
# (unless a later check tells us otherwise)
ifeq ($(LIBSYSTEMD_PKGCONFIG),0)
BUILD_WITH_SYSTEMD=yes
Clean up building with USE_SYSTEMD. (#8073) When USE_SYSTEMD=yes is specified, try to use pkg-config to determine libsystemd linker flags. If not found, silently fall back to simply using "-lsystemd". We now use a LIBSYSTEMD_LIBS variable so users can explicitly override it and specify their own library. If USE_SYSTEMD is unspecified the old behavior of auto-enabling it if both pkg-config and libsystemd are available is retained.
2020-11-22 14:40:38 +02:00
LIBSYSTEMD_LIBS=$(shell $(PKG_CONFIG) --libs libsystemd)
Auto-detect and link libsystemd at compile-time This adds Makefile/build-system support for USE_SYSTEMD=(yes|no|*). This variable's value determines whether or not libsystemd will be linked at build-time. If USE_SYSTEMD is set to "yes", make will use PKG_CONFIG to check for libsystemd's presence, and fail the build early if it isn't installed/detected properly. If USE_SYSTEM is set to "no", libsystemd will *not* be linked, even if support for it is available on the system redis is being built on. For any other value that USE_SYSTEM might assume (e.g. "auto"), PKG_CONFIG will try to determine libsystemd's presence, and set up the build process to link against it, if it was indicated as being installed/available. This approach has a number of repercussions of its own, most importantly the following: If you build redis on a system that actually has systemd support, but no libsystemd-dev package(s) installed, you'll end up *without* support for systemd notification/status reporting support in redis-server. This changes established runtime behaviour. I'm not sure if the build system and/or the server binary should indicate this. I'm also wondering if not actually having systemd-notify-support, but requesting it via the server's config, should result in a fatal error now.
2019-05-30 18:44:17 +02:00
endif
endif
Clean up building with USE_SYSTEMD. (#8073) When USE_SYSTEMD=yes is specified, try to use pkg-config to determine libsystemd linker flags. If not found, silently fall back to simply using "-lsystemd". We now use a LIBSYSTEMD_LIBS variable so users can explicitly override it and specify their own library. If USE_SYSTEMD is unspecified the old behavior of auto-enabling it if both pkg-config and libsystemd are available is retained.
2020-11-22 14:40:38 +02:00
# If 'USE_SYSTEMD' is set to "yes" use pkg-config if available or fall back to
# default -lsystemd.
Auto-detect and link libsystemd at compile-time This adds Makefile/build-system support for USE_SYSTEMD=(yes|no|*). This variable's value determines whether or not libsystemd will be linked at build-time. If USE_SYSTEMD is set to "yes", make will use PKG_CONFIG to check for libsystemd's presence, and fail the build early if it isn't installed/detected properly. If USE_SYSTEM is set to "no", libsystemd will *not* be linked, even if support for it is available on the system redis is being built on. For any other value that USE_SYSTEM might assume (e.g. "auto"), PKG_CONFIG will try to determine libsystemd's presence, and set up the build process to link against it, if it was indicated as being installed/available. This approach has a number of repercussions of its own, most importantly the following: If you build redis on a system that actually has systemd support, but no libsystemd-dev package(s) installed, you'll end up *without* support for systemd notification/status reporting support in redis-server. This changes established runtime behaviour. I'm not sure if the build system and/or the server binary should indicate this. I'm also wondering if not actually having systemd-notify-support, but requesting it via the server's config, should result in a fatal error now.
2019-05-30 18:44:17 +02:00
ifeq ($(USE_SYSTEMD),yes)
BUILD_WITH_SYSTEMD=yes
endif
Clean up building with USE_SYSTEMD. (#8073) When USE_SYSTEMD=yes is specified, try to use pkg-config to determine libsystemd linker flags. If not found, silently fall back to simply using "-lsystemd". We now use a LIBSYSTEMD_LIBS variable so users can explicitly override it and specify their own library. If USE_SYSTEMD is unspecified the old behavior of auto-enabling it if both pkg-config and libsystemd are available is retained.
2020-11-22 14:40:38 +02:00
Auto-detect and link libsystemd at compile-time This adds Makefile/build-system support for USE_SYSTEMD=(yes|no|*). This variable's value determines whether or not libsystemd will be linked at build-time. If USE_SYSTEMD is set to "yes", make will use PKG_CONFIG to check for libsystemd's presence, and fail the build early if it isn't installed/detected properly. If USE_SYSTEM is set to "no", libsystemd will *not* be linked, even if support for it is available on the system redis is being built on. For any other value that USE_SYSTEM might assume (e.g. "auto"), PKG_CONFIG will try to determine libsystemd's presence, and set up the build process to link against it, if it was indicated as being installed/available. This approach has a number of repercussions of its own, most importantly the following: If you build redis on a system that actually has systemd support, but no libsystemd-dev package(s) installed, you'll end up *without* support for systemd notification/status reporting support in redis-server. This changes established runtime behaviour. I'm not sure if the build system and/or the server binary should indicate this. I'm also wondering if not actually having systemd-notify-support, but requesting it via the server's config, should result in a fatal error now.
2019-05-30 18:44:17 +02:00
ifeq ($(BUILD_WITH_SYSTEMD),yes)
Clean up building with USE_SYSTEMD. (#8073) When USE_SYSTEMD=yes is specified, try to use pkg-config to determine libsystemd linker flags. If not found, silently fall back to simply using "-lsystemd". We now use a LIBSYSTEMD_LIBS variable so users can explicitly override it and specify their own library. If USE_SYSTEMD is unspecified the old behavior of auto-enabling it if both pkg-config and libsystemd are available is retained.
2020-11-22 14:40:38 +02:00
FINAL_LIBS+=$(LIBSYSTEMD_LIBS)
Auto-detect and link libsystemd at compile-time This adds Makefile/build-system support for USE_SYSTEMD=(yes|no|*). This variable's value determines whether or not libsystemd will be linked at build-time. If USE_SYSTEMD is set to "yes", make will use PKG_CONFIG to check for libsystemd's presence, and fail the build early if it isn't installed/detected properly. If USE_SYSTEM is set to "no", libsystemd will *not* be linked, even if support for it is available on the system redis is being built on. For any other value that USE_SYSTEM might assume (e.g. "auto"), PKG_CONFIG will try to determine libsystemd's presence, and set up the build process to link against it, if it was indicated as being installed/available. This approach has a number of repercussions of its own, most importantly the following: If you build redis on a system that actually has systemd support, but no libsystemd-dev package(s) installed, you'll end up *without* support for systemd notification/status reporting support in redis-server. This changes established runtime behaviour. I'm not sure if the build system and/or the server binary should indicate this. I'm also wondering if not actually having systemd-notify-support, but requesting it via the server's config, should result in a fatal error now.
2019-05-30 18:44:17 +02:00
FINAL_CFLAGS+= -DHAVE_LIBSYSTEMD
Fixed bug where make USE_SYSTEMD=yes would not pass in correct flags, issue #226 Former-commit-id: 69dc0a06bfd34516c5c18a6e22985ef01a472339
2021-03-01 21:31:33 +00:00
FINAL_CXXFLAGS+= -DHAVE_LIBSYSTEMD
Auto-detect and link libsystemd at compile-time This adds Makefile/build-system support for USE_SYSTEMD=(yes|no|*). This variable's value determines whether or not libsystemd will be linked at build-time. If USE_SYSTEMD is set to "yes", make will use PKG_CONFIG to check for libsystemd's presence, and fail the build early if it isn't installed/detected properly. If USE_SYSTEM is set to "no", libsystemd will *not* be linked, even if support for it is available on the system redis is being built on. For any other value that USE_SYSTEM might assume (e.g. "auto"), PKG_CONFIG will try to determine libsystemd's presence, and set up the build process to link against it, if it was indicated as being installed/available. This approach has a number of repercussions of its own, most importantly the following: If you build redis on a system that actually has systemd support, but no libsystemd-dev package(s) installed, you'll end up *without* support for systemd notification/status reporting support in redis-server. This changes established runtime behaviour. I'm not sure if the build system and/or the server binary should indicate this. I'm also wondering if not actually having systemd-notify-support, but requesting it via the server's config, should result in a fatal error now.
2019-05-30 18:44:17 +02:00
endif
Rebuild source when allocator changes To do so, the Makefile stores the contents of the MALLOC environment variable in a file named .make-malloc. When the contents of this file and the MALLOC variable are not equal, it forces a rebuild of the Redis source tree. A side-effect of this change is that choosing an allocator can now be done using the single MALLOC variable instead of USE_TCMALLOC, USE_JEMALLOC and so forth. These variables continue to work for backwards compatibility.
2011-11-15 13:09:31 -08:00
ifeq ($(MALLOC),tcmalloc)
Spaces to tabs
2013-03-16 18:35:20 +11:00
FINAL_CFLAGS+= -DUSE_TCMALLOC
Change default back to jemalloc (until defrag is implemented) and fix compile errors
2019-02-21 01:36:38 -05:00
FINAL_CXXFLAGS+= -DUSE_TCMALLOC
Spaces to tabs
2013-03-16 18:35:20 +11:00
FINAL_LIBS+= -ltcmalloc
support for compiling with tcmalloc
2010-10-22 00:06:44 +02:00
endif
More allocators
2011-04-19 23:54:43 +02:00
Rebuild source when allocator changes To do so, the Makefile stores the contents of the MALLOC environment variable in a file named .make-malloc. When the contents of this file and the MALLOC variable are not equal, it forces a rebuild of the Redis source tree. A side-effect of this change is that choosing an allocator can now be done using the single MALLOC variable instead of USE_TCMALLOC, USE_JEMALLOC and so forth. These variables continue to work for backwards compatibility.
2011-11-15 13:09:31 -08:00
ifeq ($(MALLOC),tcmalloc_minimal)
Spaces to tabs
2013-03-16 18:35:20 +11:00
FINAL_CFLAGS+= -DUSE_TCMALLOC
Change default back to jemalloc (until defrag is implemented) and fix compile errors
2019-02-21 01:36:38 -05:00
FINAL_CXXFLAGS+= -DUSE_TCMALLOC
Spaces to tabs
2013-03-16 18:35:20 +11:00
FINAL_LIBS+= -ltcmalloc_minimal
More allocators
2011-04-19 23:54:43 +02:00
endif
Rebuild source when allocator changes To do so, the Makefile stores the contents of the MALLOC environment variable in a file named .make-malloc. When the contents of this file and the MALLOC variable are not equal, it forces a rebuild of the Redis source tree. A side-effect of this change is that choosing an allocator can now be done using the single MALLOC variable instead of USE_TCMALLOC, USE_JEMALLOC and so forth. These variables continue to work for backwards compatibility.
2011-11-15 13:09:31 -08:00
ifeq ($(MALLOC),jemalloc)
Spaces to tabs
2013-03-16 18:35:20 +11:00
DEPENDENCY_TARGETS+= jemalloc
FINAL_CFLAGS+= -DUSE_JEMALLOC -I../deps/jemalloc/include
Change default back to jemalloc (until defrag is implemented) and fix compile errors
2019-02-21 01:36:38 -05:00
FINAL_CXXFLAGS+= -DUSE_JEMALLOC -I../deps/jemalloc/include
Don't append libjemalloc.a otherwise it will be after -ldl.
2018-05-25 13:36:51 +02:00
FINAL_LIBS := ../deps/jemalloc/lib/libjemalloc.a $(FINAL_LIBS)
More allocators
2011-04-19 23:54:43 +02:00
endif
Properly integrate memkind Former-commit-id: 82372cbce84a009ef162a611bb91c7ed67acc9e9
2019-02-01 15:21:00 -05:00
ifeq ($(MALLOC),memkind)
DEPENDENCY_TARGETS+= memkind
FINAL_CFLAGS+= -DUSE_MEMKIND -I../deps/memkind/src/include
Change default back to jemalloc (until defrag is implemented) and fix compile errors
2019-02-21 01:36:38 -05:00
FINAL_CXXFLAGS+= -DUSE_MEMKIND -I../deps/memkind/src/include
Properly integrate memkind Former-commit-id: 82372cbce84a009ef162a611bb91c7ed67acc9e9
2019-02-01 15:21:00 -05:00
FINAL_LIBS := ../deps/memkind/src/.libs/libmemkind.a -lnuma $(FINAL_LIBS)
endif
TLS: Connections refactoring and TLS support. * Introduce a connection abstraction layer for all socket operations and integrate it across the code base. * Provide an optional TLS connections implementation based on OpenSSL. * Pull a newer version of hiredis with TLS support. * Tests, redis-cli updates for TLS support.
2019-09-12 10:56:54 +03:00
ifeq ($(BUILD_TLS),yes)
Use pkg-config to properly detect libssl and libcrypto libraries (#7452)
2020-07-10 01:30:09 -06:00
FINAL_CFLAGS+=-DUSE_OPENSSL $(OPENSSL_CFLAGS)
Merge tag '6.2.1' into unstable Former-commit-id: bfed57e3e0edaa724b9d060a6bb8edc5a6de65fa
2021-05-19 02:59:48 +00:00
FINAL_CXXFLAGS+=-DUSE_OPENSSL $(OPENSSL_CXXFLAGS)
Use pkg-config to properly detect libssl and libcrypto libraries (#7452)
2020-07-10 01:30:09 -06:00
FINAL_LDFLAGS+=$(OPENSSL_LDFLAGS)
Use pkg-config to properly detect libssl and libcrypto libraries (#7452) (cherry picked from commit 6a014af79a9cbafc0be946047f216544f116b598)
2020-07-10 01:30:09 -06:00
LIBSSL_PKGCONFIG := $(shell $(PKG_CONFIG) --exists libssl && echo $$?)
ifeq ($(LIBSSL_PKGCONFIG),0)
LIBSSL_LIBS=$(shell $(PKG_CONFIG) --libs libssl)
else
LIBSSL_LIBS=-lssl
endif
LIBCRYPTO_PKGCONFIG := $(shell $(PKG_CONFIG) --exists libcrypto && echo $$?)
ifeq ($(LIBCRYPTO_PKGCONFIG),0)
LIBCRYPTO_LIBS=$(shell $(PKG_CONFIG) --libs libcrypto)
else
LIBCRYPTO_LIBS=-lcrypto
endif
FINAL_LIBS += ../deps/hiredis/libhiredis_ssl.a $(LIBSSL_LIBS) $(LIBCRYPTO_LIBS)
TLS: Connections refactoring and TLS support. * Introduce a connection abstraction layer for all socket operations and integrate it across the code base. * Provide an optional TLS connections implementation based on OpenSSL. * Pull a newer version of hiredis with TLS support. * Tests, redis-cli updates for TLS support.
2019-09-12 10:56:54 +03:00
endif
Fix the display of make install (#8667)
2021-04-11 02:25:53 +08:00
ifndef V
define MAKE_INSTALL
@printf ' %b %b\n' $(LINKCOLOR)INSTALL$(ENDCOLOR) $(BINCOLOR)$(1)$(ENDCOLOR) 1>&2
@$(INSTALL) $(1) $(2)
endef
else
define MAKE_INSTALL
$(INSTALL) $(1) $(2)
endef
endif
add some comments Former-commit-id: 0fc6441c9608f0650003a7ab29dd704166345272
2021-07-28 20:32:18 +00:00
# Alpine OS doesn't have support for the execinfo backtrace library we use for debug, so we provide an alternate implementation using libwunwind.
add backtrace for alpine using libunwind Former-commit-id: c583ffff412b9df705b7c96e68e3908b645c7d43
2021-07-19 17:20:52 +00:00
OS := $(shell cat /etc/os-release | grep ID= | head -n 1 | cut -d'=' -f2)
ifeq ($(OS),alpine)
FINAL_CXXFLAGS+=-DUNW_LOCAL_ONLY
FINAL_LIBS += -lunwind
endif
Rename ADD_*FLAGS -> REDIS_*FLAGS, REDIS_*FLAGS -> FINAL_*FLAGS This reflects that REDIS_*FLAGS will only be used for compilation of Redis and not for its dependencies. Similarly, that FINAL_*FLAGS are composed of other variables and holds the options that are finally passed to the compiler and linker.
2012-04-13 17:34:31 -07:00
REDIS_CC=$(QUIET_CC)$(CC) $(FINAL_CFLAGS)
Perf fixes for expire snapshots Former-commit-id: da805e4442815c89e85ca7b9fc855dd11ef2a6c8
2019-12-17 17:39:04 -05:00
REDIS_CXX=$(QUIET_CC)$(CXX) $(FINAL_CXXFLAGS)
Optimize deadlock detection, fix callstack for ASM, and annotate locks Note: This change moves our assembly code to use the GNU Assembler because NASM seems to be incapable of emitting the necessary debug information for callstack unwinding to work. Former-commit-id: 600fc241cfe79b9b32ac6010c6ea0c66747f0f15
2019-10-22 21:34:51 -04:00
KEYDB_AS=$(QUIET_CC) as --64 -g
Make main headers C++ safe, and change rdb to use file descriptor instead of FILE pointer Former-commit-id: 3c9dd6ffc254d089e4208ad39da7338b6fb0fba7
2019-02-05 23:36:40 -05:00
REDIS_LD=$(QUIET_LINK)$(CXX) $(FINAL_LDFLAGS)
First implementation of Redis Sentinel. This commit implements the first, beta quality implementation of Redis Sentinel, a distributed monitoring system for Redis with notification and automatic failover capabilities. More info at http://redis.io/topics/sentinel
2012-07-23 12:54:52 +02:00
REDIS_INSTALL=$(QUIET_INSTALL)$(INSTALL)
first commit
2009-03-22 10:30:00 +01:00
Better pretty printed makefile output
2011-05-04 10:17:05 +02:00
CCCOLOR="\033[34m"
LINKCOLOR="\033[34;1m"
SRCCOLOR="\033[33m"
BINCOLOR="\033[37;1m"
MAKECOLOR="\033[32;1m"
ENDCOLOR="\033[0m"
Better colorized Makefile implementation, inspired by git makefile
2011-06-08 17:09:18 +02:00
ifndef V
Don't send build log to stderr Former-commit-id: b20bf10fda319389c6e7d06cc7cc6c6b6b4f1c6c
2020-03-28 23:36:57 -04:00
QUIET_CC = @printf ' %b %b\n' $(CCCOLOR)CC$(ENDCOLOR) $(SRCCOLOR)$@$(ENDCOLOR);
Merge branch 'redis_6_merge' into keydbpro Former-commit-id: 86f7292ed375d509645458704828e72fdbfea936
2020-03-30 00:57:58 -04:00
QUIET_CP = @printf ' %b %b\n' $(CCCOLOR)COPY$(ENDCOLOR) $(SRCCOLOR)$@$(ENDCOLOR);
Don't send build log to stderr Former-commit-id: b20bf10fda319389c6e7d06cc7cc6c6b6b4f1c6c
2020-03-28 23:36:57 -04:00
QUIET_LINK = @printf ' %b %b\n' $(LINKCOLOR)LINK$(ENDCOLOR) $(BINCOLOR)$@$(ENDCOLOR);
QUIET_INSTALL = @printf ' %b %b\n' $(LINKCOLOR)INSTALL$(ENDCOLOR) $(BINCOLOR)$@$(ENDCOLOR);
Better colorized Makefile implementation, inspired by git makefile
2011-06-08 17:09:18 +02:00
endif
re-label keydb-pro-server to keydb-server Former-commit-id: eb6f61ad372f0f4e573b9b731eac6c7f2ada0d9f
2021-03-16 01:57:26 +00:00
REDIS_SERVER_NAME=keydb-server$(PROG_SUFFIX)
Merge tag 'tags/6.0.10' into redismerge_2021-01-20 Former-commit-id: dadce055f897cee83946c2d3e5cbb76341b94230
2021-01-25 16:07:08 +00:00
REDIS_SENTINEL_NAME=keydb-sentinel$(PROG_SUFFIX)
Reenable LTO Former-commit-id: e7c1e1c9d8021f48c4081a9dfb84dba9da2521fc
2021-06-25 06:10:13 +00:00
REDIS_SERVER_OBJ=adlist.o quicklist.o ae.o anet.o dict.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 t_nhash.o config.o aof.o pubsub.o multi.o debug.o sort.o intset.o syncio.o cluster.o crc16.o endianconv.o slowlog.o scripting.o bio.o rio.o rand.o memtest.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 acl.o storage.o rdb-s3.o fastlock.o new.o tracking.o cron.o connection.o tls.o sha256.o motd_server.o timeout.o setcpuaffinity.o AsyncWorkQueue.o snapshot.o storage/rocksdb.o storage/rocksdbfactory.o storage/teststorageprovider.o keydbutils.o StorageCache.o monotonic.o cli_common.o mt19937-64.o $(ASM_OBJ)
Initial implementation of snapshot fast replication. There are still a few TODOs in progress Former-commit-id: 0febdcdab8693af443f350968ed3d8c80106675d
2021-11-09 19:36:07 +00:00
KEYDB_SERVER_OBJ=SnapshotPayloadParseState.o
Merge tag 'tags/6.0.10' into redismerge_2021-01-20 Former-commit-id: dadce055f897cee83946c2d3e5cbb76341b94230
2021-01-25 16:07:08 +00:00
REDIS_CLI_NAME=keydb-cli$(PROG_SUFFIX)
Reenable LTO Former-commit-id: e7c1e1c9d8021f48c4081a9dfb84dba9da2521fc
2021-06-25 06:10:13 +00:00
REDIS_CLI_OBJ=anet.o adlist.o dict.o redis-cli.o redis-cli-cpphelper.o zmalloc.o release.o anet.o ae.o crcspeed.o crc64.o siphash.o crc16.o storage-lite.o fastlock.o motd_client.o monotonic.o cli_common.o mt19937-64.o $(ASM_OBJ)
Merge tag 'tags/6.0.10' into redismerge_2021-01-20 Former-commit-id: dadce055f897cee83946c2d3e5cbb76341b94230
2021-01-25 16:07:08 +00:00
REDIS_BENCHMARK_NAME=keydb-benchmark$(PROG_SUFFIX)
Merge tag '6.2.1' into unstable Former-commit-id: bfed57e3e0edaa724b9d060a6bb8edc5a6de65fa
2021-05-19 02:59:48 +00:00
REDIS_BENCHMARK_OBJ=ae.o anet.o redis-benchmark.o adlist.o dict.o zmalloc.o release.o crcspeed.o crc64.o siphash.o redis-benchmark.o storage-lite.o fastlock.o new.o monotonic.o cli_common.o mt19937-64.o $(ASM_OBJ)
Merge tag 'tags/6.0.10' into redismerge_2021-01-20 Former-commit-id: dadce055f897cee83946c2d3e5cbb76341b94230
2021-01-25 16:07:08 +00:00
REDIS_CHECK_RDB_NAME=keydb-check-rdb$(PROG_SUFFIX)
REDIS_CHECK_AOF_NAME=keydb-check-aof$(PROG_SUFFIX)
updated makefile vars to keydb names Former-commit-id: e6ab823473f7f215dcd61c3101b7c9ad310a0483
2021-04-27 21:14:05 +00:00
KEYDB_DIAGNOSTIC_NAME=keydb-diagnostic-tool$(PROG_SUFFIX)
Merge remote-tracking branch 'origin/unstable' into diagnostic-tool Former-commit-id: bfb0d02622dfc9ac0c67ec68ae8a21cccd5c9004
2021-06-18 20:04:14 +00:00
KEYDB_DIAGNOSTIC_OBJ=ae.o anet.o keydb-diagnostic-tool.o adlist.o dict.o zmalloc.o release.o crcspeed.o crc64.o siphash.o keydb-diagnostic-tool.o storage-lite.o fastlock.o new.o monotonic.o cli_common.o mt19937-64.o $(ASM_OBJ)
Makefile now introduces Redis-specific CFLAGS / LDFLAGS. Gcov target fixed. Added comments to describe how it works.
2012-04-12 11:09:38 +02:00
Merge remote-tracking branch 'origin/unstable' into diagnostic-tool Former-commit-id: bfb0d02622dfc9ac0c67ec68ae8a21cccd5c9004
2021-06-18 20:04:14 +00:00
all: $(REDIS_SERVER_NAME) $(REDIS_SENTINEL_NAME) $(REDIS_CLI_NAME) $(REDIS_BENCHMARK_NAME) $(REDIS_CHECK_RDB_NAME) $(REDIS_CHECK_AOF_NAME) $(KEYDB_DIAGNOSTIC_NAME)
Minor changes to Makefile
2010-12-15 12:40:23 +01:00
@echo ""
src/Makefile: Reword "to run make test" message Closes #1610
2014-03-16 20:22:36 -07:00
@echo "Hint: It's a good idea to run 'make test' ;)"
Minor changes to Makefile
2010-12-15 12:40:23 +01:00
@echo ""
first commit
2009-03-22 10:30:00 +01:00
Generate Makefile.dep at every build. Normally we used to update it from time to time. Too fragile... better to generate dependencies at every run and delete them on 'make clean'.
2016-07-06 12:24:45 +02:00
Makefile.dep:
-$(REDIS_CC) -MM *.c > Makefile.dep 2> /dev/null || true
Makefile modified to build with jemalloc
2011-06-20 11:52:15 +02:00
Makefile: don't build dependencies file for clean, distclean.
2016-07-06 12:56:43 +02:00
ifeq (0, $(words $(findstring $(MAKECMDGOALS), $(NODEPS))))
Generate Makefile.dep at every build. Normally we used to update it from time to time. Too fragile... better to generate dependencies at every run and delete them on 'make clean'.
2016-07-06 12:24:45 +02:00
-include Makefile.dep
Makefile: don't build dependencies file for clean, distclean.
2016-07-06 12:56:43 +02:00
endif
Rebuild source when allocator changes To do so, the Makefile stores the contents of the MALLOC environment variable in a file named .make-malloc. When the contents of this file and the MALLOC variable are not equal, it forces a rebuild of the Redis source tree. A side-effect of this change is that choosing an allocator can now be done using the single MALLOC variable instead of USE_TCMALLOC, USE_JEMALLOC and so forth. These variables continue to work for backwards compatibility.
2011-11-15 13:09:31 -08:00
Generate Makefile.dep at every build. Normally we used to update it from time to time. Too fragile... better to generate dependencies at every run and delete them on 'make clean'.
2016-07-06 12:24:45 +02:00
.PHONY: all
Rebuild source when allocator changes To do so, the Makefile stores the contents of the MALLOC environment variable in a file named .make-malloc. When the contents of this file and the MALLOC variable are not equal, it forces a rebuild of the Redis source tree. A side-effect of this change is that choosing an allocator can now be done using the single MALLOC variable instead of USE_TCMALLOC, USE_JEMALLOC and so forth. These variables continue to work for backwards compatibility.
2011-11-15 13:09:31 -08:00
Persist `make` settings and trigger rebuild if anything changes
2012-04-13 17:50:38 -07:00
persist-settings: distclean
echo STD=$(STD) >> .make-settings
echo WARN=$(WARN) >> .make-settings
echo OPT=$(OPT) >> .make-settings
echo MALLOC=$(MALLOC) >> .make-settings
Fix double-make issue with make && make install. (#7734) All user-supplied variables that affect the build should be explicitly persisted. Fixes #7254 (cherry picked from commit b35d6e5cffb895ab6cbbd9e5e56ef00299b1359e)
2020-09-01 10:02:14 +03:00
echo BUILD_TLS=$(BUILD_TLS) >> .make-settings
echo USE_SYSTEMD=$(USE_SYSTEMD) >> .make-settings
Persist `make` settings and trigger rebuild if anything changes
2012-04-13 17:50:38 -07:00
echo CFLAGS=$(CFLAGS) >> .make-settings
Enusre CXXFLAGS has the same settings as CFLAGS Former-commit-id: cda8d42a7656138e15788f262663a67ca4d8bc49
2019-12-17 17:49:51 -05:00
echo CXXFLAGS=$(CXXFLAGS) >> .make-settings
Persist `make` settings and trigger rebuild if anything changes
2012-04-13 17:50:38 -07:00
echo LDFLAGS=$(LDFLAGS) >> .make-settings
changed redis_flags names to keydb in makefile Former-commit-id: 07273936271536e4a57efdb7a31bc34e5b8d50f1
2021-06-14 16:09:42 +00:00
echo KEYDB_CFLAGS=$(KEYDB_CFLAGS) >> .make-settings
echo KEYDB_CXXFLAGS=$(KEYDB_CXXFLAGS) >> .make-settings
echo KEYDB_LDFLAGS=$(KEYDB_LDFLAGS) >> .make-settings
Persist `make` settings and trigger rebuild if anything changes
2012-04-13 17:50:38 -07:00
echo PREV_FINAL_CFLAGS=$(FINAL_CFLAGS) >> .make-settings
Fix type in makefile Former-commit-id: aa3e70f9a0b57da351ca940e40ca9422bdfcd26e
2019-12-17 18:23:19 -05:00
echo PREV_FINAL_CXXFLAGS=$(FINAL_CXXFLAGS) >> .make-settings
Persist `make` settings and trigger rebuild if anything changes
2012-04-13 17:50:38 -07:00
echo PREV_FINAL_LDFLAGS=$(FINAL_LDFLAGS) >> .make-settings
Fix failing tests due to build issue inhereted from Redis Former-commit-id: e902789aa7bf6237099c9dfdcb8efaaf68518f68
2019-04-03 00:09:26 -04:00
-(cd modules && $(MAKE))
Persist `make` settings and trigger rebuild if anything changes
2012-04-13 17:50:38 -07:00
-(cd ../deps && $(MAKE) $(DEPENDENCY_TARGETS))
.PHONY: persist-settings
Clean up Makefiles Remove unused variables. Instead of overriding non-standard variables such as ARCH and PROF, use standard variables CFLAGS and LDFLAGS to override Makefile settings. Move dependencies generated by `make dep` to a separate file.
2012-03-24 19:25:03 -07:00
# Prerequisites target
Persist `make` settings and trigger rebuild if anything changes
2012-04-13 17:50:38 -07:00
# Clean everything, persist settings and build dependencies if anything changed
ifneq ($(strip $(PREV_FINAL_CFLAGS)), $(strip $(FINAL_CFLAGS)))
.make-prerequisites: persist-settings
Enusre CXXFLAGS has the same settings as CFLAGS Former-commit-id: cda8d42a7656138e15788f262663a67ca4d8bc49
2019-12-17 17:49:51 -05:00
else ifneq ($(strip $(PREV_FINAL_CXXFLAGS)), $(strip $(FINAL_CXXFLAGS)))
.make-prerequisites: persist-settings
Fix race condition building dependencies with multithreaded builds Former-commit-id: 04679b3b3b53c87c85c2d64c9f6d34a73969af2c
2019-03-19 20:25:30 -04:00
else ifneq ($(strip $(PREV_FINAL_LDFLAGS)), $(strip $(FINAL_LDFLAGS)))
Persist `make` settings and trigger rebuild if anything changes
2012-04-13 17:50:38 -07:00
.make-prerequisites: persist-settings
Fix race condition building dependencies with multithreaded builds Former-commit-id: 04679b3b3b53c87c85c2d64c9f6d34a73969af2c
2019-03-19 20:25:30 -04:00
else
.make-prerequisites:
Clean up Makefiles Remove unused variables. Instead of overriding non-standard variables such as ARCH and PROF, use standard variables CFLAGS and LDFLAGS to override Makefile settings. Move dependencies generated by `make dep` to a separate file.
2012-03-24 19:25:03 -07:00
endif
Fix race condition building dependencies with multithreaded builds Former-commit-id: 04679b3b3b53c87c85c2d64c9f6d34a73969af2c
2019-03-19 20:25:30 -04:00
@touch $@
Use hiredis from redis-benchmark
2010-11-04 13:37:05 +01:00
re-label keydb-pro-server to keydb-server Former-commit-id: eb6f61ad372f0f4e573b9b731eac6c7f2ada0d9f
2021-03-16 01:57:26 +00:00
# keydb-server
Initial implementation of snapshot fast replication. There are still a few TODOs in progress Former-commit-id: 0febdcdab8693af443f350968ed3d8c80106675d
2021-11-09 19:36:07 +00:00
$(REDIS_SERVER_NAME): $(REDIS_SERVER_OBJ) $(KEYDB_SERVER_OBJ)
Initial RocksDB integration Former-commit-id: 0de9e5b692c02e779e538ddd0a56d10215e501bb
2019-12-06 20:39:32 -05:00
$(REDIS_LD) -o $@ $^ ../deps/hiredis/libhiredis.a ../deps/lua/src/liblua.a ../deps/rocksdb/librocksdb.a $(FINAL_LIBS)
First implementation of Redis Sentinel. This commit implements the first, beta quality implementation of Redis Sentinel, a distributed monitoring system for Redis with notification and automatic failover capabilities. More info at http://redis.io/topics/sentinel
2012-07-23 12:54:52 +02:00
remove Redis branding Former-commit-id: 79ef18e8853421e22f4192591b8c543eeeb79356
2019-02-08 17:56:32 -05:00
# keydb-sentinel
First implementation of Redis Sentinel. This commit implements the first, beta quality implementation of Redis Sentinel, a distributed monitoring system for Redis with notification and automatic failover capabilities. More info at http://redis.io/topics/sentinel
2012-07-23 12:54:52 +02:00
$(REDIS_SENTINEL_NAME): $(REDIS_SERVER_NAME)
$(REDIS_INSTALL) $(REDIS_SERVER_NAME) $(REDIS_SENTINEL_NAME)
first commit
2009-03-22 10:30:00 +01:00
remove Redis branding Former-commit-id: 79ef18e8853421e22f4192591b8c543eeeb79356
2019-02-08 17:56:32 -05:00
# keydb-check-rdb
Convert check-dump to Redis check-rdb mode redis-check-dump is now named redis-check-rdb and it runs as a mode of redis-server instead of an independent binary. You can now use 'redis-server redis.conf --check-rdb' to check the RDB defined in redis.conf. Using argument --check-rdb checks the RDB and exits. We could potentially also allow the server to continue starting if the RDB check succeeds. This change also enables us to use RDB checking programatically from inside Redis for certain failure conditions.
2014-05-09 12:06:06 -04:00
$(REDIS_CHECK_RDB_NAME): $(REDIS_SERVER_NAME)
$(REDIS_INSTALL) $(REDIS_SERVER_NAME) $(REDIS_CHECK_RDB_NAME)
remove Redis branding Former-commit-id: 79ef18e8853421e22f4192591b8c543eeeb79356
2019-02-08 17:56:32 -05:00
# keydb-check-aof
AOF check utility: ability to check files with RDB preamble.
2017-07-10 13:38:23 +02:00
$(REDIS_CHECK_AOF_NAME): $(REDIS_SERVER_NAME)
$(REDIS_INSTALL) $(REDIS_SERVER_NAME) $(REDIS_CHECK_AOF_NAME)
remove Redis branding Former-commit-id: 79ef18e8853421e22f4192591b8c543eeeb79356
2019-02-08 17:56:32 -05:00
# keydb-cli
Makefile now introduces Redis-specific CFLAGS / LDFLAGS. Gcov target fixed. Added comments to describe how it works.
2012-04-12 11:09:38 +02:00
$(REDIS_CLI_NAME): $(REDIS_CLI_OBJ)
MOTD refactor Former-commit-id: 6c78ec7c41223b3381e19fdf78478f66b4959dc9
2020-03-04 16:22:55 -05:00
$(REDIS_LD) -o $@ $^ ../deps/hiredis/libhiredis.a ../deps/linenoise/linenoise.o $(FINAL_LIBS)
Use hiredis from redis-cli
2010-11-03 16:09:38 +01:00
remove Redis branding Former-commit-id: 79ef18e8853421e22f4192591b8c543eeeb79356
2019-02-08 17:56:32 -05:00
# keydb-benchmark
Makefile now introduces Redis-specific CFLAGS / LDFLAGS. Gcov target fixed. Added comments to describe how it works.
2012-04-12 11:09:38 +02:00
$(REDIS_BENCHMARK_NAME): $(REDIS_BENCHMARK_OBJ)
Extended redis-benchmark instant metrics and overall latency report (#7600) A first step to enable a consistent full percentile analysis on query latency so that we can fully understand the performance and stability characteristics of the redis-server system we are measuring. It also improves the instantaneous reported metrics, and the csv output format.
2020-08-25 19:21:29 +01:00
$(REDIS_LD) -o $@ $^ ../deps/hiredis/libhiredis.a ../deps/hdr_histogram/hdr_histogram.o $(FINAL_LIBS)
dict.c benchmark.
2016-09-07 10:32:57 +02:00
added keydb-diagnostic-tool binary (copy of benchmark) Former-commit-id: a2c0bce4cc1403e01e70508b4297cfe5e76643cc
2021-04-27 20:56:37 +00:00
# keydb-diagnostic-tool
fixed diagnostic tool to use correct obj files Former-commit-id: 66547bd28ab025c4d118e6b8d35e2aa0b1f42f10
2021-04-28 16:02:44 +00:00
$(KEYDB_DIAGNOSTIC_NAME): $(KEYDB_DIAGNOSTIC_OBJ)
Merge remote-tracking branch 'origin/unstable' into diagnostic-tool Former-commit-id: bfb0d02622dfc9ac0c67ec68ae8a21cccd5c9004
2021-06-18 20:04:14 +00:00
$(REDIS_LD) -o $@ $^ ../deps/hiredis/libhiredis.a $(FINAL_LIBS)
added keydb-diagnostic-tool binary (copy of benchmark) Former-commit-id: a2c0bce4cc1403e01e70508b4297cfe5e76643cc
2021-04-27 20:56:37 +00:00
Initial implementation of snapshot fast replication. There are still a few TODOs in progress Former-commit-id: 0febdcdab8693af443f350968ed3d8c80106675d
2021-11-09 19:36:07 +00:00
DEP = $(REDIS_SERVER_OBJ:%.o=%.d) $(KEYDB_SERVER_OBJ:%.o=%.d) $(REDIS_CLI_OBJ:%.o=%.d) $(REDIS_BENCHMARK_OBJ:%.o=%.d)
Make incremental building work with header files Former-commit-id: bf500ab44b82e9a3ad7f341b7d2f7f583fdf336f
2019-12-27 17:34:41 -05:00
-include $(DEP)
Clean up Makefiles Remove unused variables. Instead of overriding non-standard variables such as ARCH and PROF, use standard variables CFLAGS and LDFLAGS to override Makefile settings. Move dependencies generated by `make dep` to a separate file.
2012-03-24 19:25:03 -07:00
# 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
# depending on a single artifact, build all dependencies first.
Reenable LTO Former-commit-id: e7c1e1c9d8021f48c4081a9dfb84dba9da2521fc
2021-06-25 06:10:13 +00:00
motd_client.o: motd.cpp .make-prerequisites
$(REDIS_CXX) -MMD -o motd_client.o -c $< -DCLIENT -fno-lto
motd_server.o: motd.cpp .make-prerequisites
$(REDIS_CXX) -MMD -o motd_server.o -c $< -DSERVER
Don't force rebuild when params didn't change
2011-11-16 08:34:42 -08:00
%.o: %.c .make-prerequisites
Merge keydb community Former-commit-id: b9dcd0997c3dfd3cd2a5908ba540bc4d389104a0
2019-12-27 17:44:48 -05:00
$(REDIS_CC) -MMD -o $@ -c $<
Rebuild deps/ and src/ when ARCH changes This change moves the build instructions for dependencies to a separate Makefile in deps/. The ARCH environment variable is stored in a .make-arch file in the same directory as the Makefile. The contents of this file is read and compared to the current ARCH, and, on a mismatch triggers rebuilding the entire source tree. When file .make-arch exists and matches with ARCH from the environment, the dependencies are assumed to already be built. The new "clean" target only cleans the Redis source tree, not its dependencies. To clear the dependencies as well, the "distclean" target can be used.
2011-11-15 12:40:49 -08:00
Make main headers C++ safe, and change rdb to use file descriptor instead of FILE pointer Former-commit-id: 3c9dd6ffc254d089e4208ad39da7338b6fb0fba7
2019-02-05 23:36:40 -05:00
%.o: %.cpp .make-prerequisites
Merge keydb community Former-commit-id: b9dcd0997c3dfd3cd2a5908ba540bc4d389104a0
2019-12-27 17:44:48 -05:00
$(REDIS_CXX) -MMD -o $@ -c $<
Make main headers C++ safe, and change rdb to use file descriptor instead of FILE pointer Former-commit-id: 3c9dd6ffc254d089e4208ad39da7338b6fb0fba7
2019-02-05 23:36:40 -05:00
Rewrite our spinlock in assembly, pretty big performance improvement Former-commit-id: 40d7a701feefd36e9e3fdb6d516228c4a70fcf3d
2019-02-25 18:21:27 -05:00
%.o: %.asm .make-prerequisites
Optimize deadlock detection, fix callstack for ASM, and annotate locks Note: This change moves our assembly code to use the GNU Assembler because NASM seems to be incapable of emitting the necessary debug information for callstack unwinding to work. Former-commit-id: 600fc241cfe79b9b32ac6010c6ea0c66747f0f15
2019-10-22 21:34:51 -04:00
$(KEYDB_AS) $< -o $@
Rewrite our spinlock in assembly, pretty big performance improvement Former-commit-id: 40d7a701feefd36e9e3fdb6d516228c4a70fcf3d
2019-02-25 18:21:27 -05:00
first commit
2009-03-22 10:30:00 +01:00
clean:
Merge remote-tracking branch 'origin/unstable' into diagnostic-tool Former-commit-id: bfb0d02622dfc9ac0c67ec68ae8a21cccd5c9004
2021-06-18 20:04:14 +00:00
rm -rf $(REDIS_SERVER_NAME) $(REDIS_SENTINEL_NAME) $(REDIS_CLI_NAME) $(REDIS_BENCHMARK_NAME) $(REDIS_CHECK_RDB_NAME) $(REDIS_CHECK_AOF_NAME) $(KEYDB_DIAGNOSTIC_NAME) *.o *.gcda *.gcno *.gcov KeyDB.info lcov-html Makefile.dep
Add support for multiple databases with rocksdb Former-commit-id: cfa3b760b00776876134692d42e25a60fcd8dea9
2019-12-09 20:45:58 -05:00
rm -rf storage/*.o
Report flash disk usage Former-commit-id: 8e4a71ccd31e3c643a6f7b5154d8f2a65d2de76f
2020-06-07 16:40:03 -04:00
rm -rf keydb-server
Make incremental building work with header files Former-commit-id: bf500ab44b82e9a3ad7f341b7d2f7f583fdf336f
2019-12-27 17:34:41 -05:00
rm -f $(DEP)
Clean up Makefiles Remove unused variables. Instead of overriding non-standard variables such as ARCH and PROF, use standard variables CFLAGS and LDFLAGS to override Makefile settings. Move dependencies generated by `make dep` to a separate file.
2012-03-24 19:25:03 -07:00
.PHONY: clean
Rebuild deps/ and src/ when ARCH changes This change moves the build instructions for dependencies to a separate Makefile in deps/. The ARCH environment variable is stored in a .make-arch file in the same directory as the Makefile. The contents of this file is read and compared to the current ARCH, and, on a mismatch triggers rebuilding the entire source tree. When file .make-arch exists and matches with ARCH from the environment, the dependencies are assumed to already be built. The new "clean" target only cleans the Redis source tree, not its dependencies. To clear the dependencies as well, the "distclean" target can be used.
2011-11-15 12:40:49 -08:00
distclean: clean
-(cd ../deps && $(MAKE) distclean)
Fix failing tests due to build issue inhereted from Redis Former-commit-id: e902789aa7bf6237099c9dfdcb8efaaf68518f68
2019-04-03 00:09:26 -04:00
-(cd modules && $(MAKE) clean)
modules: Add newlen == 0 handling to RM_StringTruncate (#3717) (#3718) Previously, passing 0 for newlen would not truncate the string at all. This adds handling of this case, freeing the old string and creating a new empty string. Other changes: - Move `src/modules/testmodule.c` to `tests/modules/basics.c` - Introduce that basic test into the test suite - Add tests to cover StringTruncate - Add `test-modules` build target for the main makefile - Extend `distclean` build target to clean modules too (cherry picked from commit 1ccf2ca2f475a161b8ca0c574d4c0e6ef9ecf754)
2021-06-22 05:26:48 -04:00
-(cd ../tests/modules && $(MAKE) clean)
Clean up Makefiles Remove unused variables. Instead of overriding non-standard variables such as ARCH and PROF, use standard variables CFLAGS and LDFLAGS to override Makefile settings. Move dependencies generated by `make dep` to a separate file.
2012-03-24 19:25:03 -07:00
-(rm -f .make-*)
first commit
2009-03-22 10:30:00 +01:00
Clean up Makefiles Remove unused variables. Instead of overriding non-standard variables such as ARCH and PROF, use standard variables CFLAGS and LDFLAGS to override Makefile settings. Move dependencies generated by `make dep` to a separate file.
2012-03-24 19:25:03 -07:00
.PHONY: distclean
first commit
2009-03-22 10:30:00 +01:00
Adds redis-cli and redis-benchmark dependencies for `make test` target Obsoletes the need to run `make` before `make test`.
2020-08-12 03:01:15 +08:00
test: $(REDIS_SERVER_NAME) $(REDIS_CHECK_AOF_NAME) $(REDIS_CLI_NAME) $(REDIS_BENCHMARK_NAME)
Added a 'runtest' script that is responsible to check if Tcl is available and run the test. This is invoked from Makefile as well.
2011-07-15 17:20:57 +02:00
@(cd ..; ./runtest)
first commit
2009-03-22 10:30:00 +01:00
modules: Add newlen == 0 handling to RM_StringTruncate (#3717) (#3718) Previously, passing 0 for newlen would not truncate the string at all. This adds handling of this case, freeing the old string and creating a new empty string. Other changes: - Move `src/modules/testmodule.c` to `tests/modules/basics.c` - Introduce that basic test into the test suite - Add tests to cover StringTruncate - Add `test-modules` build target for the main makefile - Extend `distclean` build target to clean modules too (cherry picked from commit 1ccf2ca2f475a161b8ca0c574d4c0e6ef9ecf754)
2021-06-22 05:26:48 -04:00
test-modules: $(REDIS_SERVER_NAME)
@(cd ..; ./runtest-moduleapi)
Adds redis-cli and redis-benchmark dependencies for `make test` target Obsoletes the need to run `make` before `make test`.
2020-08-12 03:01:15 +08:00
test-sentinel: $(REDIS_SENTINEL_NAME) $(REDIS_CLI_NAME)
Sentinel test: Makefile target added.
2014-02-28 16:00:00 +01:00
@(cd ..; ./runtest-sentinel)
make check is a common naming convention for tests
2013-03-16 18:40:22 +11:00
check: test
add support for generation of lcov coverage reports
2012-04-04 19:17:32 +02:00
lcov:
The lcov target shouldn't clean This is not needed because every change in compiler/linker flags triggers a cleanup.
2012-04-13 17:38:12 -07:00
$(MAKE) gcov
code coverage reports should test multithreaded Former-commit-id: 5d016fdb6b11404d0eddbab651ed17180526a991
2020-11-30 22:59:00 +00:00
@(set -e; cd ..; ./runtest --config server-threads 3; ./runtest-sentinel; ./runtest-cluster; ./runtest-moduleapi)
Updated 'make lcov' command to exclude external dependancies and generate final code coverage percentage Former-commit-id: eebd70aaa6bec0362ea90148174263fa6ffcc169
2020-11-25 21:34:40 +00:00
@geninfo -o KeyDB.info --no-external .
@genhtml --legend -o lcov-html KeyDB.info
Properly escaped $ in lcov command Former-commit-id: 06a17c8511cfa8e07962401cc01045878525dc27
2020-11-25 22:29:09 +00:00
@genhtml --legend -o lcov-html KeyDB.info | grep lines | awk '{print $$2;}' | sed 's/%//g'
add support for generation of lcov coverage reports
2012-04-04 19:17:32 +02:00
Clean up Makefiles Remove unused variables. Instead of overriding non-standard variables such as ARCH and PROF, use standard variables CFLAGS and LDFLAGS to override Makefile settings. Move dependencies generated by `make dep` to a separate file.
2012-03-24 19:25:03 -07:00
.PHONY: lcov
Makefile now introduces Redis-specific CFLAGS / LDFLAGS. Gcov target fixed. Added comments to describe how it works.
2012-04-12 11:09:38 +02:00
bench: $(REDIS_BENCHMARK_NAME)
./$(REDIS_BENCHMARK_NAME)
more work on ZSETs and a new make target called 32bit to build i386 binaries on mac os x leopard
2009-10-23 21:24:01 +02:00
32bit:
Fixed 32bit make target to work on Linux out of the box
2010-02-22 17:36:54 +01:00
@echo ""
@echo "WARNING: if it fails under Linux you probably need to install libc6-dev-i386"
@echo ""
fixed 32bit compatibility in Makefile Former-commit-id: f5ee64f9aaeb3f3773de2435191bcff0855154e4
2021-08-12 19:21:30 +00:00
$(MAKE) CXXFLAGS="-m32" CFLAGS="-m32" LDFLAGS="-m32" TARGET32=true
masterauth option merged, thanks to Anthony Lauzon
2009-11-04 09:53:43 +01:00
a few more tests and ability to run a specific test in test-redis.tcl
2009-12-14 13:48:24 -05:00
gcov:
changed redis_flags names to keydb in makefile Former-commit-id: 07273936271536e4a57efdb7a31bc34e5b8d50f1
2021-06-14 16:09:42 +00:00
$(MAKE) KEYDB_CXXFLAGS="-fprofile-arcs -ftest-coverage -DCOVERAGE_TEST" KEYDB_CFLAGS="-fprofile-arcs -ftest-coverage -DCOVERAGE_TEST" KEYDB_LDFLAGS="-fprofile-arcs -ftest-coverage"
a few more tests and ability to run a specific test in test-redis.tcl
2009-12-14 13:48:24 -05:00
a few more stuff in INFO about VM. Test #11 changed a bit in order to be less lame
2010-01-12 09:57:00 -05:00
noopt:
Makefile: valgrind target added (forces -O0 and libc malloc).
2013-02-11 12:11:21 +01:00
$(MAKE) OPTIMIZATION="-O0"
valgrind:
Some valgrind fixes Former-commit-id: ba974c9810dc30b6b5bd21c4bcc6cc5b219f7ea4
2020-06-07 23:20:10 -04:00
$(MAKE) OPTIMIZATION="-O0" USEASM="false" MALLOC="libc" CFLAGS="-DSANITIZE" CXXFLAGS="-DSANITIZE"
a few more stuff in INFO about VM. Test #11 changed a bit in order to be less lame
2010-01-12 09:57:00 -05:00
Modules TSC: use atomic var for server.unixtime. This avoids Helgrind complaining, but we are actually not using atomicGet() to get the unixtime value for now: too many places where it is used and given tha time_t is word-sized it should be safe in all the archs we support as it is. On the other hand, Helgrind, when Redis is compiled with "make helgrind" in order to force the __sync macros, will detect the write in updateCachedTime() as a read (because atomic functions are used) and will not complain about races. This commit also includes minor refactoring of mutex initializations and a "helgrind" target in the Makefile.
2017-05-10 10:01:06 +02:00
helgrind:
changed redis_flags names to keydb in makefile Former-commit-id: 07273936271536e4a57efdb7a31bc34e5b8d50f1
2021-06-14 16:09:42 +00:00
$(MAKE) OPTIMIZATION="-O0" MALLOC="libc" CFLAGS="-D__ATOMIC_VAR_FORCE_SYNC_MACROS" KEYDB_CFLAGS="-I/usr/local/include" KEYDB_LDFLAGS="-L/usr/local/lib"
Modules TSC: use atomic var for server.unixtime. This avoids Helgrind complaining, but we are actually not using atomicGet() to get the unixtime value for now: too many places where it is used and given tha time_t is word-sized it should be safe in all the archs we support as it is. On the other hand, Helgrind, when Redis is compiled with "make helgrind" in order to force the __sync macros, will detect the write in updateCachedTime() as a read (because atomic functions are used) and will not complain about races. This commit also includes minor refactoring of mutex initializations and a "helgrind" target in the Makefile.
2017-05-10 10:01:06 +02:00
top level Makefile now just a proxy. Doing make clean inside src now does a full clean including deps, not just Redis source. Thanks to Pieter for the top level Makefile proxy trick.
2011-07-13 19:15:22 +02:00
src/help.h:
@../utils/generate-command-help.rb > help.h
make install target, finally ;)
2010-07-06 19:07:16 +02:00
install: all
Silence mkdir output
2013-03-17 18:03:14 +11:00
@mkdir -p $(INSTALL_BIN)
Fix the display of make install (#8667)
2021-04-11 02:25:53 +08:00
$(call MAKE_INSTALL,$(REDIS_SERVER_NAME),$(INSTALL_BIN))
$(call MAKE_INSTALL,$(REDIS_BENCHMARK_NAME),$(INSTALL_BIN))
$(call MAKE_INSTALL,$(REDIS_CLI_NAME),$(INSTALL_BIN))
install redis-check-rdb and redis-check-aof as symlinks to redis-server (#5745)
2020-12-17 16:49:19 +04:00
@ln -sf $(REDIS_SERVER_NAME) $(INSTALL_BIN)/$(REDIS_CHECK_RDB_NAME)
@ln -sf $(REDIS_SERVER_NAME) $(INSTALL_BIN)/$(REDIS_CHECK_AOF_NAME)
Add redis-sentinel symlink to a relative path
2014-12-17 11:04:08 +01:00
@ln -sf $(REDIS_SERVER_NAME) $(INSTALL_BIN)/$(REDIS_SENTINEL_NAME)
Provide an uninstall target in Makefile On `make uninstall`, removes: - /usr/local/bin/redis-benchmark - /usr/local/bin/redis-check-aof - /usr/local/bin/redis-check-rdb - /usr/local/bin/redis-cli - /usr/local/bin/redis-sentinel - /usr/local/bin/redis-server (Only the src/ versions are removed in `make clean`)
2019-03-06 21:24:45 -05:00
uninstall:
Merge remote-tracking branch 'origin/unstable' into diagnostic-tool Former-commit-id: bfb0d02622dfc9ac0c67ec68ae8a21cccd5c9004
2021-06-18 20:04:14 +00:00
rm -f $(INSTALL_BIN)/{$(REDIS_SERVER_NAME),$(REDIS_BENCHMARK_NAME),$(REDIS_CLI_NAME),$(REDIS_CHECK_RDB_NAME),$(REDIS_CHECK_AOF_NAME),$(REDIS_SENTINEL_NAME),$(KEYDB_DIAGNOSTIC_NAME)}
Reference in New Issue Copy Permalink