forked from Telodendria/Cytoplasm
Compare commits
5 Commits
mem-moment
...
master
Author | SHA1 | Date |
---|---|---|
|
39c25e5a17 | |
|
4903c075e8 | |
![]() |
da857a3d53 | |
|
138ea1c8e9 | |
|
cdf4430a9e |
|
@ -184,6 +184,8 @@ HashMapDelete(HashMap * map, const char *key)
|
||||||
if (bucket->hash == hash)
|
if (bucket->hash == hash)
|
||||||
{
|
{
|
||||||
bucket->hash = 0;
|
bucket->hash = 0;
|
||||||
|
Free(bucket->key);
|
||||||
|
bucket->key = NULL;
|
||||||
return bucket->value;
|
return bucket->value;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
14
src/Memory.c
14
src/Memory.c
|
@ -40,10 +40,12 @@
|
||||||
#define MEMORY_HEXDUMP_WIDTH 16
|
#define MEMORY_HEXDUMP_WIDTH 16
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
#define MEMORY_FILE_SIZE 256
|
||||||
|
|
||||||
struct MemoryInfo
|
struct MemoryInfo
|
||||||
{
|
{
|
||||||
size_t size;
|
size_t size;
|
||||||
const char *file;
|
char file[MEMORY_FILE_SIZE];
|
||||||
int line;
|
int line;
|
||||||
void *pointer;
|
void *pointer;
|
||||||
};
|
};
|
||||||
|
@ -227,7 +229,7 @@ MemoryAllocate(size_t size, const char *file, int line)
|
||||||
MEM_BOUND_UPPER(p, size) = MEM_BOUND;
|
MEM_BOUND_UPPER(p, size) = MEM_BOUND;
|
||||||
|
|
||||||
a->size = MEM_SIZE_ACTUAL(size);
|
a->size = MEM_SIZE_ACTUAL(size);
|
||||||
a->file = file;
|
strncpy(a->file, file, MEMORY_FILE_SIZE - 1);
|
||||||
a->line = line;
|
a->line = line;
|
||||||
a->pointer = p;
|
a->pointer = p;
|
||||||
|
|
||||||
|
@ -270,7 +272,7 @@ MemoryReallocate(void *p, size_t size, const char *file, int line)
|
||||||
{
|
{
|
||||||
MemoryDelete(a);
|
MemoryDelete(a);
|
||||||
a->size = MEM_SIZE_ACTUAL(size);
|
a->size = MEM_SIZE_ACTUAL(size);
|
||||||
a->file = file;
|
strncpy(a->file, file, MEMORY_FILE_SIZE - 1);
|
||||||
a->line = line;
|
a->line = line;
|
||||||
|
|
||||||
a->pointer = new;
|
a->pointer = new;
|
||||||
|
@ -293,7 +295,7 @@ MemoryReallocate(void *p, size_t size, const char *file, int line)
|
||||||
if (a)
|
if (a)
|
||||||
{
|
{
|
||||||
a->size = 0;
|
a->size = 0;
|
||||||
a->file = file;
|
strncpy(a->file, file, MEMORY_FILE_SIZE - 1);
|
||||||
a->line = line;
|
a->line = line;
|
||||||
a->pointer = p;
|
a->pointer = p;
|
||||||
hook(MEMORY_BAD_POINTER, a, hookArgs);
|
hook(MEMORY_BAD_POINTER, a, hookArgs);
|
||||||
|
@ -322,7 +324,7 @@ MemoryFree(void *p, const char *file, int line)
|
||||||
pthread_mutex_lock(&lock);
|
pthread_mutex_lock(&lock);
|
||||||
if (hook)
|
if (hook)
|
||||||
{
|
{
|
||||||
a->file = file;
|
strncpy(a->file, file, MEMORY_FILE_SIZE - 1);
|
||||||
a->line = line;
|
a->line = line;
|
||||||
hook(MEMORY_FREE, a, hookArgs);
|
hook(MEMORY_FREE, a, hookArgs);
|
||||||
}
|
}
|
||||||
|
@ -337,7 +339,7 @@ MemoryFree(void *p, const char *file, int line)
|
||||||
a = malloc(sizeof(MemoryInfo));
|
a = malloc(sizeof(MemoryInfo));
|
||||||
if (a)
|
if (a)
|
||||||
{
|
{
|
||||||
a->file = file;
|
strncpy(a->file, file, MEMORY_FILE_SIZE - 1);
|
||||||
a->line = line;
|
a->line = line;
|
||||||
a->size = 0;
|
a->size = 0;
|
||||||
a->pointer = p;
|
a->pointer = p;
|
||||||
|
|
Loading…
Reference in New Issue