zynk/irssi
2
0
Fork 0
mirror of https://github.com/irssi/irssi.git synced 2026-08-20 09:02:13 +02:00
Code Issues Projects Releases Packages Wiki Activity

Remove memory chunks in favour of memory slices.

Browse source 
git-svn-id: file:///var/www/svn.irssi.org/SVN/irssi/trunk@4978 dbcabf3a-b0e7-0310-adc4-f8d773084564
This commit is contained in:
Emanuele Giaquinta 2009-01-08 12:39:11 +00:00 • committed by exg
commit edc7dc26fe
1 changed files with 8 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

28
src/fe-text/textbuffer.c
View file

@ -32,13 +32,11 @@
#define TEXT_CHUNK_USABLE_SIZE (LINE_TEXT_CHUNK_SIZE-2-(int)sizeof(char*)) #define TEXT_CHUNK_USABLE_SIZE (LINE_TEXT_CHUNK_SIZE-2-(int)sizeof(char*))
static GMemChunk *buffer_chunk, *line_chunk, *text_chunk;
TEXT_BUFFER_REC *textbuffer_create(void) TEXT_BUFFER_REC *textbuffer_create(void)
{ {
TEXT_BUFFER_REC *buffer; TEXT_BUFFER_REC *buffer;
buffer = g_mem_chunk_alloc0(buffer_chunk); buffer = g_slice_new0(TEXT_BUFFER_REC);
buffer->last_eol = TRUE; buffer->last_eol = TRUE;
buffer->last_fg = LINE_COLOR_DEFAULT; buffer->last_fg = LINE_COLOR_DEFAULT;
buffer->last_bg = LINE_COLOR_DEFAULT | LINE_COLOR_BG; buffer->last_bg = LINE_COLOR_DEFAULT | LINE_COLOR_BG;
@ -50,7 +48,7 @@ void textbuffer_destroy(TEXT_BUFFER_REC *buffer)
g_return_if_fail(buffer != NULL); g_return_if_fail(buffer != NULL);
textbuffer_remove_all_lines(buffer); textbuffer_remove_all_lines(buffer);
g_mem_chunk_free(buffer_chunk, buffer); g_slice_free(TEXT_BUFFER_REC, buffer);
} }
static TEXT_CHUNK_REC *text_chunk_find(TEXT_BUFFER_REC *buffer, static TEXT_CHUNK_REC *text_chunk_find(TEXT_BUFFER_REC *buffer,
@ -79,7 +77,7 @@ static TEXT_CHUNK_REC *text_chunk_create(TEXT_BUFFER_REC *buffer)
TEXT_CHUNK_REC *rec; TEXT_CHUNK_REC *rec;
unsigned char *buf, *ptr, **pptr; unsigned char *buf, *ptr, **pptr;
rec = g_mem_chunk_alloc(text_chunk); rec = g_slice_new(TEXT_CHUNK_REC);
rec->pos = 0; rec->pos = 0;
rec->refcount = 0; rec->refcount = 0;
@ -108,7 +106,7 @@ static TEXT_CHUNK_REC *text_chunk_create(TEXT_BUFFER_REC *buffer)
static void text_chunk_destroy(TEXT_BUFFER_REC *buffer, TEXT_CHUNK_REC *chunk) static void text_chunk_destroy(TEXT_BUFFER_REC *buffer, TEXT_CHUNK_REC *chunk)
{ {
buffer->text_chunks = g_slist_remove(buffer->text_chunks, chunk); buffer->text_chunks = g_slist_remove(buffer->text_chunks, chunk);
g_mem_chunk_free(text_chunk, chunk); g_slice_free(TEXT_CHUNK_REC, chunk);
} }
static void text_chunk_line_free(TEXT_BUFFER_REC *buffer, LINE_REC *line) static void text_chunk_line_free(TEXT_BUFFER_REC *buffer, LINE_REC *line)
@ -182,7 +180,7 @@ static LINE_REC *textbuffer_line_create(TEXT_BUFFER_REC *buffer)
if (buffer->cur_text == NULL) if (buffer->cur_text == NULL)
text_chunk_create(buffer); text_chunk_create(buffer);
rec = g_mem_chunk_alloc(line_chunk); rec = g_slice_new(LINE_REC);
rec->text = buffer->cur_text->buffer + buffer->cur_text->pos; rec->text = buffer->cur_text->buffer + buffer->cur_text->pos;
buffer->cur_text->refcount++; buffer->cur_text->refcount++;
@ -338,7 +336,7 @@ void textbuffer_remove(TEXT_BUFFER_REC *buffer, LINE_REC *line)
buffer->lines_count--; buffer->lines_count--;
text_chunk_line_free(buffer, line); text_chunk_line_free(buffer, line);
g_mem_chunk_free(line_chunk, line); g_slice_free(LINE_REC, line);
} }
/* Removes all lines from buffer */ /* Removes all lines from buffer */
@ -350,13 +348,13 @@ void textbuffer_remove_all_lines(TEXT_BUFFER_REC *buffer)
g_return_if_fail(buffer != NULL); g_return_if_fail(buffer != NULL);
for (tmp = buffer->text_chunks; tmp != NULL; tmp = tmp->next) for (tmp = buffer->text_chunks; tmp != NULL; tmp = tmp->next)
g_mem_chunk_free(text_chunk, tmp->data); g_slice_free(TEXT_CHUNK_REC, tmp->data);
g_slist_free(buffer->text_chunks); g_slist_free(buffer->text_chunks);
buffer->text_chunks = NULL; buffer->text_chunks = NULL;
while (buffer->first_line != NULL) { while (buffer->first_line != NULL) {
line = buffer->first_line->next; line = buffer->first_line->next;
g_mem_chunk_free(line_chunk, buffer->first_line); g_slice_free(LINE_REC, buffer->first_line);
buffer->first_line = line; buffer->first_line = line;
} }
buffer->lines_count = 0; buffer->lines_count = 0;
@ -542,18 +540,8 @@ GList *textbuffer_find_text(TEXT_BUFFER_REC *buffer, LINE_REC *startline,
void textbuffer_init(void) void textbuffer_init(void)
{ {
buffer_chunk = g_mem_chunk_new("text buffer chunk",
sizeof(TEXT_BUFFER_REC),
sizeof(TEXT_BUFFER_REC)*32, G_ALLOC_AND_FREE);
line_chunk = g_mem_chunk_new("line chunk", sizeof(LINE_REC),
sizeof(LINE_REC)*1024, G_ALLOC_AND_FREE);
text_chunk = g_mem_chunk_new("text chunk", sizeof(TEXT_CHUNK_REC),
sizeof(TEXT_CHUNK_REC)*32, G_ALLOC_AND_FREE);
} }
void textbuffer_deinit(void) void textbuffer_deinit(void)
{ {
g_mem_chunk_destroy(buffer_chunk);
g_mem_chunk_destroy(line_chunk);
g_mem_chunk_destroy(text_chunk);
} }