Rev 5784: (jameinel) Fix bug #758695, in file:///home/pqm/archives/thelove/bzr/%2Btrunk/

[Canonical.com Patch Queue Manager]

At file:///home/pqm/archives/thelove/bzr/%2Btrunk/

------------------------------------------------------------
revno: 5784 [merge]
revision-id: pqm at pqm.ubuntu.com-20110412235648-ezdrtqmgxot1ont2
parent: pqm at pqm.ubuntu.com-20110411221919-41dxeb7vorwmvo1y
parent: john at arbash-meinel.com-20110412145557-ltjdd171cbddfbrf
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Tue 2011-04-12 23:56:48 +0000
message:
  (jameinel) Fix bug #758695,
   correctly order cfn and cfi in callgrind output. (John A Meinel)
modified:
  bzrlib/lsprof.py               lsprof.py-20051208071030-833790916798ceed
=== modified file 'bzrlib/lsprof.py'
--- a/bzrlib/lsprof.py	2010-09-19 09:07:42 +0000
+++ b/bzrlib/lsprof.py	2011-04-12 14:55:57 +0000
@@ -275,12 +275,13 @@
         code = subentry.code
         totaltime = int(subentry.totaltime * 1000)
         #out_file.write('cob=%s\n' % (code.co_filename,))
-        out_file.write('cfn=%s\n' % (label(code, True),))
         if isinstance(code, str):
             out_file.write('cfi=~\n')
+            out_file.write('cfn=%s\n' % (label(code, True),))
             out_file.write('calls=%d 0\n' % (subentry.callcount,))
         else:
             out_file.write('cfi=%s\n' % (code.co_filename,))
+            out_file.write('cfn=%s\n' % (label(code, True),))
             out_file.write('calls=%d %d\n' % (
                 subentry.callcount, code.co_firstlineno))
         out_file.write('%d %d\n' % (lineno, totaltime))