Rev 4176: (jam) Tweaks to trace.debug_memory() for windows. in file:///home/pqm/archives/thelove/bzr/%2Btrunk/
Canonical.com Patch Queue Manager
pqm at pqm.ubuntu.com
Fri Mar 20 16:25:06 GMT 2009
At file:///home/pqm/archives/thelove/bzr/%2Btrunk/
------------------------------------------------------------
revno: 4176
revision-id: pqm at pqm.ubuntu.com-20090320162502-09zcxxom3xmdqhfa
parent: pqm at pqm.ubuntu.com-20090320074349-siii554u411pxpyz
parent: john at arbash-meinel.com-20090320150959-6zv3nfhq97qz3x4r
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Fri 2009-03-20 16:25:02 +0000
message:
(jam) Tweaks to trace.debug_memory() for windows.
modified:
bzrlib/win32utils.py win32console.py-20051021033308-123c6c929d04973d
------------------------------------------------------------
revno: 4163.1.2
revision-id: john at arbash-meinel.com-20090320150959-6zv3nfhq97qz3x4r
parent: john at arbash-meinel.com-20090320150620-fvmi7c9dwp4d6w1i
parent: pqm at pqm.ubuntu.com-20090320074349-siii554u411pxpyz
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: jam-integration
timestamp: Fri 2009-03-20 10:09:59 -0500
message:
Merge bzr.dev, which changed kB => KB.
Though honestly, kB was chosen because it matched the output of /proc/PID/status.
added:
bzrlib/filters/ filters-20080416080515-mkxl29amuwrf6uir-1
bzrlib/filters/__init__.py __init__.py-20080416080515-mkxl29amuwrf6uir-2
bzrlib/help_topics/en/content-filters.txt contentfilters.txt-20080516145112-7x1meuoci5w41isv-1
bzrlib/tests/ftp_server/ ftp_server-20090227112800-4r9jkezw2hw9tij7-1
bzrlib/tests/ftp_server/__init__.py __init__.py-20090227130107-4gcpgvr00l7v3fsw-1
bzrlib/tests/ftp_server/pyftpdlib_based.py pyftpdlib_based.py-20090227151014-882k9q34m1gwnhvi-1
bzrlib/tests/test_filters.py test_filters.py-20080417120614-tc3zok0vvvprsc99-1
bzrlib/tests/workingtree_implementations/test_content_filters.py test_content_filters-20080424071441-8navsrmrfdxpn90a-1
renamed:
bzrlib/tests/ftp_server.py => bzrlib/tests/ftp_server/medusa_based.py ftpserver.py-20071019102346-61jbvdkrr70igauv-1
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/builtins.py builtins.py-20050830033751-fc01482b9ca23183
bzrlib/bzrdir.py bzrdir.py-20060131065624-156dfea39c4387cb
bzrlib/export/__init__.py __init__.py-20051114235828-1ba62cb4062304e6
bzrlib/export/dir_exporter.py dir_exporter.py-20051114235828-b51397f56bc7b117
bzrlib/export/tar_exporter.py tar_exporter.py-20051114235828-1f6349a2f090a5d0
bzrlib/export/zip_exporter.py zip_exporter.py-20051114235828-8f57f954fba6497e
bzrlib/hashcache.py hashcache.py-20050706091756-fe3a8cc1143ff24f
bzrlib/help_topics/__init__.py help_topics.py-20060920210027-rnim90q9e0bwxvy4-1
bzrlib/help_topics/en/debug-flags.txt debugflags.txt-20090312050229-rdspqbqq4fzbjtpe-1
bzrlib/osutils.py osutils.py-20050309040759-eeaff12fbf77ac86
bzrlib/tests/__init__.py selftest.py-20050531073622-8d0e3c8845c97a64
bzrlib/tests/blackbox/test_cat.py test_cat.py-20051201162916-f0937e4e19ea24b3
bzrlib/tests/blackbox/test_push.py test_push.py-20060329002750-929af230d5d22663
bzrlib/tests/blackbox/test_selftest.py test_selftest.py-20060123024542-01c5f1bbcb596d78
bzrlib/tests/test_ftp_transport.py test_aftp_transport.-20060823221619-98mwjzxtwtkt527k-1
bzrlib/tests/test_hashcache.py testhashcache.py-20050706091800-0288ab2659338981
bzrlib/tests/test_osutils.py test_osutils.py-20051201224856-e48ee24c12182989
bzrlib/tests/test_transport_implementations.py test_transport_implementations.py-20051227111451-f97c5c7d5c49fce7
bzrlib/tests/workingtree_implementations/__init__.py __init__.py-20060203003124-b2aa5aca21a8bfad
bzrlib/transform.py transform.py-20060105172343-dd99e54394d91687
bzrlib/transport/__init__.py transport.py-20050711165921-4978aa7ce1285ad5
bzrlib/transport/ftp/__init__.py ftp.py-20051116161804-58dc9506548c2a53
bzrlib/transport/ftp/_gssapi.py _gssapi.py-20080611190840-7ejrtp884bk5eu72-2
bzrlib/transport/log.py log.py-20080902041816-vh8x5yt5nvdzvew3-5
bzrlib/tree.py tree.py-20050309040759-9d5f2496be663e77
bzrlib/ui/text.py text.py-20051130153916-2e438cffc8afc478
bzrlib/win32utils.py win32console.py-20051021033308-123c6c929d04973d
bzrlib/workingtree.py workingtree.py-20050511021032-29b6ec0a681e02e3
bzrlib/workingtree_4.py workingtree_4.py-20070208044105-5fgpc5j3ljlh5q6c-1
doc/developers/HACKING.txt HACKING-20050805200004-2a5dc975d870f78c
doc/developers/index.txt index.txt-20070508041241-qznziunkg0nffhiw-1
doc/developers/overview.txt overview.txt-20080904022501-ww2ggomrs5elxfm0-1
doc/developers/performance-contributing.txt performancecontribut-20070621063612-ac4zhhagjzkr21qp-1
doc/developers/releasing.txt releasing.txt-20080502015919-fnrcav8fwy8ccibu-1
bzrlib/tests/ftp_server/medusa_based.py ftpserver.py-20071019102346-61jbvdkrr70igauv-1
------------------------------------------------------------
revno: 4163.1.1
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.
modified:
bzrlib/win32utils.py win32console.py-20051021033308-123c6c929d04973d
=== modified file 'bzrlib/win32utils.py'
--- a/bzrlib/win32utils.py 2009-03-20 07:01:11 +0000
+++ b/bzrlib/win32utils.py 2009-03-20 15:09:59 +0000
@@ -144,10 +144,17 @@
trace.note('Cannot debug memory on win32 without ctypes'
' or win32process')
return
+ if short:
+ trace.note('WorkingSize %7dKB'
+ '\tPeakWorking %7dKB\t%s',
+ info['WorkingSetSize'] / 1024,
+ info['PeakWorkingSetSize'] / 1024,
+ message)
+ return
+ if message:
+ trace.note('%s', 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)
More information about the bazaar-commits
mailing list