fluencelabs/redis
1
0
Fork 0
mirror of https://github.com/fluencelabs/redis synced 2025-03-19 17:10:50 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #4927 from oranagra/defrag_32bit_fix

Browse Source 
Active defrag fixes for 32bit builds
This commit is contained in:
Salvatore Sanfilippo 2018-05-17 12:24:40 +02:00 committed by GitHub
commit 13779c11f8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 13 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
deps/jemalloc/src/jemalloc.c vendored
View File

@ -2614,8 +2614,8 @@ je_get_defrag_hint(void* ptr, int *bin_util, int *run_util) {
if (chunk != (arena_chunk_t *)CHUNK_ADDR2BASE(bin->runcur)) { if (chunk != (arena_chunk_t *)CHUNK_ADDR2BASE(bin->runcur)) {
arena_bin_info_t *bin_info = &arena_bin_info[run->binind]; arena_bin_info_t *bin_info = &arena_bin_info[run->binind];
size_t availregs = bin_info->nregs * bin->stats.curruns; size_t availregs = bin_info->nregs * bin->stats.curruns;
*bin_util = (bin->stats.curregs<<16) / availregs; *bin_util = ((long long)bin->stats.curregs<<16) / availregs;
*run_util = ((bin_info->nregs - run->nfree)<<16) / bin_info->nregs; *run_util = ((long long)(bin_info->nregs - run->nfree)<<16) / bin_info->nregs;
defrag = 1; defrag = 1;
} }
malloc_mutex_unlock(&bin->lock); malloc_mutex_unlock(&bin->lock);

2
src/server.c
View File

@ -1019,7 +1019,7 @@ int serverCron(struct aeEventLoop *eventLoop, long long id, void *clientData) {
if (zmalloc_used_memory() > server.stat_peak_memory) if (zmalloc_used_memory() > server.stat_peak_memory)
server.stat_peak_memory = zmalloc_used_memory(); server.stat_peak_memory = zmalloc_used_memory();
run_with_period(10) { run_with_period(100) {
/* Sample the RSS and other metrics here since this is a relatively slow call. /* Sample the RSS and other metrics here since this is a relatively slow call.
* We must sample the zmalloc_used at the same time we take the rss, otherwise * We must sample the zmalloc_used at the same time we take the rss, otherwise
* the frag ratio calculate may be off (ratio of two samples at different times) */ * the frag ratio calculate may be off (ratio of two samples at different times) */

5
src/zmalloc.c
View File

@ -301,10 +301,13 @@ size_t zmalloc_get_rss(void) {
int zmalloc_get_allocator_info(size_t *allocated, int zmalloc_get_allocator_info(size_t *allocated,
size_t *active, size_t *active,
size_t *resident) { size_t *resident) {
size_t epoch = 1, sz = sizeof(size_t); uint64_t epoch = 1;
size_t sz;
*allocated = *resident = *active = 0; *allocated = *resident = *active = 0;
/* Update the statistics cached by mallctl. */ /* Update the statistics cached by mallctl. */
sz = sizeof(epoch);
je_mallctl("epoch", &epoch, &sz, &epoch, sz); je_mallctl("epoch", &epoch, &sz, &epoch, sz);
sz = sizeof(size_t);
/* Unlike RSS, this does not include RSS from shared libraries and other non /* Unlike RSS, this does not include RSS from shared libraries and other non
* heap mappings. */ * heap mappings. */
je_mallctl("stats.resident", resident, &sz, NULL, 0); je_mallctl("stats.resident", resident, &sz, NULL, 0);

10
tests/unit/memefficiency.tcl
View File

@ -48,7 +48,8 @@ start_server {tags {"defrag"}} {
r config set maxmemory-policy allkeys-lru r config set maxmemory-policy allkeys-lru
r debug populate 700000 asdf 150 r debug populate 700000 asdf 150
r debug populate 170000 asdf 300 r debug populate 170000 asdf 300
after 20 ;# serverCron only updates the info once in 10ms r ping ;# trigger eviction following the previous population
after 120 ;# serverCron only updates the info once in 100ms
set frag [s allocator_frag_ratio] set frag [s allocator_frag_ratio]
if {$::verbose} { if {$::verbose} {
puts "frag $frag" puts "frag $frag"
@ -68,11 +69,12 @@ start_server {tags {"defrag"}} {
[s active_defrag_running] eq 0 [s active_defrag_running] eq 0
} else { } else {
puts [r info memory] puts [r info memory]
puts [r memory malloc-stats]
fail "defrag didn't stop." fail "defrag didn't stop."
} }
# test the the fragmentation is lower # test the the fragmentation is lower
after 20 ;# serverCron only updates the info once in 10ms after 120 ;# serverCron only updates the info once in 100ms
set frag [s allocator_frag_ratio] set frag [s allocator_frag_ratio]
if {$::verbose} { if {$::verbose} {
puts "frag $frag" puts "frag $frag"
@ -140,7 +142,7 @@ start_server {tags {"defrag"}} {
assert {[r dbsize] == 250008} assert {[r dbsize] == 250008}
# start defrag # start defrag
after 20 ;# serverCron only updates the info once in 10ms after 120 ;# serverCron only updates the info once in 100ms
set frag [s allocator_frag_ratio] set frag [s allocator_frag_ratio]
if {$::verbose} { if {$::verbose} {
puts "frag $frag" puts "frag $frag"
@ -167,7 +169,7 @@ start_server {tags {"defrag"}} {
} }
# test the the fragmentation is lower # test the the fragmentation is lower
after 20 ;# serverCron only updates the info once in 10ms after 120 ;# serverCron only updates the info once in 100ms
set frag [s allocator_frag_ratio] set frag [s allocator_frag_ratio]
set max_latency 0 set max_latency 0
foreach event [r latency latest] { foreach event [r latency latest] {