diff options
| author | Peter Schlaile <peter@schlaile.de> | 2007-09-02 23:32:22 +0400 |
|---|---|---|
| committer | Peter Schlaile <peter@schlaile.de> | 2007-09-02 23:32:22 +0400 |
| commit | b1c30dff885aa31417ec0389c479570ad0394967 (patch) | |
| tree | 57dfe801e1b1783221a50b740b528d828f6d8994 /intern/memutil | |
| parent | 30f1deccd0fb23c408a9241174a939345412763c (diff) | |
== 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.
Diffstat (limited to 'intern/memutil')
| -rw-r--r-- | intern/memutil/MEM_CacheLimiter.h | 3 |
1 files changed, 2 insertions, 1 deletions
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(); |