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

Split guardedalloc print into 2 funcs, 1 that prints on errors, another then prints the memory blocks as a python dict, minor changes to help text

Browse Source
This commit is contained in:
Campbell Barton
2008-01-03 14:53:44 +00:00
parent 0e716733bc
commit 86471f8b72
4 changed files with 45 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -334,7 +334,7 @@ void *MEM_mapallocN(unsigned int len, const char *str)
/* Prints in python syntax for easy */
void MEM_printmemlist()
static void MEM_printmemlist_internal( int pydict )
{
MemHead *membl;
@@ -343,16 +343,23 @@ void MEM_printmemlist()
membl = membase->first;
if (membl) membl = MEMNEXT(membl);
print_error("# membase_debug.py\n");
print_error("membase = [\\\n");
if (pydict) {
print_error("# membase_debug.py\n");
print_error("membase = [\\\n");
}
while(membl) {
fprintf(stderr, "{'len':%i, 'name':'''%s''', 'pointer':'%p'},\\\n", membl->len, membl->name, membl+1);
if (pydict) {
fprintf(stderr, "{'len':%i, 'name':'''%s''', 'pointer':'%p'},\\\n", membl->len, membl->name, membl+1);
} else {
print_error("%s len: %d %p\n",membl->name,membl->len, membl+1);
}
if(membl->next)
membl= MEMNEXT(membl->next);
else break;
}
fprintf(stderr, "]\n\n");
fprintf(stderr,
if (pydict) {
fprintf(stderr, "]\n\n");
fprintf(stderr,
"mb_userinfo = {}\n"
"totmem = 0\n"
"for mb_item in membase:\n"
@@ -367,11 +374,19 @@ void MEM_printmemlist()
"\tmb_userinfo_sort.sort(key = sort_func)\n"
"\tfor item in mb_userinfo_sort:\n"
"\t\tprint 'name:%%s, users:%%i, len:%%i' %% (item[0], item[1][0], item[1][1])\n"
);
);
}
mem_unlock_thread();
}
void MEM_printmemlist( void ) {
MEM_printmemlist_internal(0);
}
void MEM_printmemlist_pydict( void ) {
MEM_printmemlist_internal(1);
}
short MEM_freeN(void *vmemh) /* anders compileertie niet meer */
{
short error = 0;