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

Optimize parser memory consumption. Remove 'prev' and 'block_size' fields form the linked list structure. Remove 'magic' field from structures used in parser.

Browse Source
This commit is contained in:
Andrey Shitov
2015-04-01 11:48:23 +03:00
parent ef2265ee41
commit e459ab7d64
11 changed files with 26 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jerry-core/parser/collections/linked-list.cpp
+15 -17
View File
@@ -19,15 +19,10 @@
#include "mem-heap.h"
#include "lp-string.h"
#define LINKED_LIST_MAGIC 0x42
typedef struct linked_list_header
{
struct linked_list_header *next;
struct linked_list_header *prev;
uint16_t block_size;
uint16_t element_size;
uint8_t magic;
}
linked_list_header;
@@ -35,13 +30,17 @@ linked_list_header;
do { \
linked_list_header *header = (linked_list_header *) list; \
JERRY_ASSERT (header); \
JERRY_ASSERT (header->magic == LINKED_LIST_MAGIC); \
} while (0);
static size_t linked_list_block_size (uint16_t element_size)
{
return mem_heap_recommend_allocation_size (sizeof (linked_list_header) + element_size) - sizeof (linked_list_header);
}
linked_list
linked_list_init (uint16_t element_size)
{
size_t size = mem_heap_recommend_allocation_size (element_size);
size_t size = sizeof (linked_list_header) + linked_list_block_size (element_size);
linked_list list = (linked_list) mem_heap_alloc_block (size, MEM_HEAP_ALLOC_SHORT_TERM);
if (list == null_list)
{
@@ -50,10 +49,8 @@ linked_list_init (uint16_t element_size)
}
memset (list, 0, size);
linked_list_header* header = (linked_list_header *) list;
header->magic = LINKED_LIST_MAGIC;
header->prev = header->next = null_list;
header->next = null_list;
header->element_size = element_size;
header->block_size = (uint8_t) (size - sizeof (linked_list_header));
return list;
}
@@ -70,17 +67,18 @@ linked_list_free (linked_list list)
}
void *
linked_list_element (linked_list list, uint16_t element_num)
linked_list_element (linked_list list, size_t element_num)
{
ASSERT_LIST (list);
linked_list_header *header = (linked_list_header *) list;
size_t block_size = linked_list_block_size (header->element_size);
linked_list raw = list + sizeof (linked_list_header);
if (header->block_size < header->element_size * (element_num + 1))
if (block_size < header->element_size * (element_num + 1))
{
if (header->next)
{
return linked_list_element ((linked_list) header->next,
(uint16_t) (element_num - (header->block_size / header->element_size)));
element_num - (block_size / header->element_size));
}
else
{
@@ -92,20 +90,20 @@ linked_list_element (linked_list list, uint16_t element_num)
}
void
linked_list_set_element (linked_list list, uint16_t element_num, void *element)
linked_list_set_element (linked_list list, size_t element_num, void *element)
{
ASSERT_LIST (list);
linked_list_header *header = (linked_list_header *) list;
size_t block_size = linked_list_block_size (header->element_size);
uint8_t *raw = (uint8_t *) (header + 1);
if (header->block_size < header->element_size * (element_num + 1))
if (block_size < header->element_size * (element_num + 1))
{
if (header->next == null_list)
{
header->next = (linked_list_header *) linked_list_init (header->element_size);
header->next->prev = header;
}
linked_list_set_element ((linked_list) header->next,
(uint16_t) (element_num - (header->block_size / header->element_size)),
element_num - (block_size / header->element_size),
element);
return;
}