[Zope-Checkins] CVS: Zope/lib/python/App - CacheManager.py:1.26.4.1 Common.py:1.15.4.7

Chris McDonough chrism@zope.com
Sat, 26 Oct 2002 15:52:08 -0400


Update of /cvs-repository/Zope/lib/python/App
In directory cvs.zope.org:/tmp/cvs-serv31373/lib/python/App

Modified Files:
      Tag: chrism-install-branch
	CacheManager.py Common.py 
Log Message:
Merge with HEAD.  Again, sorry for the spew (what's left of it... someone seems to have filtered some of this branch's checkins out).


=== Zope/lib/python/App/CacheManager.py 1.26 => 1.26.4.1 ===
--- Zope/lib/python/App/CacheManager.py:1.26	Wed Aug 14 17:31:40 2002
+++ Zope/lib/python/App/CacheManager.py	Sat Oct 26 15:51:37 2002
@@ -295,11 +295,13 @@
 
         total_load_count = 0
         total_store_count = 0
+        total_connections = 0
         limit = 0
         divs = []
         for div in analysis:
             total_store_count = total_store_count + div['stores']
             total_load_count = total_load_count + div['loads']
+            total_connections = total_connections + div['connections']
             sum = div['stores'] + div['loads']
             if sum > limit:
                 limit = sum
@@ -340,6 +342,7 @@
                 'trans_len': max(segment_height - store_len - load_len, 0),
                 'store_count': div['stores'],
                 'load_count': div['loads'],
+                'connections': div['connections'],
                 'start': div['start'],
                 'end': div['end'],
                 'time_offset': time_offset,
@@ -357,6 +360,7 @@
                'divs': divs,
                'total_store_count': total_store_count,
                'total_load_count': total_load_count,
+               'total_connections': total_connections,
                }
         return res
 


=== Zope/lib/python/App/Common.py 1.15.4.6 => 1.15.4.7 ===