dimmus
/
efl
forked from enlightenment/efl
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

evas_textblock: allocator use same heap if it is large enough 

Summary:
allocator use same heap if it is large enough

I am also think to move this struct/functionality into common place, I think we can use it in other parts too

Reviewers: smohanty, Hermet, bowonryu, SanghyeonLee

Reviewed By: smohanty, SanghyeonLee

Subscribers: cedric, #reviewers, #committers

Tags: #efl

Differential Revision: https://phab.enlightenment.org/D9770
This commit is contained in:
Ali Alzyod 2019-08-29 18:43:00 +09:00 committed by SangHyeon Jade Lee
parent 04e3eff845
commit f7cfd0f833
1 changed files with 25 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
src/lib/evas/canvas/evas_object_textblock.c
View File

@ -2897,12 +2897,17 @@ typedef struct _Allocator
{ {
char stack[ALLOCATOR_SIZE]; char stack[ALLOCATOR_SIZE];
char *heap; char *heap;
size_t heap_size;
} Allocator; } Allocator;
static inline void static inline void
_allocator_init(Allocator* allocator) _allocator_init(Allocator* allocator)
{ {
if (allocator) allocator->heap = NULL; if (allocator)
{
allocator->heap = NULL;
allocator->heap_size = 0;
}
} }
static inline void static inline void
@ -2912,6 +2917,7 @@ _allocator_reset(Allocator* allocator)
{ {
free(allocator->heap); free(allocator->heap);
allocator->heap = NULL; allocator->heap = NULL;
allocator->heap_size = 0;
} }
} }
@ -2928,11 +2934,24 @@ _allocator_make_string(Allocator* allocator, const char* str, size_t size)
return allocator->stack; return allocator->stack;
} }
//fallback to heap //fallback to heap
if (allocator->heap) free(allocator->heap); if (allocator->heap && allocator->heap_size < (size + 1))
{
free(allocator->heap);
allocator->heap = NULL;
allocator->heap_size = 0;
}
allocator->heap = malloc(size + 1); if (!allocator->heap)
{
allocator->heap = malloc(size + 1);
allocator->heap_size = (size + 1);
}
if (!allocator->heap) return NULL; if (!allocator->heap)
{
allocator->heap_size = 0;
return NULL;
}
memcpy(allocator->heap, str, size); memcpy(allocator->heap, str, size);
allocator->heap[size] = '\0'; allocator->heap[size] = '\0';
@ -3099,8 +3118,9 @@ _format_fill(Evas_Object *eo_obj, Evas_Object_Textblock_Format *fmt, const char
{ {
/* immediate - not handled here */ /* immediate - not handled here */
} }
_allocator_reset(&allocator);
} }
_allocator_reset(&allocator);
} }
/** /**