← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/strace.py

  • Committer: Martin Packman
  • Date: 2012-01-05 10:44:12 UTC
  • mfrom: (6424 +trunk)
  • mto: This revision was merged to the branch mainline in revision 6427.
  • Revision ID: martin.packman@canonical.com-20120105104412-z03fi9m43h946fvs
Merge bzr.dev to resolve conflicts

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/strace.py
17
17
 
18
18
"""Support for running strace against the current process."""
19
19
 
20
 
import errno
 
20
from __future__ import absolute_import
 
21
 
21
22
import os
22
23
import signal
23
24
import subprocess
26
27
from bzrlib import errors
27
28
 
28
29
 
29
 
# this is currently test-focused, so importing bzrlib.tests is ok. We might
30
 
# want to move feature to its own module though.
31
 
from bzrlib.tests.features import Feature
32
 
 
33
 
 
34
30
def strace(function, *args, **kwargs):
35
31
    """Invoke strace on function.
36
32
 
54
50
    # start strace
55
51
    strace_cmd = ['strace', '-r', '-tt', '-p', str(pid), '-o', log_file.name]
56
52
    if follow_children:
57
 
        strace_args.append('-f')
 
53
        strace_cmd.append('-f')
58
54
    # need to catch both stdout and stderr to work around
59
55
    # bug 627208
60
56
    proc = subprocess.Popen(strace_cmd,