Skip to content

Commit eac736f

Browse files
zherczegzherczeg
committed
Rename try_give_memory_back to a better free_unused_memory.
JerryScript-DCO-1.0-Signed-off-by: Zoltan Herczeg [email protected]
1 parent 495b24e commit eac736f

File tree

9 files changed

+38
-40
lines changed

9 files changed

+38
-40
lines changed

‎jerry-core/ecma/base/ecma-gc.c

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -564,10 +564,9 @@ ecma_gc_run (void)
564564
* Try to free some memory (depending on severity).
565565
*/
566566
void
567-
ecma_try_to_give_back_some_memory (jmem_try_give_memory_back_severity_t severity) /**< severity of
568-
* the request */
567+
ecma_free_unused_memory (jmem_free_unused_memory_severity_t severity) /**< severity of the request */
569568
{
570-
if (severity == JMEM_TRY_GIVE_MEMORY_BACK_SEVERITY_LOW)
569+
if (severity == JMEM_FREE_UNUSED_MEMORY_SEVERITY_LOW)
571570
{
572571
/*
573572
* If there is enough newly allocated objects since last GC, probably it is worthwhile to start GC now.
@@ -580,12 +579,12 @@ ecma_try_to_give_back_some_memory (jmem_try_give_memory_back_severity_t severity
580579
}
581580
else
582581
{
583-
JERRY_ASSERT (severity == JMEM_TRY_GIVE_MEMORY_BACK_SEVERITY_HIGH);
582+
JERRY_ASSERT (severity == JMEM_FREE_UNUSED_MEMORY_SEVERITY_HIGH);
584583

585584
/* Freeing as much memory as we currently can */
586585
ecma_gc_run ();
587586
}
588-
} /* ecma_try_to_give_back_some_memory */
587+
} /* ecma_free_unused_memory */
589588

590589
/**
591590
* @}

‎jerry-core/ecma/base/ecma-gc.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ extern void ecma_init_gc_info (ecma_object_t *);
3131
extern void ecma_ref_object (ecma_object_t *);
3232
extern void ecma_deref_object (ecma_object_t *);
3333
extern void ecma_gc_run (void);
34-
extern void ecma_try_to_give_back_some_memory (jmem_try_give_memory_back_severity_t);
34+
extern void ecma_free_unused_memory (jmem_free_unused_memory_severity_t);
3535

3636
/**
3737
* @}

‎jerry-core/ecma/base/ecma-init-finalize.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ ecma_init (void)
3939
ecma_lcache_init ();
4040
ecma_init_environment ();
4141

42-
jmem_register_a_try_give_memory_back_callback (ecma_try_to_give_back_some_memory);
42+
jmem_register_free_unused_memory_callback (ecma_free_unused_memory);
4343
} /* ecma_init */
4444

4545
/**
@@ -48,7 +48,7 @@ ecma_init (void)
4848
void
4949
ecma_finalize (void)
5050
{
51-
jmem_unregister_a_try_give_memory_back_callback (ecma_try_to_give_back_some_memory);
51+
jmem_unregister_free_unused_memory_callback (ecma_free_unused_memory);
5252

5353
ecma_finalize_environment ();
5454
ecma_finalize_builtins ();

‎jerry-core/jmem/jmem-allocator-internal.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
* @{
2525
*/
2626

27-
extern void jmem_run_try_to_give_memory_back_callbacks (jmem_try_give_memory_back_severity_t);
27+
extern void jmem_run_free_unused_memory_callbacks (jmem_free_unused_memory_severity_t);
2828

2929
/**
3030
* @}

‎jerry-core/jmem/jmem-allocator.c

Lines changed: 13 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
/**
3131
* The 'try to give memory back' callback
3232
*/
33-
static jmem_try_give_memory_back_callback_t jmem_try_give_memory_back_callback = NULL;
33+
static jmem_free_unused_memory_callback_t jmem_free_unused_memory_callback = NULL;
3434

