kcat/openal-soft
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Use al_malloc/al_free for the UIntMap array

Browse Source
This commit is contained in:
Chris Robinson 2016-07-04 09:18:49 -07:00
parent 80da138d7f
commit f0cbcdc928
2 changed files with 17 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
common/uintmap.c
View File

@ -6,6 +6,8 @@
#include <stdlib.h>
#include <string.h>
#include "almalloc.h"
extern inline void LockUIntMapRead(UIntMap *map);
extern inline void UnlockUIntMapRead(UIntMap *map);
@ -17,7 +19,7 @@ void InitUIntMap(UIntMap *map, ALsizei limit)
{
map->array = NULL;
map->size = 0;
map->maxsize = 0;
map->capacity = 0;
map->limit = limit;
RWLockInit(&map->lock);
}
@ -25,10 +27,10 @@ void InitUIntMap(UIntMap *map, ALsizei limit)
void ResetUIntMap(UIntMap *map)
{
WriteLock(&map->lock);
free(map->array);
al_free(map->array);
map->array = NULL;
map->size = 0;
map->maxsize = 0;
map->capacity = 0;
WriteUnlock(&map->lock);
}
@ -62,21 +64,27 @@ ALenum InsertUIntMapEntry(UIntMap *map, ALuint key, ALvoid *value)
return AL_OUT_OF_MEMORY;
}
if(map->size == map->maxsize)
if(map->size == map->capacity)
{
ALvoid *temp = NULL;
ALsizei newsize;
newsize = (map->maxsize ? (map->maxsize<<1) : 4);
if(newsize >= map->maxsize)
temp = realloc(map->array, newsize*sizeof(map->array[0]));
newsize = (map->capacity ? (map->capacity<<1) : 4);
if(map->limit > 0 && newsize > map->limit)
newsize = map->limit;
if(newsize > map->capacity)
temp = al_malloc(16, newsize * sizeof(map->array[0]));
if(!temp)
{
WriteUnlock(&map->lock);
return AL_OUT_OF_MEMORY;
}
if(map->array)
memcpy(temp, map->array, map->size*sizeof(map->array[0]));
al_free(map->array);
map->array = temp;
map->maxsize = newsize;
map->capacity = newsize;
}
if(pos < map->size)

2
include/uintmap.h
View File

@ -14,7 +14,7 @@ typedef struct UIntMap {
ALvoid *value;
} *array;
ALsizei size;
ALsizei maxsize;
ALsizei capacity;
ALsizei limit;
RWLock lock;
} UIntMap;