[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [11923] trunk/blender/intern/memutil/ MEM_CacheLimiter.h: == Sequencer ==

[Peter Schlaile]

Revision: 11923
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=11923
Author:   schlaile
Date:     2007-09-02 21:32:22 +0200 (Sun, 02 Sep 2007)

Log Message:
-----------
== 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.

Modified Paths:
--------------
    trunk/blender/intern/memutil/MEM_CacheLimiter.h

Modified: trunk/blender/intern/memutil/MEM_CacheLimiter.h
===================================================================
--- trunk/blender/intern/memutil/MEM_CacheLimiter.h	2007-09-02 17:47:03 UTC (rev 11922)
+++ trunk/blender/intern/memutil/MEM_CacheLimiter.h	2007-09-02 19:32:22 UTC (rev 11923)
@@ -68,6 +68,7 @@
 	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 @@
 			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();