From b1c30dff885aa31417ec0389c479570ad0394967 Mon Sep 17 00:00:00 2001 From: Peter Schlaile Date: Sun, 2 Sep 2007 19:32:22 +0000 Subject: == Sequencer == Bugfix: The mem cache limitor didn't take mmap-allocated memory into account, resulting in effectively disabling it, since all imbuf-data is currently allocated using mmap. --- intern/memutil/MEM_CacheLimiter.h | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'intern') diff --git a/intern/memutil/MEM_CacheLimiter.h b/intern/memutil/MEM_CacheLimiter.h index c1c805b6310..13fb6b23446 100644 --- a/intern/memutil/MEM_CacheLimiter.h +++ b/intern/memutil/MEM_CacheLimiter.h @@ -68,6 +68,7 @@ extern "C" { extern int MEM_CacheLimiter_get_maximum(); // this is rather _ugly_! extern int mem_in_use; + extern int mmap_in_use; }; #endif @@ -148,7 +149,7 @@ public: return; } for (iterator it = queue.begin(); - it != queue.end() && mem_in_use > max;) { + it != queue.end() && mem_in_use + mmap_in_use > max;) { iterator jt = it; ++it; (*jt)->destroy_if_possible(); -- cgit v1.2.3