Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-11-30 00:01:50 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Port trace-malloc to Mac OS X. b=392118 r+a=brendan

Browse Source
This commit is contained in:
dbaron@dbaron.org 2007-08-14 09:35:46 -07:00
parent cce47c3e88
commit 051a23c4b6
3 changed files with 66 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

69
tools/trace-malloc/lib/nsTraceMalloc.c
View File

@ -70,17 +70,19 @@
#include "nsStackWalk.h"
#include "nsTraceMallocCallbacks.h"
#ifdef XP_WIN32
#include <sys/timeb.h>/*for timeb*/
#include <sys/stat.h>/*for fstat*/
#if defined(XP_MACOSX)
#include <io.h> /*for write*/
#include <malloc/malloc.h>
#define WRITE_FLAGS "w"
#endif /* WIN32 */
#define __libc_malloc(x) malloc(x)
#define __libc_calloc(x, y) calloc(x, y)
#define __libc_realloc(x, y) realloc(x, y)
#define __libc_free(x) free(x)
#elif defined(XP_UNIX)
#ifdef XP_UNIX
#define WRITE_FLAGS "w"
#ifdef WRAP_SYSTEM_INCLUDES
@ -96,9 +98,14 @@ extern __ptr_t __libc_valloc(size_t);
#pragma GCC visibility pop
#endif
#endif /* !XP_UNIX */
#elif defined(XP_WIN32)
#ifdef XP_WIN32
#include <sys/timeb.h>/*for timeb*/
#include <sys/stat.h>/*for fstat*/
#include <io.h> /*for write*/
#define WRITE_FLAGS "w"
#define __libc_malloc(x) dhw_orig_malloc(x)
#define __libc_calloc(x, y) dhw_orig_calloc(x,y)
@ -1020,7 +1027,7 @@ static PLHashTable *new_allocations(void)
#define get_allocations() (allocations ? allocations : new_allocations())
#ifdef XP_UNIX
#if defined(XP_UNIX) && !defined(XP_MACOSX)
NS_EXTERNAL_VIS_(__ptr_t)
malloc(size_t size)
@ -1396,6 +1403,43 @@ cfree(void *ptr)
#endif /* XP_UNIX */
#ifdef XP_MACOSX
/* from malloc.c in Libc */
typedef void (malloc_logger_t)(unsigned type, unsigned arg1, unsigned arg2, unsigned arg3, unsigned result, unsigned num_hot_frames_to_skip);
extern malloc_logger_t *malloc_logger;
#define MALLOC_LOG_TYPE_ALLOCATE 2
#define MALLOC_LOG_TYPE_DEALLOCATE 4
#define MALLOC_LOG_TYPE_HAS_ZONE 8
#define MALLOC_LOG_TYPE_CLEARED 64
static void
my_malloc_logger(unsigned type, unsigned arg1, unsigned arg2, unsigned arg3,
unsigned result, unsigned num_hot_frames_to_skip)
{
unsigned all_args[3] = { arg1, arg2, arg3 };
unsigned *args = all_args + ((type & MALLOC_LOG_TYPE_HAS_ZONE) ? 1 : 0);
unsigned alloc_type =
type & (MALLOC_LOG_TYPE_ALLOCATE | MALLOC_LOG_TYPE_DEALLOCATE);
tm_thread *t = tm_get_thread();
if (alloc_type == (MALLOC_LOG_TYPE_ALLOCATE | MALLOC_LOG_TYPE_DEALLOCATE)) {
ReallocCallback((void*)args[0], (void*)result, args[1], 0, 0, t);
} else if (alloc_type == MALLOC_LOG_TYPE_ALLOCATE) {
/*
* We don't get size/count information for calloc, so just use
* MallocCallback.
*/
MallocCallback((void*)result, args[0], 0, 0, t);
} else if (alloc_type == MALLOC_LOG_TYPE_DEALLOCATE) {
FreeCallback((void*)args[0], 0, 0, t);
}
}
#endif
static const char magic[] = NS_TRACE_MALLOC_MAGIC;
static void
@ -1444,6 +1488,9 @@ PR_IMPLEMENT(void) NS_TraceMallocStartup(int logfd)
StartupHooker();
}
#endif
#ifdef XP_MACOSX
malloc_logger = my_malloc_logger;
#endif
}
@ -1894,7 +1941,7 @@ NS_TrackAllocation(void* ptr, FILE *ofp)
t->suppress_tracing--;
}
#ifdef XP_WIN32
#if defined(XP_WIN32) || defined(XP_MACOSX)
PR_IMPLEMENT(void)
MallocCallback(void *ptr, size_t size, PRUint32 start, PRUint32 end, tm_thread *t)
@ -2076,6 +2123,6 @@ FreeCallback(void * ptr, PRUint32 start, PRUint32 end, tm_thread *t)
t->suppress_tracing--;
}
#endif /*XP_WIN32*/
#endif /* defined(XP_WIN32) || defined(XP_MACOSX) */
#endif /* NS_TRACE_MALLOC */

12
tools/trace-malloc/lib/nsTraceMallocCallbacks.h
View File

@ -69,16 +69,18 @@ struct tm_thread {
/* implemented in nsTraceMalloc.c */
tm_thread * tm_get_thread(void);
#ifdef XP_WIN32
/* implemented in nsTraceMalloc.c */
PR_EXTERN(void) StartupHooker();
PR_EXTERN(void) ShutdownHooker();
#if defined(XP_WIN32) || defined(XP_MACOSX)
/* implemented in nsTraceMalloc.c */
PR_EXTERN(void) MallocCallback(void *aPtr, size_t aSize, PRUint32 start, PRUint32 end, tm_thread *t);
PR_EXTERN(void) CallocCallback(void *aPtr, size_t aCount, size_t aSize, PRUint32 start, PRUint32 end, tm_thread *t);
PR_EXTERN(void) ReallocCallback(void *aPin, void* aPout, size_t aSize, PRUint32 start, PRUint32 end, tm_thread *t);
PR_EXTERN(void) FreeCallback(void *aPtr, PRUint32 start, PRUint32 end, tm_thread *t);
#endif
#ifdef XP_WIN32
/* implemented in nsTraceMalloc.c */
PR_EXTERN(void) StartupHooker();
PR_EXTERN(void) ShutdownHooker();
/* implemented in nsWinTraceMalloc.cpp */
void* dhw_orig_malloc(size_t);

2
tools/trace-malloc/lib/nsTypeInfo.cpp
View File

@ -249,7 +249,7 @@ const char* nsGetTypeName(void* ptr)
#endif
#if defined(linux)
#if defined(linux) || defined(XP_MACOSX)
#define __USE_GNU
#include <dlfcn.h>