Rev 4164: Some small fixes for the win32 'trace.debug_mem()' code. in http://bzr.arbash-meinel.com/branches/bzr/jam-integration

[John Arbash Meinel]

At http://bzr.arbash-meinel.com/branches/bzr/jam-integration

------------------------------------------------------------
revno: 4164
revision-id: john at arbash-meinel.com-20090320150620-fvmi7c9dwp4d6w1i
parent: pqm at pqm.ubuntu.com-20090318051809-7p0igxlyeg4szx72
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: jam-integration
timestamp: Fri 2009-03-20 10:06:20 -0500
message:
  Some small fixes for the win32 'trace.debug_mem()' code.
-------------- next part --------------
=== modified file 'bzrlib/win32utils.py'
--- a/bzrlib/win32utils.py	2009-02-23 15:29:35 +0000
+++ b/bzrlib/win32utils.py	2009-03-20 15:06:20 +0000
@@ -144,10 +144,22 @@
         trace.note('Cannot debug memory on win32 without ctypes'
                    ' or win32process')
         return
+    if short:
+        trace.note('WorkingSize %7dK'
+                   '\tPeakWorking %7dK\t%s',
+                   info['WorkingSetSize'] / 1024,
+                   info['PeakWorkingSetSize'] / 1024,
+                   message)
+        return
+    if message:
+        trace.note('%s', message)
+    trace.note('WorkingSize %8dKiB'
+               '\tPeakWorking %8dKiB\t%s',
+               info['WorkingSetSize'] / 1024,
+               info['PeakWorkingSetSize'] / 1024,
+               message)
     trace.note('WorkingSize       %8d kB', info['WorkingSetSize'] / 1024)
     trace.note('PeakWorking       %8d kB', info['PeakWorkingSetSize'] / 1024)
-    if short:
-        return
     trace.note('PagefileUsage     %8d kB', info.get('PagefileUsage', 0) / 1024)
     trace.note('PeakPagefileUsage %8d kB', info.get('PeakPagefileUsage', 0) / 1024)
     trace.note('PrivateUsage      %8d kB', info.get('PrivateUsage', 0) / 1024)