forked from pool/redis
Accepting request 986598 from home:dspinella:branches:server:database
- Use bundled jemalloc to fix active defragmentation, fixes bsc#1200913. - Remove patch: * Add-support-for-USE_SYSTEM_JEMALLOC-flag.patch OBS-URL: https://build.opensuse.org/request/show/986598 OBS-URL: https://build.opensuse.org/package/show/server:database/redis?expand=0&rev=199
This commit is contained in:
Danilo Spinella
Git OBS Bridge
parent
0a57623dd0
commit
3c8696bb7a
@ -1,123 +0,0 @@
|
||||
From: Chris Lamb <lamby@debian.org>
|
||||
Date: Sat, 25 Aug 2018 17:52:13 +0200
|
||||
Subject: Add support for USE_SYSTEM_JEMALLOC flag.
|
||||
|
||||
https://github.com/antirez/redis/pull/5279
|
||||
---
|
||||
deps/Makefile | 2 ++
|
||||
src/Makefile | 5 +++++
|
||||
src/debug.c | 4 ++++
|
||||
src/object.c | 5 +++++
|
||||
src/zmalloc.c | 10 ++++++++++
|
||||
src/zmalloc.h | 4 ++++
|
||||
6 files changed, 30 insertions(+)
|
||||
|
||||
Index: redis-7.0.0/deps/Makefile
|
||||
===================================================================
|
||||
--- redis-7.0.0.orig/deps/Makefile
|
||||
+++ redis-7.0.0/deps/Makefile
|
||||
@@ -38,7 +38,9 @@ distclean:
|
||||
-(cd hiredis && $(MAKE) clean) > /dev/null || true
|
||||
-(cd linenoise && $(MAKE) clean) > /dev/null || true
|
||||
-(cd lua && $(MAKE) clean) > /dev/null || true
|
||||
+ifneq ($(USE_SYSTEM_JEMALLOC),yes)
|
||||
-(cd jemalloc && [ -f Makefile ] && $(MAKE) distclean) > /dev/null || true
|
||||
+endif
|
||||
-(cd hdr_histogram && $(MAKE) clean) > /dev/null || true
|
||||
-(rm -f .make-*)
|
||||
|
||||
Index: redis-7.0.0/src/Makefile
|
||||
===================================================================
|
||||
--- redis-7.0.0.orig/src/Makefile
|
||||
+++ redis-7.0.0/src/Makefile
|
||||
@@ -266,10 +266,15 @@ ifeq ($(MALLOC),tcmalloc_minimal)
|
||||
endif
|
||||
|
||||
ifeq ($(MALLOC),jemalloc)
|
||||
+ifeq ($(USE_SYSTEM_JEMALLOC),yes)
|
||||
+ FINAL_CFLAGS+= -DUSE_JEMALLOC -I/usr/include/jemalloc/include
|
||||
+ FINAL_LIBS := -ljemalloc $(FINAL_LIBS)
|
||||
+else
|
||||
DEPENDENCY_TARGETS+= jemalloc
|
||||
FINAL_CFLAGS+= -DUSE_JEMALLOC -I../deps/jemalloc/include
|
||||
FINAL_LIBS := ../deps/jemalloc/lib/libjemalloc.a $(FINAL_LIBS)
|
||||
endif
|
||||
+endif
|
||||
|
||||
ifeq ($(BUILD_TLS),yes)
|
||||
FINAL_CFLAGS+=-DUSE_OPENSSL $(OPENSSL_CFLAGS)
|
||||
Index: redis-7.0.0/src/debug.c
|
||||
===================================================================
|
||||
--- redis-7.0.0.orig/src/debug.c
|
||||
+++ redis-7.0.0/src/debug.c
|
||||
@@ -71,6 +71,10 @@ void printCrashReport(void);
|
||||
void bugReportEnd(int killViaSignal, int sig);
|
||||
void logStackTrace(void *eip, int uplevel);
|
||||
|
||||
+#if defined(USE_JEMALLOC) && (USE_SYSTEM_JEMALLOC == yes)
|
||||
+#define je_mallctl mallctl
|
||||
+#endif
|
||||
+
|
||||
/* ================================= Debugging ============================== */
|
||||
|
||||
/* Compute the sha1 of string at 's' with 'len' bytes long.
|
||||
Index: redis-7.0.0/src/object.c
|
||||
===================================================================
|
||||
--- redis-7.0.0.orig/src/object.c
|
||||
+++ redis-7.0.0/src/object.c
|
||||
@@ -37,6 +37,11 @@
|
||||
#define strtold(a,b) ((long double)strtod((a),(b)))
|
||||
#endif
|
||||
|
||||
+#if defined(USE_JEMALLOC) && (USE_SYSTEM_JEMALLOC == yes)
|
||||
+#define je_mallctl mallctl
|
||||
+#define je_malloc_stats_print malloc_stats_print
|
||||
+#endif
|
||||
+
|
||||
/* ===================== Creation and parsing of objects ==================== */
|
||||
|
||||
robj *createObject(int type, void *ptr) {
|
||||
Index: redis-7.0.0/src/zmalloc.c
|
||||
===================================================================
|
||||
--- redis-7.0.0.orig/src/zmalloc.c
|
||||
+++ redis-7.0.0/src/zmalloc.c
|
||||
@@ -79,6 +79,15 @@ void zlibc_free(void *ptr) {
|
||||
#define realloc(ptr,size) tc_realloc(ptr,size)
|
||||
#define free(ptr) tc_free(ptr)
|
||||
#elif defined(USE_JEMALLOC)
|
||||
+#if USE_SYSTEM_JEMALLOC == yes
|
||||
+#define malloc(size) malloc(size)
|
||||
+#define calloc(count,size) calloc(count,size)
|
||||
+#define realloc(ptr,size) realloc(ptr,size)
|
||||
+#define free(ptr) free(ptr)
|
||||
+#define mallocx(size,flags) mallocx(size,flags)
|
||||
+#define dallocx(ptr,flags) dallocx(ptr,flags)
|
||||
+#define je_mallctl mallctl
|
||||
+#else
|
||||
#define malloc(size) je_malloc(size)
|
||||
#define calloc(count,size) je_calloc(count,size)
|
||||
#define realloc(ptr,size) je_realloc(ptr,size)
|
||||
@@ -86,6 +95,7 @@ void zlibc_free(void *ptr) {
|
||||
#define mallocx(size,flags) je_mallocx(size,flags)
|
||||
#define dallocx(ptr,flags) je_dallocx(ptr,flags)
|
||||
#endif
|
||||
+#endif
|
||||
|
||||
#define update_zmalloc_stat_alloc(__n) atomicIncr(used_memory,(__n))
|
||||
#define update_zmalloc_stat_free(__n) atomicDecr(used_memory,(__n))
|
||||
Index: redis-7.0.0/src/zmalloc.h
|
||||
===================================================================
|
||||
--- redis-7.0.0.orig/src/zmalloc.h
|
||||
+++ redis-7.0.0/src/zmalloc.h
|
||||
@@ -50,7 +50,11 @@
|
||||
#include <jemalloc/jemalloc.h>
|
||||
#if (JEMALLOC_VERSION_MAJOR == 2 && JEMALLOC_VERSION_MINOR >= 1) || (JEMALLOC_VERSION_MAJOR > 2)
|
||||
#define HAVE_MALLOC_SIZE 1
|
||||
+#if USE_SYSTEM_JEMALLOC == yes
|
||||
+#define zmalloc_size(p) malloc_usable_size(p)
|
||||
+#else
|
||||
#define zmalloc_size(p) je_malloc_usable_size(p)
|
||||
+#endif
|
||||
#else
|
||||
#error "Newer version of jemalloc required"
|
||||
#endif
|
||||
@ -1,3 +1,10 @@
|
||||
-------------------------------------------------------------------
|
||||
Mon Jul 4 09:41:49 UTC 2022 - Danilo Spinella <danilo.spinella@suse.com>
|
||||
|
||||
- Use bundled jemalloc to fix active defragmentation, fixes bsc#1200913.
|
||||
- Remove patch:
|
||||
* Add-support-for-USE_SYSTEM_JEMALLOC-flag.patch
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Wed Jun 29 10:54:08 UTC 2022 - Stefan Schubert <schubi@suse.com>
|
||||
|
||||
|
||||
@ -40,7 +40,6 @@ Source10: https://raw.githubusercontent.com/redis/redis-hashes/master/READ
|
||||
Patch0: %{name}-conf.patch
|
||||
Patch3: reproducible.patch
|
||||
Patch4: ppc-atomic.patch
|
||||
Patch5: Add-support-for-USE_SYSTEM_JEMALLOC-flag.patch
|
||||
BuildRequires: jemalloc-devel
|
||||
BuildRequires: libopenssl-devel >= 1.1.1
|
||||
BuildRequires: pkgconfig
|
||||
@ -68,14 +67,12 @@ echo "`grep -F %{name}-%{version}.tar.gz %{SOURCE10} | cut -d' ' -f4` %{SOURCE0
|
||||
%patch0
|
||||
%patch3 -p1
|
||||
%patch4 -p1
|
||||
%patch5 -p1
|
||||
|
||||
%build
|
||||
export HOST=OBS # for reproducible builds
|
||||
%make_build CFLAGS="%{optflags}" \
|
||||
BUILD_WITH_SYSTEMD=yes \
|
||||
BUILD_TLS=yes \
|
||||
USE_SYSTEM_JEMALLOC=yes
|
||||
BUILD_TLS=yes
|
||||
%sysusers_generate_pre %{SOURCE9} %{name}
|
||||
|
||||
%install
|
||||
|
||||
Loading…
Reference in New Issue
Block a user