YourWishes/jerryscript
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix mem-stress-test to properly run gc before allocs (#4125)

Browse Source 
JerryScript-DCO-1.0-Signed-off-by: Dániel Bátyai daniel.batyai@h-lab.eu
This commit is contained in:
Dániel Bátyai
2020-08-11 09:51:43 +02:00
committed by GitHub
parent 39fe04814e
commit 286e515f9f
2 changed files with 11 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jerry-core/jmem/jmem-heap.c
+10 -3
View File
@@ -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;
jerry-core/jmem/jmem-poolman.c
+1 -1
View File
@@ -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)