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

Rename try_give_memory_back to a better free_unused_memory.

Browse Source 
JerryScript-DCO-1.0-Signed-off-by: Zoltan Herczeg zherczeg.u-szeged@partner.samsung.com
This commit is contained in:
Zoltan Herczeg
2016-06-13 05:35:53 -07:00
parent 495b24eebc
commit eac736ffa4
9 changed files with 38 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jerry-core/jmem/jmem-allocator-internal.h
+1 -1
View File
@@ -24,7 +24,7 @@
* @{
*/
extern void jmem_run_try_to_give_memory_back_callbacks (jmem_try_give_memory_back_severity_t);
extern void jmem_run_free_unused_memory_callbacks (jmem_free_unused_memory_severity_t);
/**
* @}
jerry-core/jmem/jmem-allocator.c
+13 -14
View File
@@ -30,7 +30,7 @@
/**
* The 'try to give memory back' callback
*/
static jmem_try_give_memory_back_callback_t jmem_try_give_memory_back_callback = NULL;
static jmem_free_unused_memory_callback_t jmem_free_unused_memory_callback = NULL;
/**
* Initialize memory allocators.
@@ -91,40 +91,39 @@ jmem_decompress_pointer (uintptr_t compressed_pointer) /**< pointer to decompres
* Register specified 'try to give memory back' callback routine
*/
void
jmem_register_a_try_give_memory_back_callback (jmem_try_give_memory_back_callback_t callback) /**< callback routine */
jmem_register_free_unused_memory_callback (jmem_free_unused_memory_callback_t callback) /**< callback routine */
{
/* Currently only one callback is supported */
JERRY_ASSERT (jmem_try_give_memory_back_callback == NULL);
JERRY_ASSERT (jmem_free_unused_memory_callback == NULL);
jmem_try_give_memory_back_callback = callback;
} /* jmem_register_a_try_give_memory_back_callback */
jmem_free_unused_memory_callback = callback;
} /* jmem_register_free_unused_memory_callback */
/**
* Unregister specified 'try to give memory back' callback routine
*/
void
jmem_unregister_a_try_give_memory_back_callback (jmem_try_give_memory_back_callback_t callback) /**< callback routine */
jmem_unregister_free_unused_memory_callback (jmem_free_unused_memory_callback_t callback) /**< callback routine */
{
/* Currently only one callback is supported */
JERRY_ASSERT (jmem_try_give_memory_back_callback == callback);
JERRY_ASSERT (jmem_free_unused_memory_callback == callback);
jmem_try_give_memory_back_callback = NULL;
} /* jmem_unregister_a_try_give_memory_back_callback */
jmem_free_unused_memory_callback = NULL;
} /* jmem_unregister_free_unused_memory_callback */
/**
* Run 'try to give memory back' callbacks with specified severity
*/
void
jmem_run_try_to_give_memory_back_callbacks (jmem_try_give_memory_back_severity_t severity) /**< severity of
the request */
jmem_run_free_unused_memory_callbacks (jmem_free_unused_memory_severity_t severity) /**< severity of the request */
{
if (jmem_try_give_memory_back_callback != NULL)
if (jmem_free_unused_memory_callback != NULL)
{
jmem_try_give_memory_back_callback (severity);
jmem_free_unused_memory_callback (severity);
}
jmem_pools_collect_empty ();
} /* jmem_run_try_to_give_memory_back_callbacks */
} /* jmem_run_free_unused_memory_callbacks */
#ifdef JMEM_STATS
/**
jerry-core/jmem/jmem-allocator.h
+6 -6
View File
@@ -64,14 +64,14 @@ typedef uint16_t jmem_cpointer_t;
*/
typedef enum
{
JMEM_TRY_GIVE_MEMORY_BACK_SEVERITY_LOW, /* 'low' severity */
JMEM_TRY_GIVE_MEMORY_BACK_SEVERITY_HIGH, /* 'high' severity */
} jmem_try_give_memory_back_severity_t;
JMEM_FREE_UNUSED_MEMORY_SEVERITY_LOW, /* 'low' severity */
JMEM_FREE_UNUSED_MEMORY_SEVERITY_HIGH, /* 'high' severity */
} jmem_free_unused_memory_severity_t;
/**
* A 'try give memory back' callback routine type.
*/
typedef void (*jmem_try_give_memory_back_callback_t) (jmem_try_give_memory_back_severity_t);
typedef void (*jmem_free_unused_memory_callback_t) (jmem_free_unused_memory_severity_t);
/**
* Get value of pointer from specified non-null compressed pointer value
@@ -117,8 +117,8 @@ extern void jmem_finalize (bool);
extern uintptr_t jmem_compress_pointer (const void *);
extern void *jmem_decompress_pointer (uintptr_t);
extern void jmem_register_a_try_give_memory_back_callback (jmem_try_give_memory_back_callback_t);
extern void jmem_unregister_a_try_give_memory_back_callback (jmem_try_give_memory_back_callback_t);
extern void jmem_register_free_unused_memory_callback (jmem_free_unused_memory_callback_t);
extern void jmem_unregister_free_unused_memory_callback (jmem_free_unused_memory_callback_t);
#ifdef JMEM_STATS
extern void jmem_stats_reset_peak (void);
jerry-core/jmem/jmem-heap.c
+6 -6
View File
@@ -380,12 +380,12 @@ jmem_heap_alloc_block (const size_t size)
VALGRIND_FREYA_CHECK_MEMPOOL_REQUEST;
#ifdef JMEM_GC_BEFORE_EACH_ALLOC
jmem_run_try_to_give_memory_back_callbacks (JMEM_TRY_GIVE_MEMORY_BACK_SEVERITY_HIGH);
jmem_run_free_unused_memory_callbacks (JMEM_FREE_UNUSED_MEMORY_SEVERITY_HIGH);
#endif /* JMEM_GC_BEFORE_EACH_ALLOC */
if (jmem_heap_allocated_size + size >= jmem_heap_limit)
{
jmem_run_try_to_give_memory_back_callbacks (JMEM_TRY_GIVE_MEMORY_BACK_SEVERITY_LOW);
jmem_run_free_unused_memory_callbacks (JMEM_FREE_UNUSED_MEMORY_SEVERITY_LOW);
}
void *data_space_p = jmem_heap_alloc_block_internal (size);
@@ -396,11 +396,11 @@ jmem_heap_alloc_block (const size_t size)
return data_space_p;
}
for (jmem_try_give_memory_back_severity_t severity = JMEM_TRY_GIVE_MEMORY_BACK_SEVERITY_LOW;
severity <= JMEM_TRY_GIVE_MEMORY_BACK_SEVERITY_HIGH;
severity = (jmem_try_give_memory_back_severity_t) (severity + 1))
for (jmem_free_unused_memory_severity_t severity = JMEM_FREE_UNUSED_MEMORY_SEVERITY_LOW;
severity <= JMEM_FREE_UNUSED_MEMORY_SEVERITY_HIGH;
severity = (jmem_free_unused_memory_severity_t) (severity + 1))
{
jmem_run_try_to_give_memory_back_callbacks (severity);
jmem_run_free_unused_memory_callbacks (severity);
data_space_p = jmem_heap_alloc_block_internal (size);
jerry-core/jmem/jmem-poolman.c
+1 -1
View File
@@ -133,7 +133,7 @@ inline void * __attribute__((hot)) __attr_always_inline___
jmem_pools_alloc (void)
{
#ifdef JMEM_GC_BEFORE_EACH_ALLOC
jmem_run_try_to_give_memory_back_callbacks (JMEM_TRY_GIVE_MEMORY_BACK_SEVERITY_HIGH);
jmem_run_free_unused_memory_callbacks (JMEM_FREE_UNUSED_MEMORY_SEVERITY_HIGH);
#endif /* JMEM_GC_BEFORE_EACH_ALLOC */
if (jmem_free_chunk_p != NULL)