3535
/**
3636
* Initialize memory allocators.
@@ -91,40 +91,39 @@ jmem_decompress_pointer (uintptr_t compressed_pointer) /**< pointer to decompres
9191
* Register specified 'try to give memory back' callback routine
9292
*/
9393
void
94-
jmem_register_a_try_give_memory_back_callback (jmem_try_give_memory_back_callback_t callback) /**< callback routine */
94+
jmem_register_free_unused_memory_callback (jmem_free_unused_memory_callback_t callback) /**< callback routine */
9595
{
9696
/* Currently only one callback is supported */
97-
JERRY_ASSERT (jmem_try_give_memory_back_callback == NULL);
97+
JERRY_ASSERT (jmem_free_unused_memory_callback == NULL);
9898

99-
jmem_try_give_memory_back_callback = callback;
100-
} /* jmem_register_a_try_give_memory_back_callback */
99+
jmem_free_unused_memory_callback = callback;
100+
} /* jmem_register_free_unused_memory_callback */
101101

102102
/**
103103
* Unregister specified 'try to give memory back' callback routine
104104
*/
105105
void
106-
jmem_unregister_a_try_give_memory_back_callback (jmem_try_give_memory_back_callback_t callback) /**< callback routine */
106+
jmem_unregister_free_unused_memory_callback (jmem_free_unused_memory_callback_t callback) /**< callback routine */
107107
{
108108
/* Currently only one callback is supported */
109-
JERRY_ASSERT (jmem_try_give_memory_back_callback == callback);
109+
JERRY_ASSERT (jmem_free_unused_memory_callback == callback);
110110

111-
jmem_try_give_memory_back_callback = NULL;
112-
} /* jmem_unregister_a_try_give_memory_back_callback */
111+
jmem_free_unused_memory_callback = NULL;
112+
} /* jmem_unregister_free_unused_memory_callback */
113113

114114
/**
115115
* Run 'try to give memory back' callbacks with specified severity
116116
*/
117117
void
118-
jmem_run_try_to_give_memory_back_callbacks (jmem_try_give_memory_back_severity_t severity) /**< severity of
119-
the request */
118+
jmem_run_free_unused_memory_callbacks (jmem_free_unused_memory_severity_t severity) /**< severity of the request */
120119
{
121-
if (jmem_try_give_memory_back_callback != NULL)
120+
if (jmem_free_unused_memory_callback != NULL)
122121
{
123-
jmem_try_give_memory_back_callback (severity);
122+
jmem_free_unused_memory_callback (severity);
124123
}
125124

126125
jmem_pools_collect_empty ();
127-
} /* jmem_run_try_to_give_memory_back_callbacks */
126+
} /* jmem_run_free_unused_memory_callbacks */
128127

129128
#ifdef JMEM_STATS
130129
/**

‎jerry-core/jmem/jmem-allocator.h

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -64,14 +64,14 @@ typedef uint16_t jmem_cpointer_t;
6464
*/
6565
typedef enum
6666
{
67-
JMEM_TRY_GIVE_MEMORY_BACK_SEVERITY_LOW, /* 'low' severity */
68-
JMEM_TRY_GIVE_MEMORY_BACK_SEVERITY_HIGH, /* 'high' severity */
69-
} jmem_try_give_memory_back_severity_t;
67+
JMEM_FREE_UNUSED_MEMORY_SEVERITY_LOW, /* 'low' severity */
68+
JMEM_FREE_UNUSED_MEMORY_SEVERITY_HIGH, /* 'high' severity */
69+
} jmem_free_unused_memory_severity_t;
7070

7171
/**
7272
* A 'try give memory back' callback routine type.
7373
*/
74-
typedef void (*jmem_try_give_memory_back_callback_t) (jmem_try_give_memory_back_severity_t);
74+
typedef void (*jmem_free_unused_memory_callback_t) (jmem_free_unused_memory_severity_t);
7575

7676
/**
7777
* Get value of pointer from specified non-null compressed pointer value
@@ -117,8 +117,8 @@ extern void jmem_finalize (bool);
117117
extern uintptr_t jmem_compress_pointer (const void *);
118118
extern void *jmem_decompress_pointer (uintptr_t);
119119

120-
extern void jmem_register_a_try_give_memory_back_callback (jmem_try_give_memory_back_callback_t);
121-
extern void jmem_unregister_a_try_give_memory_back_callback (jmem_try_give_memory_back_callback_t);
120+
extern void jmem_register_free_unused_memory_callback (jmem_free_unused_memory_callback_t);
121+
extern void jmem_unregister_free_unused_memory_callback (jmem_free_unused_memory_callback_t);
122122

123123
#ifdef JMEM_STATS
124124
extern void jmem_stats_reset_peak (void);

‎jerry-core/jmem/jmem-heap.c

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -380,12 +380,12 @@ jmem_heap_alloc_block (const size_t size)
380380
VALGRIND_FREYA_CHECK_MEMPOOL_REQUEST;
381381

382382
#ifdef JMEM_GC_BEFORE_EACH_ALLOC
383-
jmem_run_try_to_give_memory_back_callbacks (JMEM_TRY_GIVE_MEMORY_BACK_SEVERITY_HIGH);
383+
jmem_run_free_unused_memory_callbacks (JMEM_FREE_UNUSED_MEMORY_SEVERITY_HIGH);
384384
#endif /* JMEM_GC_BEFORE_EACH_ALLOC */
385385

