From baf7be9e466a2f111b030b9098be71f3aba3aca7 Mon Sep 17 00:00:00 2001 From: Brecht Van Lommel Date: Fri, 1 Feb 2008 12:14:15 +0000 Subject: Memory usage debugging: now with the -d debug option enabled, at the end of rendering it prints memory usage for images and all memory blocks. --- source/blender/blenkernel/BKE_image.h | 3 ++ source/blender/blenkernel/intern/image.c | 41 ++++++++++++++++++++++ .../blender/render/intern/source/convertblender.c | 8 +++++ 3 files changed, 52 insertions(+) (limited to 'source') diff --git a/source/blender/blenkernel/BKE_image.h b/source/blender/blenkernel/BKE_image.h index ca34240cf27..a584722031b 100644 --- a/source/blender/blenkernel/BKE_image.h +++ b/source/blender/blenkernel/BKE_image.h @@ -148,6 +148,9 @@ void BKE_image_all_free_anim_ibufs(int except_frame); void BKE_image_memorypack(struct Image *ima); +/* prints memory statistics for images */ +void BKE_image_print_memlist(void); + #ifdef __cplusplus } #endif diff --git a/source/blender/blenkernel/intern/image.c b/source/blender/blenkernel/intern/image.c index 0c45356eb0b..3b7ab4951f6 100644 --- a/source/blender/blenkernel/intern/image.c +++ b/source/blender/blenkernel/intern/image.c @@ -629,6 +629,47 @@ void free_old_images() } } +static unsigned long image_mem_size(Image *ima) +{ + ImBuf *ibuf, *ibufm; + int level; + unsigned long size = 0; + + size= 0; + for(ibuf= ima->ibufs.first; ibuf; ibuf= ibuf->next) { + if(ibuf->rect) size += MEM_allocN_len(ibuf->rect); + else if(ibuf->rect_float) size += MEM_allocN_len(ibuf->rect_float); + + for(level=0; levelmipmap[level]; + if(ibufm) { + if(ibufm->rect) size += MEM_allocN_len(ibufm->rect); + else if(ibufm->rect_float) size += MEM_allocN_len(ibufm->rect_float); + } + } + } + + return size; +} + +void BKE_image_print_memlist(void) +{ + Image *ima; + unsigned long size, totsize= 0; + + for(ima= G.main->image.first; ima; ima= ima->id.next) + totsize += image_mem_size(ima); + + printf("\ntotal image memory len: %.3lf MB\n", (double)totsize/(double)(1024*1024)); + + for(ima= G.main->image.first; ima; ima= ima->id.next) { + size= image_mem_size(ima); + + if(size) + printf("%s len: %.3f MB\n", ima->id.name+2, (double)size/(double)(1024*1024)); + } +} + void BKE_image_free_all_textures(void) { Tex *tex; diff --git a/source/blender/render/intern/source/convertblender.c b/source/blender/render/intern/source/convertblender.c index 38ae7fde181..e4c62c15034 100644 --- a/source/blender/render/intern/source/convertblender.c +++ b/source/blender/render/intern/source/convertblender.c @@ -4129,6 +4129,14 @@ void RE_Database_Free(Render *re) { Object *ob = NULL; LampRen *lar; + + /* statistics for debugging render memory usage */ + if(G.f & G_DEBUG) { + if((re->r.scemode & R_PREVIEWBUTS)==0) { + BKE_image_print_memlist(); + MEM_printmemlist_stats(); + } + } /* FREE */ -- cgit v1.2.3