archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-16 14:08:47 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Switch to siple "commpression" scheme

Browse source
This commit is contained in:
Dmitry Stogov 2018-03-02 10:01:08 +03:00
parent 8b5e76c790
commit 06c6c632c3
1 changed files with 24 additions and 50 deletions
Download patch file Download diff file Expand all files Collapse all files

74
Zend/zend_gc.c
View file

@ -126,16 +126,12 @@
#define GC_DEFAULT_BUF_SIZE (16 * 1024) #define GC_DEFAULT_BUF_SIZE (16 * 1024)
#define GC_BUF_GROW_STEP (128 * 1024) #define GC_BUF_GROW_STEP (128 * 1024)
#define GC_COMPRESS_FACTOR 4096 /* shold be 0 to disable compression */ #define GC_MAX_UNCOMPRESSED (1024 * 1024)
#define GC_MAX_UNCOMPRESSED ((1024 * 1024) - GC_COMPRESS_FACTOR) #define GC_MAX_BUF_SIZE 0x40000000
#define GC_MAX_BUF_SIZE (GC_COMPRESS_FACTOR ? (0x40000000) : GC_MAX_UNCOMPRESSED)
#define GC_NEED_COMPRESSION(addr) \
((GC_COMPRESS_FACTOR > 0) && (addr >= GC_MAX_UNCOMPRESSED))
#define GC_THRESHOLD_DEFAULT 10000 #define GC_THRESHOLD_DEFAULT 10000
#define GC_THRESHOLD_STEP 10000 #define GC_THRESHOLD_STEP 10000
#define GC_THRESHOLD_MAX (GC_COMPRESS_FACTOR ? 1000000000 : 1000000) #define GC_THRESHOLD_MAX 1000000000
#define GC_THRESHOLD_TRIGGER 100 #define GC_THRESHOLD_TRIGGER 100
/* GC flags */ /* GC flags */
@ -245,25 +241,27 @@ static zend_gc_globals gc_globals;
# define GC_TRACE(str) # define GC_TRACE(str)
#endif #endif
static zend_always_inline uint32_t gc_compress(uint32_t idx) static zend_always_inline uint32_t gc_compress(uint32_t addr)
{ {
ZEND_ASSERT(GC_NEED_COMPRESSION(idx)); return addr % GC_MAX_UNCOMPRESSED;
return GC_MAX_UNCOMPRESSED + ((idx - GC_MAX_UNCOMPRESSED) % GC_COMPRESS_FACTOR);
} }
static zend_always_inline gc_root_buffer* gc_decompress(zend_refcounted *ref, uint32_t idx) static zend_always_inline gc_root_buffer* gc_decompress(zend_refcounted *ref, uint32_t addr)
{ {
ZEND_ASSERT(GC_NEED_COMPRESSION(idx)); gc_root_buffer *root = GC_G(buf) + addr;
while (idx < GC_G(first_unused)) {
gc_root_buffer *root = GC_G(buf) + idx;
if (root->ref == ref) { if (EXPECTED(GC_GET_PTR(root->ref) == ref)) {
return root;
}
while (1) {
addr += GC_MAX_UNCOMPRESSED;
ZEND_ASSERT(addr < GC_G(first_unused));
root = GC_G(buf) + addr;
if (GC_GET_PTR(root->ref) == ref) {
return root; return root;
} }
idx += GC_COMPRESS_FACTOR;
} }
ZEND_ASSERT(0);
return NULL;
} }
static zend_always_inline uint32_t gc_fetch_unused(void) static zend_always_inline uint32_t gc_fetch_unused(void)
@ -485,18 +483,6 @@ static void gc_adjust_threshold(int count)
} }
} }
static zend_never_inline void ZEND_FASTCALL gc_add_compressed(zend_refcounted *ref, uint32_t addr)
{
addr = gc_compress(addr);
GC_REF_SET_INFO(ref, addr | GC_PURPLE);
GC_G(num_roots)++;
GC_BENCH_INC(zval_buffered);
GC_BENCH_INC(root_buf_length);
GC_BENCH_PEAK(root_buf_peak, root_buf_length);
}
static zend_never_inline void ZEND_FASTCALL gc_possible_root_when_full(zend_refcounted *ref) static zend_never_inline void ZEND_FASTCALL gc_possible_root_when_full(zend_refcounted *ref)
{ {
uint32_t addr; uint32_t addr;
@ -530,11 +516,7 @@ static zend_never_inline void ZEND_FASTCALL gc_possible_root_when_full(zend_refc
newRoot->ref = ref; /* GC_ROOT tag is 0 */ newRoot->ref = ref; /* GC_ROOT tag is 0 */
GC_TRACE_SET_COLOR(ref, GC_PURPLE); GC_TRACE_SET_COLOR(ref, GC_PURPLE);
if (UNEXPECTED(GC_NEED_COMPRESSION(addr))) { addr = gc_compress(addr);
gc_add_compressed(ref, addr);
return;
}
GC_REF_SET_INFO(ref, addr | GC_PURPLE); GC_REF_SET_INFO(ref, addr | GC_PURPLE);
GC_G(num_roots)++; GC_G(num_roots)++;
@ -570,11 +552,7 @@ ZEND_API void ZEND_FASTCALL gc_possible_root(zend_refcounted *ref)
newRoot->ref = ref; /* GC_ROOT tag is 0 */ newRoot->ref = ref; /* GC_ROOT tag is 0 */
GC_TRACE_SET_COLOR(ref, GC_PURPLE); GC_TRACE_SET_COLOR(ref, GC_PURPLE);
if (UNEXPECTED(GC_NEED_COMPRESSION(addr))) { addr = gc_compress(addr);
gc_add_compressed(ref, addr);
return;
}
GC_REF_SET_INFO(ref, addr | GC_PURPLE); GC_REF_SET_INFO(ref, addr | GC_PURPLE);
GC_G(num_roots)++; GC_G(num_roots)++;
@ -585,8 +563,8 @@ ZEND_API void ZEND_FASTCALL gc_possible_root(zend_refcounted *ref)
static zend_never_inline void ZEND_FASTCALL gc_remove_compressed(zend_refcounted *ref, uint32_t addr) static zend_never_inline void ZEND_FASTCALL gc_remove_compressed(zend_refcounted *ref, uint32_t addr)
{ {
gc_root_buffer *root = gc_decompress(ref, addr); gc_root_buffer *root = gc_decompress(ref, addr);
gc_remove_from_roots(root); gc_remove_from_roots(root);
} }
ZEND_API void ZEND_FASTCALL gc_remove_from_buffer(zend_refcounted *ref) ZEND_API void ZEND_FASTCALL gc_remove_from_buffer(zend_refcounted *ref)
@ -603,7 +581,8 @@ ZEND_API void ZEND_FASTCALL gc_remove_from_buffer(zend_refcounted *ref)
} }
GC_REF_SET_INFO(ref, 0); GC_REF_SET_INFO(ref, 0);
if (UNEXPECTED(GC_NEED_COMPRESSION(addr))) { /* Perform decopression only in case of large buffers */
if (UNEXPECTED(GC_G(first_unused) >= GC_MAX_UNCOMPRESSED)) {
gc_remove_compressed(ref, addr); gc_remove_compressed(ref, addr);
return; return;
} }
@ -843,10 +822,7 @@ static void gc_compact(void)
p = buf[scan].ref; p = buf[scan].ref;
buf[free].ref = p; buf[free].ref = p;
p = GC_GET_PTR(p); p = GC_GET_PTR(p);
addr = free; addr = gc_compress(free);
if (UNEXPECTED(GC_NEED_COMPRESSION(addr))) {
addr = gc_compress(addr);
}
GC_REF_SET_INFO(p, addr | GC_REF_COLOR(p)); GC_REF_SET_INFO(p, addr | GC_REF_COLOR(p));
free++; free++;
scan--; scan--;
@ -1009,9 +985,7 @@ static void gc_add_garbage(zend_refcounted *ref)
buf = GC_G(buf) + addr; buf = GC_G(buf) + addr;
buf->ref = GC_MAKE_GARBAGE(ref); buf->ref = GC_MAKE_GARBAGE(ref);
if (UNEXPECTED(GC_NEED_COMPRESSION(addr))) { addr = gc_compress(addr);
addr = gc_compress(addr);
}
GC_REF_SET_INFO(ref, addr | GC_BLACK); GC_REF_SET_INFO(ref, addr | GC_BLACK);
GC_G(num_roots)++; GC_G(num_roots)++;
} }