386386
if (jmem_heap_allocated_size + size >= jmem_heap_limit)
387387
{
388-
jmem_run_try_to_give_memory_back_callbacks (JMEM_TRY_GIVE_MEMORY_BACK_SEVERITY_LOW);
388+
jmem_run_free_unused_memory_callbacks (JMEM_FREE_UNUSED_MEMORY_SEVERITY_LOW);
389389
}
390390

391391
void *data_space_p = jmem_heap_alloc_block_internal (size);
@@ -396,11 +396,11 @@ jmem_heap_alloc_block (const size_t size)
396396
return data_space_p;
397397
}
398398

399-
for (jmem_try_give_memory_back_severity_t severity = JMEM_TRY_GIVE_MEMORY_BACK_SEVERITY_LOW;
400-
severity <= JMEM_TRY_GIVE_MEMORY_BACK_SEVERITY_HIGH;
401-
severity = (jmem_try_give_memory_back_severity_t) (severity + 1))
399+
for (jmem_free_unused_memory_severity_t severity = JMEM_FREE_UNUSED_MEMORY_SEVERITY_LOW;
400+
severity <= JMEM_FREE_UNUSED_MEMORY_SEVERITY_HIGH;
401+
severity = (jmem_free_unused_memory_severity_t) (severity + 1))
402402
{
403-
jmem_run_try_to_give_memory_back_callbacks (severity);
403+
jmem_run_free_unused_memory_callbacks (severity);
404404

405405
data_space_p = jmem_heap_alloc_block_internal (size);
406406

‎jerry-core/jmem/jmem-poolman.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -133,7 +133,7 @@ inline void * __attribute__((hot)) __attr_always_inline___
133133
jmem_pools_alloc (void)
134134
{
135135
#ifdef JMEM_GC_BEFORE_EACH_ALLOC
136-
jmem_run_try_to_give_memory_back_callbacks (JMEM_TRY_GIVE_MEMORY_BACK_SEVERITY_HIGH);
136+
jmem_run_free_unused_memory_callbacks (JMEM_FREE_UNUSED_MEMORY_SEVERITY_HIGH);
137137
#endif /* JMEM_GC_BEFORE_EACH_ALLOC */
138138

139139
if (jmem_free_chunk_p != NULL)

‎tests/unit/test-heap.c

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -35,17 +35,17 @@ size_t sizes[test_sub_iters];
3535
bool is_one_chunked[test_sub_iters];
3636

3737
static void
38-
test_heap_give_some_memory_back (jmem_try_give_memory_back_severity_t severity)
38+
test_heap_give_some_memory_back (jmem_free_unused_memory_severity_t severity)
3939
{
4040
int p;
4141

42-
if (severity == JMEM_TRY_GIVE_MEMORY_BACK_SEVERITY_LOW)
42+
if (severity == JMEM_FREE_UNUSED_MEMORY_SEVERITY_LOW)
4343
{
4444
p = 8;
4545
}
4646
else
4747
{
48-
JERRY_ASSERT (severity == JMEM_TRY_GIVE_MEMORY_BACK_SEVERITY_HIGH);
48+
JERRY_ASSERT (severity == JMEM_FREE_UNUSED_MEMORY_SEVERITY_HIGH);
4949

5050
p = 1;
5151
}
@@ -76,7 +76,7 @@ main (int __attr_unused___ argc,
7676

7777
jmem_heap_init ();
7878

79-
jmem_register_a_try_give_memory_back_callback (test_heap_give_some_memory_back);
79+
jmem_register_free_unused_memory_callback (test_heap_give_some_memory_back);
8080

8181
#ifdef JMEM_STATS
8282
jmem_heap_stats_print ();

0 commit comments

Comments
 (0)