Skip to content

Commit dfb22c3

Browse files
jiangzidongLaszloLango
jiangzidong
authored and
LaszloLango
committed
refactor rcs_chunked_list and remove its c++ features
issue #806 JerryScript-DCO-1.0-Signed-off-by: Zidong Jiang zidong.jiang@intel.com
1 parent d60bd93 commit dfb22c3

File tree

8 files changed

+268
-301
lines changed

8 files changed

+268
-301
lines changed

‎jerry-core/lit/lit-literal.cpp‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ lit_init ()
2929
{
3030
JERRY_ASSERT (rcs_get_node_data_space_size () % RCS_DYN_STORAGE_LENGTH_UNIT == 0);
3131

32-
rcs_lit_storage.init ();
32+
rcs_chunked_list_init (&rcs_lit_storage);
3333

3434
lit_magic_strings_init ();
3535
lit_magic_strings_ex_init ();
@@ -41,8 +41,8 @@ lit_init ()
4141
void
4242
lit_finalize ()
4343
{
44-
rcs_lit_storage.cleanup ();
45-
rcs_lit_storage.free ();
44+
rcs_chunked_list_cleanup (&rcs_lit_storage);
45+
rcs_chunked_list_free (&rcs_lit_storage);
4646
} /* lit_finalize */
4747

4848
/**

‎jerry-core/rcs/rcs-allocator.cpp‎

Lines changed: 29 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -38,18 +38,18 @@ rcs_assert_state_is_correct (rcs_record_set_t *rec_set_p __attr_unused___) /**<
3838
JERRY_ASSERT (rcs_record_get_size (rec_p) > 0);
3939
record_size_sum += rcs_record_get_size (rec_p);
4040

41-
rcs_chunked_list_t::node_t *node_p = rec_set_p->get_node_from_pointer (rec_p);
41+
rcs_chunked_list_node_t *node_p = rcs_chunked_list_get_node_from_pointer (rec_set_p, rec_p);
4242
next_rec_p = rcs_record_get_next (rec_set_p, rec_p);
43-
rcs_chunked_list_t::node_t *next_node_p = NULL;
43+
rcs_chunked_list_node_t *next_node_p = NULL;
4444

4545
if (next_rec_p != NULL)
4646
{
47-
next_node_p = rec_set_p->get_node_from_pointer (next_rec_p);
47+
next_node_p = rcs_chunked_list_get_node_from_pointer (rec_set_p, next_rec_p);
4848
}
4949

5050
while (node_p != next_node_p)
5151
{
52-
node_p = rec_set_p->get_next (node_p);
52+
node_p = rcs_chunked_list_get_next (node_p);
5353
node_size_sum += rcs_get_node_data_space_size ();
5454
}
5555
}
@@ -104,7 +104,7 @@ rcs_check_record_alignment (rcs_record_t *rec_p) /**< record */
104104
size_t
105105
rcs_get_node_data_space_size (void)
106106
{
107-
return JERRY_ALIGNDOWN (rcs_chunked_list_t::get_node_data_space_size (), RCS_DYN_STORAGE_LENGTH_UNIT);
107+
return JERRY_ALIGNDOWN (rcs_chunked_list_get_node_data_space_size (), RCS_DYN_STORAGE_LENGTH_UNIT);
108108
} /* rcs_get_node_data_space_size */
109109

110110
/**
@@ -114,13 +114,13 @@ rcs_get_node_data_space_size (void)
114114
*/
115115
uint8_t *
116116
rcs_get_node_data_space (rcs_record_set_t *rec_set_p, /**< recordset */
117-
rcs_chunked_list_t::node_t *node_p) /**< the node */
117+
rcs_chunked_list_node_t *node_p) /**< the node */
118118
{
119-
uintptr_t unaligned_data_space_start = (uintptr_t) rec_set_p->get_node_data_space (node_p);
119+
uintptr_t unaligned_data_space_start = (uintptr_t) rcs_chunked_list_get_node_data_space (rec_set_p, node_p);
120120
uintptr_t aligned_data_space_start = JERRY_ALIGNUP (unaligned_data_space_start, RCS_DYN_STORAGE_LENGTH_UNIT);
121121

122-
JERRY_ASSERT (unaligned_data_space_start + rcs_chunked_list_t::get_node_data_space_size ()
123-
== aligned_data_space_start + rcs_record_set_t::get_node_data_space_size ());
122+
JERRY_ASSERT (unaligned_data_space_start + rcs_chunked_list_get_node_data_space_size ()
123+
== aligned_data_space_start + rcs_chunked_list_get_node_data_space_size ());
124124

125125
return (uint8_t *) aligned_data_space_start;
126126
} /* rcs_get_node_data_space */
@@ -146,7 +146,7 @@ rcs_alloc_record_in_place (rcs_record_set_t *rec_set_p, /**< recordset */
146146
}
147147
else
148148
{
149-
rcs_chunked_list_t::node_t *node_p = rec_set_p->get_node_from_pointer (next_record_p);
149+
rcs_chunked_list_node_t *node_p = rcs_chunked_list_get_node_from_pointer (rec_set_p, next_record_p);
150150
uint8_t *node_data_space_p = rcs_get_node_data_space (rec_set_p, node_p);
151151

152152
JERRY_ASSERT ((uint8_t *) next_record_p < node_data_space_p + node_data_space_size);
@@ -162,7 +162,7 @@ rcs_alloc_record_in_place (rcs_record_set_t *rec_set_p, /**< recordset */
162162
size_t size_passed_back = (size_t) ((uint8_t *) next_record_p - node_data_space_p);
163163
JERRY_ASSERT (size_passed_back < free_size && size_passed_back + node_data_space_size > free_size);
164164

165-
node_p = rec_set_p->get_prev (node_p);
165+
node_p = rcs_chunked_list_get_prev (node_p);
166166
node_data_space_p = rcs_get_node_data_space (rec_set_p, node_p);
167167

168168
free_rec_p = (rcs_record_t *) (node_data_space_p + node_data_space_size - \
@@ -174,15 +174,15 @@ rcs_alloc_record_in_place (rcs_record_set_t *rec_set_p, /**< recordset */
174174
}
175175
else if (free_size != 0)
176176
{
177-
rcs_chunked_list_t::node_t *node_p = rec_set_p->get_node_from_pointer (place_p);
177+
rcs_chunked_list_node_t *node_p = rcs_chunked_list_get_node_from_pointer (rec_set_p, place_p);
178178
JERRY_ASSERT (node_p != NULL);
179179

180-
rcs_chunked_list_t::node_t *next_node_p = rec_set_p->get_next (node_p);
180+
rcs_chunked_list_node_t *next_node_p = rcs_chunked_list_get_next (node_p);
181181

182182
while (next_node_p != NULL)
183183
{
184184
node_p = next_node_p;
185-
next_node_p = rec_set_p->get_next (node_p);
185+
next_node_p = rcs_chunked_list_get_next (node_p);
186186
}
187187

188188
uint8_t *node_data_space_p = rcs_get_node_data_space (rec_set_p, node_p);
@@ -230,7 +230,7 @@ rcs_alloc_space_for_record (rcs_record_set_t *rec_set_p, /**< recordset */
230230
return rec_p;
231231
}
232232

233-
rcs_chunked_list_t::node_t *node_p = rec_set_p->get_node_from_pointer (rec_p);
233+
rcs_chunked_list_node_t *node_p = rcs_chunked_list_get_node_from_pointer (rec_set_p, rec_p);
234234
uint8_t *node_data_space_p = rcs_get_node_data_space (rec_set_p, node_p);
235235
uint8_t *node_data_space_end_p = node_data_space_p + node_data_space_size;
236236
uint8_t *rec_space_p = (uint8_t *) rec_p;
@@ -241,7 +241,7 @@ rcs_alloc_space_for_record (rcs_record_set_t *rec_set_p, /**< recordset */
241241
* thus it can be extended up to necessary size. */
242242
while (record_size < bytes)
243243
{
244-
node_p = rec_set_p->insert_new (node_p);
244+
node_p = rcs_chunked_list_insert_new (rec_set_p, node_p);
245245
record_size += node_data_space_size;
246246
}
247247

@@ -261,15 +261,15 @@ rcs_alloc_space_for_record (rcs_record_set_t *rec_set_p, /**< recordset */
261261
}
262262

263263
/* Free record of sufficient size was not found. */
264-
rcs_chunked_list_t::node_t *node_p = rec_set_p->append_new ();
264+
rcs_chunked_list_node_t *node_p = rcs_chunked_list_append_new (rec_set_p);
265265
rcs_record_t *new_rec_p = (rcs_record_t *) rcs_get_node_data_space (rec_set_p, node_p);
266266

267267
size_t allocated_size = node_data_space_size;
268268

269269
while (allocated_size < bytes)
270270
{
271271
allocated_size += node_data_space_size;
272-
rec_set_p->append_new ();
272+
rcs_chunked_list_append_new (rec_set_p);
273273
}
274274

275275
rcs_alloc_record_in_place (rec_set_p, new_rec_p, NULL, allocated_size - bytes);
@@ -335,12 +335,12 @@ rcs_free_record (rcs_record_set_t *rec_set_p, /**< recordset */
335335
JERRY_ASSERT (rec_from_p != NULL && RCS_RECORD_IS_FREE (rec_from_p));
336336
JERRY_ASSERT (rec_to_p == NULL || !RCS_RECORD_IS_FREE (rec_to_p));
337337

338-
rcs_chunked_list_t::node_t *node_from_p = rec_set_p->get_node_from_pointer (rec_from_p);
339-
rcs_chunked_list_t::node_t *node_to_p = NULL;
338+
rcs_chunked_list_node_t *node_from_p = rcs_chunked_list_get_node_from_pointer (rec_set_p, rec_from_p);
339+
rcs_chunked_list_node_t *node_to_p = NULL;
340340

341341
if (rec_to_p != NULL)
342342
{
343-
node_to_p = rec_set_p->get_node_from_pointer (rec_to_p);
343+
node_to_p = rcs_chunked_list_get_node_from_pointer (rec_set_p, rec_to_p);
344344
}
345345

346346
const size_t node_data_space_size = rcs_get_node_data_space_size ();
@@ -356,18 +356,18 @@ rcs_free_record (rcs_record_set_t *rec_set_p, /**< recordset */
356356
}
357357
else
358358
{
359-
rcs_chunked_list_t::node_t *iter_node_p;
360-
rcs_chunked_list_t::node_t *iter_next_node_p;
359+
rcs_chunked_list_node_t *iter_node_p;
360+
rcs_chunked_list_node_t *iter_next_node_p;
361361

362-
for (iter_node_p = rec_set_p->get_next (node_from_p);
362+
for (iter_node_p = rcs_chunked_list_get_next (node_from_p);
363363
iter_node_p != node_to_p;
364364
iter_node_p = iter_next_node_p)
365365
{
366-
iter_next_node_p = rec_set_p->get_next (iter_node_p);
367-
rec_set_p->remove (iter_node_p);
366+
iter_next_node_p = rcs_chunked_list_get_next (iter_node_p);
367+
rcs_chunked_list_remove (rec_set_p, iter_node_p);
368368
}
369369

370-
JERRY_ASSERT (rec_set_p->get_next (node_from_p) == node_to_p);
370+
JERRY_ASSERT (rcs_chunked_list_get_next (node_from_p) == node_to_p);
371371

372372
size_t node_from_space = (size_t) (rcs_get_node_data_space (rec_set_p, node_from_p) \
373373
+ node_data_space_size - rec_from_beg_p);
@@ -385,10 +385,10 @@ rcs_free_record (rcs_record_set_t *rec_set_p, /**< recordset */
385385
}
386386
else if (prev_rec_p == NULL)
387387
{
388-
rec_set_p->remove (node_from_p);
388+
rcs_chunked_list_remove (rec_set_p, node_from_p);
389389

390390
JERRY_ASSERT (node_to_p == NULL);
391-
JERRY_ASSERT (rec_set_p->get_first () == NULL);
391+
JERRY_ASSERT (rcs_chunked_list_get_first (rec_set_p) == NULL);
392392
}
393393

394394
rcs_assert_state_is_correct (rec_set_p);

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
extern void rcs_check_record_alignment (rcs_record_t *);
2323
extern void rcs_free_record (rcs_record_set_t *, rcs_record_t *);
2424
extern size_t rcs_get_node_data_space_size (void);
25-
extern uint8_t *rcs_get_node_data_space (rcs_record_set_t *, rcs_chunked_list_t::node_t *);
25+
extern uint8_t *rcs_get_node_data_space (rcs_record_set_t *, rcs_chunked_list_node_t *);
2626
extern rcs_record_t *rcs_alloc_record (rcs_record_set_t *, rcs_record_type_t, size_t);
2727

2828
#endif /* !RCS_ALLOCATOR_H */

0 commit comments

Comments
 (0)