griefith/test2
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Code cleanup: remove some ifdef code from guardedalloc

Browse Source 
Didn't notice all needed functions are in atomic already.
This commit is contained in:
Sergey Sharybin
2013-08-16 05:21:40 +00:00
parent acebdf02cb
commit 27e558e683
2 changed files with 9 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
intern/atomic/atomic_ops.h
View File

@@ -45,7 +45,7 @@
#endif
/* TODO(sergey): check on other 64bit platforms. */
#if defined(_M_X64) || defined(__amd64__) || defined(__x86_64__)
#if defined(_M_X64) || defined(_M_AMD64) || defined(__amd64__) || defined(__x86_64__)
# define LG_SIZEOF_PTR 3
# define LG_SIZEOF_INT 3
#else

28
intern/guardedalloc/intern/mallocn.c
View File

@@ -212,20 +212,8 @@ static const char *check_memlist(MemHead *memh);
/* --------------------------------------------------------------------- */
/* TODO(sergey): need smarter check for 64bit platform. */
#if defined(_M_X64) || defined(__amd64__) || defined(__x86_64__)
typedef uint64_t mem_uintptr_t;
# define mem_atomic_uint_sub atomic_sub_uint64
# define mem_atomic_uint_add atomic_add_uint64
#else
typedef int32_t mem_int_t;
typedef uint32_t mem_uintptr_t;
# define mem_atomic_uint_sub atomic_sub_uint32
# define mem_atomic_uint_add atomic_add_uint32
#endif
static mem_uintptr_t totblock = 0;
static mem_uintptr_t mem_in_use = 0, mmap_in_use = 0, peak_mem = 0;
static unsigned int totblock = 0;
static size_t mem_in_use = 0, mmap_in_use = 0, peak_mem = 0;
static volatile struct localListBase _membase;
static volatile struct localListBase *membase = &_membase;
@@ -508,8 +496,8 @@ static void make_memhead_header(MemHead *memh, size_t len, const char *str)
memt = (MemTail *)(((char *) memh) + sizeof(MemHead) + len);
memt->tag3 = MEMTAG3;
mem_atomic_uint_add(&totblock, 1);
mem_atomic_uint_add(&mem_in_use, len);
atomic_add_u(&totblock, 1);
atomic_add_z(&mem_in_use, len);
mem_lock_thread();
addtail(membase, &memh->next);
@@ -580,7 +568,7 @@ void *MEM_mapallocN(size_t len, const char *str)
if (memh != (MemHead *)-1) {
make_memhead_header(memh, len, str);
memh->mmap = 1;
mem_atomic_uint_add(&mmap_in_use, len);
atomic_add_z(&mmap_in_use, len);
mem_lock_thread();
peak_mem = mmap_in_use > peak_mem ? mmap_in_use : peak_mem;
mem_unlock_thread();
@@ -939,8 +927,8 @@ static void rem_memblock(MemHead *memh)
}
mem_unlock_thread();
mem_atomic_uint_sub(&totblock, 1);
mem_atomic_uint_sub(&mem_in_use, memh->len);
atomic_sub_u(&totblock, 1);
atomic_sub_z(&mem_in_use, memh->len);
#ifdef DEBUG_MEMDUPLINAME
if (memh->need_free_name)
@@ -948,7 +936,7 @@ static void rem_memblock(MemHead *memh)
#endif
if (memh->mmap) {
mem_atomic_uint_sub(&mmap_in_use, memh->len);
atomic_sub_z(&mmap_in_use, memh->len);
if (munmap(memh, memh->len + sizeof(MemHead) + sizeof(MemTail)))
printf("Couldn't unmap memory %s\n", memh->name);
}