deon/gnuk
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

bug fix of malloc/free

Browse Source
This commit is contained in:
NIIBE Yutaka
2013-10-04 13:45:22 +09:00
parent 3d8e73defc
commit 7631531609
2 changed files with 15 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
ChangeLog
View File

@@ -1,3 +1,9 @@
2013-10-04 Niibe Yutaka <gniibe@fsij.org>
* src/main.c (gnuk_malloc): Update ->neighbor field of a chunk on
the free list.
(gnuk_free): Access free list after getting the lock.
2013-10-01 Niibe Yutaka <gniibe@fsij.org> 2013-10-01 Niibe Yutaka <gniibe@fsij.org>
* src/random.c (random_gen): Bug fix for INDEXed copy. * src/random.c (random_gen): Bug fix for INDEXed copy.

10
src/main.c
View File

@@ -521,6 +521,7 @@ void *
gnuk_malloc (size_t size) gnuk_malloc (size_t size)
{ {
struct mem_head *m; struct mem_head *m;
struct mem_head *m0;
size = MEMORY_ALIGN (size + sizeof (uint32_t)); size = MEMORY_ALIGN (size + sizeof (uint32_t));
@@ -542,6 +543,12 @@ gnuk_malloc (size_t size)
if (m->size == size) if (m->size == size)
{ {
remove_from_free_list (m); remove_from_free_list (m);
m0 = free_list;
while (m0)
if (m0->neighbor == m)
m0->neighbor = NULL;
else
m0 = m0->next;
break; break;
} }
@@ -566,9 +573,10 @@ void
gnuk_free (void *p) gnuk_free (void *p)
{ {
struct mem_head *m = (struct mem_head *)((void *)p - sizeof (uint32_t)); struct mem_head *m = (struct mem_head *)((void *)p - sizeof (uint32_t));
struct mem_head *m0 = free_list; struct mem_head *m0;
chopstx_mutex_lock (&malloc_mtx); chopstx_mutex_lock (&malloc_mtx);
m0 = free_list;
DEBUG_INFO ("free: "); DEBUG_INFO ("free: ");
DEBUG_SHORT (m->size); DEBUG_SHORT (m->size);
DEBUG_WORD ((uint32_t)p); DEBUG_WORD ((uint32_t)p);