Remove valkey specific changes in jemalloc source code

cmake/Modules/SourceFiles.cmake

@@ -74,6 +74,7 @@ set(VALKEY_SERVER_SRCS
     ${CMAKE_SOURCE_DIR}/src/geohash.c
     ${CMAKE_SOURCE_DIR}/src/geohash_helper.c
     ${CMAKE_SOURCE_DIR}/src/childinfo.c
+    ${CMAKE_SOURCE_DIR}/src/allocator_defrag.c
     ${CMAKE_SOURCE_DIR}/src/defrag.c
     ${CMAKE_SOURCE_DIR}/src/siphash.c
     ${CMAKE_SOURCE_DIR}/src/rax.c

deps/jemalloc/include/jemalloc/internal/jemalloc_internal_inlines_c.h

@@ -337,55 +337,4 @@ imalloc_fastpath(size_t size, void *(fallback_alloc)(size_t)) {
 	return fallback_alloc(size);
 }
 
-JEMALLOC_ALWAYS_INLINE int
-iget_defrag_hint(tsdn_t *tsdn, void* ptr) {
-	int defrag = 0;
-	emap_alloc_ctx_t alloc_ctx;
-	emap_alloc_ctx_lookup(tsdn, &arena_emap_global, ptr, &alloc_ctx);
-	if (likely(alloc_ctx.slab)) {
-		/* Small allocation. */
-		edata_t *slab = emap_edata_lookup(tsdn, &arena_emap_global, ptr);
-		arena_t *arena = arena_get_from_edata(slab);
-		szind_t binind = edata_szind_get(slab);
-		unsigned binshard = edata_binshard_get(slab);
-		bin_t *bin = arena_get_bin(arena, binind, binshard);
-		malloc_mutex_lock(tsdn, &bin->lock);
-		arena_dalloc_bin_locked_info_t info;
-		arena_dalloc_bin_locked_begin(&info, binind);
-		/* Don't bother moving allocations from the slab currently used for new allocations */
-		if (slab != bin->slabcur) {
-			int free_in_slab = edata_nfree_get(slab);
-			if (free_in_slab) {
-				const bin_info_t *bin_info = &bin_infos[binind];
-				/* Find number of non-full slabs and the number of regs in them */
-				unsigned long curslabs = 0;
-				size_t curregs = 0;
-				/* Run on all bin shards (usually just one) */
-				for (uint32_t i=0; i< bin_info->n_shards; i++) {
-					bin_t *bb = arena_get_bin(arena, binind, i);
-					curslabs += bb->stats.nonfull_slabs;
-					/* Deduct the regs in full slabs (they're not part of the game) */
-					unsigned long full_slabs = bb->stats.curslabs - bb->stats.nonfull_slabs;
-					curregs += bb->stats.curregs - full_slabs * bin_info->nregs;
-					if (bb->slabcur) {
-						/* Remove slabcur from the overall utilization (not a candidate to nove from) */
-						curregs -= bin_info->nregs - edata_nfree_get(bb->slabcur);
-						curslabs -= 1;
-					}
-				}
-				/* Compare the utilization ratio of the slab in question to the total average
-				 * among non-full slabs. To avoid precision loss in division, we do that by
-				 * extrapolating the usage of the slab as if all slabs have the same usage.
-				 * If this slab is less used than the average, we'll prefer to move the data
-				 * to hopefully more used ones. To avoid stagnation when all slabs have the same
-				 * utilization, we give additional 12.5% weight to the decision to defrag. */
-				defrag = (bin_info->nregs - free_in_slab) * curslabs <= curregs + curregs / 8;
-			}
-		}
-		arena_dalloc_bin_locked_finish(tsdn, arena, bin, &info);
-		malloc_mutex_unlock(tsdn, &bin->lock);
-	}
-	return defrag;
-}
-
 #endif /* JEMALLOC_INTERNAL_INLINES_C_H */

deps/jemalloc/include/jemalloc/jemalloc_macros.h.in

@@ -147,7 +147,3 @@
 #else
 #  define JEMALLOC_SYS_NOTHROW JEMALLOC_NOTHROW
 #endif
-
-/* This version of Jemalloc, modified for Redis, has the je_get_defrag_hint()
- * function. */
-#define JEMALLOC_FRAG_HINT

deps/jemalloc/src/jemalloc.c

@@ -4474,12 +4474,3 @@ jemalloc_postfork_child(void) {
 }
 
 /******************************************************************************/
-
-/* Helps the application decide if a pointer is worth re-allocating in order to reduce fragmentation.
- * returns 1 if the allocation should be moved, and 0 if the allocation be kept.
- * If the application decides to re-allocate it should use MALLOCX_TCACHE_NONE when doing so. */
-JEMALLOC_EXPORT int JEMALLOC_NOTHROW
-get_defrag_hint(void* ptr) {
-	assert(ptr != NULL);
-	return iget_defrag_hint(TSDN_NULL, ptr);
-}

src/Makefile

@@ -414,7 +414,7 @@ endif
 ENGINE_NAME=valkey
 SERVER_NAME=$(ENGINE_NAME)-server$(PROG_SUFFIX)
 ENGINE_SENTINEL_NAME=$(ENGINE_NAME)-sentinel$(PROG_SUFFIX)
-ENGINE_SERVER_OBJ=threads_mngr.o adlist.o quicklist.o ae.o anet.o dict.o kvstore.o server.o sds.o zmalloc.o lzf_c.o lzf_d.o pqsort.o zipmap.o sha1.o ziplist.o release.o memory_prefetch.o io_threads.o networking.o util.o object.o db.o replication.o rdb.o t_string.o t_list.o t_set.o t_zset.o t_hash.o config.o aof.o pubsub.o multi.o debug.o sort.o intset.o syncio.o cluster.o cluster_legacy.o cluster_slot_stats.o crc16.o endianconv.o slowlog.o eval.o bio.o rio.o rand.o memtest.o syscheck.o crcspeed.o crccombine.o crc64.o bitops.o sentinel.o notify.o setproctitle.o blocked.o hyperloglog.o latency.o sparkline.o valkey-check-rdb.o valkey-check-aof.o geo.o lazyfree.o module.o evict.o expire.o geohash.o geohash_helper.o childinfo.o defrag.o siphash.o rax.o t_stream.o listpack.o localtime.o lolwut.o lolwut5.o lolwut6.o acl.o tracking.o socket.o tls.o sha256.o timeout.o setcpuaffinity.o monotonic.o mt19937-64.o resp_parser.o call_reply.o script_lua.o script.o functions.o function_lua.o commands.o strl.o connection.o unix.o logreqres.o
+ENGINE_SERVER_OBJ=threads_mngr.o adlist.o quicklist.o ae.o anet.o dict.o kvstore.o server.o sds.o zmalloc.o lzf_c.o lzf_d.o pqsort.o zipmap.o sha1.o ziplist.o release.o memory_prefetch.o io_threads.o networking.o util.o object.o db.o replication.o rdb.o t_string.o t_list.o t_set.o t_zset.o t_hash.o config.o aof.o pubsub.o multi.o debug.o sort.o intset.o syncio.o cluster.o cluster_legacy.o cluster_slot_stats.o crc16.o endianconv.o slowlog.o eval.o bio.o rio.o rand.o memtest.o syscheck.o crcspeed.o crccombine.o crc64.o bitops.o sentinel.o notify.o setproctitle.o blocked.o hyperloglog.o latency.o sparkline.o valkey-check-rdb.o valkey-check-aof.o geo.o lazyfree.o module.o evict.o expire.o geohash.o geohash_helper.o childinfo.o allocator_defrag.o defrag.o siphash.o rax.o t_stream.o listpack.o localtime.o lolwut.o lolwut5.o lolwut6.o acl.o tracking.o socket.o tls.o sha256.o timeout.o setcpuaffinity.o monotonic.o mt19937-64.o resp_parser.o call_reply.o script_lua.o script.o functions.o function_lua.o commands.o strl.o connection.o unix.o logreqres.o
 ENGINE_CLI_NAME=$(ENGINE_NAME)-cli$(PROG_SUFFIX)
 ENGINE_CLI_OBJ=anet.o adlist.o dict.o valkey-cli.o zmalloc.o release.o ae.o serverassert.o crcspeed.o crccombine.o crc64.o siphash.o crc16.o monotonic.o cli_common.o mt19937-64.o strl.o cli_commands.o
 ENGINE_BENCHMARK_NAME=$(ENGINE_NAME)-benchmark$(PROG_SUFFIX)