From 286e515f9f1003b291cc270af98e50b11eb3279b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?D=C3=A1niel=20B=C3=A1tyai?= Date: Tue, 11 Aug 2020 09:51:43 +0200 Subject: [PATCH] Fix mem-stress-test to properly run gc before allocs (#4125) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit JerryScript-DCO-1.0-Signed-off-by: Dániel Bátyai daniel.batyai@h-lab.eu --- jerry-core/jmem/jmem-heap.c | 13 ++++++++++--- jerry-core/jmem/jmem-poolman.c | 2 +- 2 files changed, 11 insertions(+), 4 deletions(-) diff --git a/jerry-core/jmem/jmem-heap.c b/jerry-core/jmem/jmem-heap.c index 8b9cb0fb6..b5afc61f0 100644 --- a/jerry-core/jmem/jmem-heap.c +++ b/jerry-core/jmem/jmem-heap.c @@ -280,11 +280,13 @@ jmem_heap_gc_and_alloc_block (const size_t size, /**< required memory size */ #if !ENABLED (JERRY_MEM_GC_BEFORE_EACH_ALLOC) if (JERRY_CONTEXT (jmem_heap_allocated_size) + size >= JERRY_CONTEXT (jmem_heap_limit)) -#endif /* !ENABLED (JERRY_MEM_GC_BEFORE_EACH_ALLOC) */ { pressure = JMEM_PRESSURE_LOW; ecma_free_unused_memory (pressure); } +#else /* !ENABLED (JERRY_MEM_GC_BEFORE_EACH_ALLOC) */ + ecma_gc_run (); +#endif /* ENABLED (JERRY_MEM_GC_BEFORE_EACH_ALLOC) */ void *data_space_p = jmem_heap_alloc (size); @@ -534,10 +536,12 @@ jmem_heap_realloc_block (void *ptr, /**< memory region to reallocate */ #if !ENABLED (JERRY_MEM_GC_BEFORE_EACH_ALLOC) if (JERRY_CONTEXT (jmem_heap_allocated_size) + required_size >= JERRY_CONTEXT (jmem_heap_limit)) -#endif /* !ENABLED (JERRY_MEM_GC_BEFORE_EACH_ALLOC) */ { ecma_free_unused_memory (JMEM_PRESSURE_LOW); } +#else /* !ENABLED (JERRY_MEM_GC_BEFORE_EACH_ALLOC) */ + ecma_gc_run (); +#endif /* ENABLED (JERRY_MEM_GC_BEFORE_EACH_ALLOC) */ jmem_heap_free_t *prev_p = jmem_heap_find_prev (block_p); JMEM_VALGRIND_DEFINED_SPACE (prev_p, sizeof (jmem_heap_free_t)); @@ -650,12 +654,15 @@ jmem_heap_realloc_block (void *ptr, /**< memory region to reallocate */ return ret_block_p; #else /* ENABLED (JERRY_SYSTEM_ALLOCATOR) */ const size_t required_size = new_size - old_size; + #if !ENABLED (JERRY_MEM_GC_BEFORE_EACH_ALLOC) if (JERRY_CONTEXT (jmem_heap_allocated_size) + required_size >= JERRY_CONTEXT (jmem_heap_limit)) -#endif /* !ENABLED (JERRY_MEM_GC_BEFORE_EACH_ALLOC) */ { ecma_free_unused_memory (JMEM_PRESSURE_LOW); } +#else /* !ENABLED (JERRY_MEM_GC_BEFORE_EACH_ALLOC) */ + ecma_gc_run (); +#endif /* ENABLED (JERRY_MEM_GC_BEFORE_EACH_ALLOC) */ JERRY_CONTEXT (jmem_heap_allocated_size) += required_size; diff --git a/jerry-core/jmem/jmem-poolman.c b/jerry-core/jmem/jmem-poolman.c index e68dc4e0c..47281d405 100644 --- a/jerry-core/jmem/jmem-poolman.c +++ b/jerry-core/jmem/jmem-poolman.c @@ -59,7 +59,7 @@ extern inline void * JERRY_ATTR_HOT JERRY_ATTR_ALWAYS_INLINE jmem_pools_alloc (size_t size) /**< size of the chunk */ { #if ENABLED (JERRY_MEM_GC_BEFORE_EACH_ALLOC) - ecma_free_unused_memory (JMEM_PRESSURE_LOW); + ecma_gc_run (); #endif /* ENABLED (JERRY_MEM_GC_BEFORE_EACH_ALLOC) */ #if ENABLED (JERRY_CPOINTER_32_BIT)