[gentoo-commits] portage r10769 - main/trunk/pym/_emerge

[gentoo-commits] portage r10769 - main/trunk/pym/_emerge

[Zac Medico (zmedico)]

Author: zmedico
Date: 2008-06-24 05:52:48 +0000 (Tue, 24 Jun 2008)
New Revision: 10769

Modified:
   main/trunk/pym/_emerge/__init__.py
Log:
Clear dbapi caches just after deleting the depgraph in action_build().
This trims down the heap size by a few megs, for bug #229069.


Modified: main/trunk/pym/_emerge/__init__.py
===================================================================
--- main/trunk/pym/_emerge/__init__.py	2008-06-24 01:00:47 UTC (rev 10768)
+++ main/trunk/pym/_emerge/__init__.py	2008-06-24 05:52:48 UTC (rev 10769)
@@ -20,6 +20,7 @@
 except KeyboardInterrupt:
 	sys.exit(1)
 
+import gc
 import os, stat
 import platform
 
@@ -8739,6 +8740,8 @@
 				time.sleep(3) # allow the parent to have first fetch
 			mymergelist = mydepgraph.altlist()
 			del mydepgraph
+			clear_caches(trees)
+
 			retval = mergetask.merge(mymergelist, favorites, mtimedb)
 			merge_count = mergetask.curval
 		else:
@@ -8780,6 +8783,8 @@
 			pkglist = mydepgraph.altlist()
 			mydepgraph.saveNomergeFavorites()
 			del mydepgraph
+			clear_caches(trees)
+
 			mergetask = MergeTask(settings, trees, myopts)
 			retval = mergetask.merge(pkglist, favorites, mtimedb)
 			merge_count = mergetask.curval
@@ -8903,6 +8908,14 @@
 		settings = trees[myroot]["vartree"].settings
 		settings.validate()
 
+def clear_caches(trees):
+	for d in trees.itervalues():
+		d["porttree"].dbapi.melt()
+		d["porttree"].dbapi._aux_cache.clear()
+		d["bintree"].dbapi._aux_cache.clear()
+		d["bintree"].dbapi._clear_cache()
+	gc.collect()
+
 def load_emerge_config(trees=None):
 	kwargs = {}
 	for k, envvar in (("config_root", "PORTAGE_CONFIGROOT"), ("target_root", "ROOT")):

-- 
gentoo-commits@lists.gentoo.org mailing list