← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/strace.py

Merge bzr.dev into cleanup

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/strace.py
23
23
import subprocess
24
24
import tempfile
25
25
 
 
26
from bzrlib import errors
 
27
 
 
28
 
26
29
# this is currently test-focused, so importing bzrlib.tests is ok. We might
27
30
# want to move feature to its own module though.
28
31
from bzrlib.tests import Feature
46
49
    # capture strace output to a file
47
50
    log_file = tempfile.NamedTemporaryFile()
48
51
    log_file_fd = log_file.fileno()
 
52
    err_file = tempfile.NamedTemporaryFile()
49
53
    pid = os.getpid()
50
54
    # start strace
51
55
    strace_cmd = ['strace', '-r', '-tt', '-p', str(pid), '-o', log_file.name]
52
56
    if follow_children:
53
57
        strace_args.append('-f')
 
58
    # need to catch both stdout and stderr to work around
 
59
    # bug 627208
54
60
    proc = subprocess.Popen(strace_cmd,
55
61
                            stdout=subprocess.PIPE,
56
 
                            stderr=subprocess.STDOUT)
 
62
                            stderr=err_file.fileno())
57
63
    # Wait for strace to attach
58
64
    attached_notice = proc.stdout.readline()
59
65
    # Run the function to strace
65
71
    log_file.seek(0)
66
72
    log = log_file.read()
67
73
    log_file.close()
68
 
    return result, StraceResult(log)
 
74
    # and stderr
 
75
    err_file.seek(0)
 
76
    err_messages = err_file.read()
 
77
    err_file.close()
 
78
    # and read any errors
 
79
    if err_messages.startswith("attach: ptrace(PTRACE_ATTACH,"):
 
80
        raise StraceError(err_messages=err_messages)
 
81
    return result, StraceResult(log, err_messages)
 
82
 
 
83
 
 
84
class StraceError(errors.BzrError):
 
85
    
 
86
    _fmt = "strace failed: %(err_messages)s"
69
87
 
70
88
 
71
89
class StraceResult(object):
72
90
    """The result of stracing a function."""
73
91
 
74
 
    def __init__(self, raw_log):
 
92
    def __init__(self, raw_log, err_messages):
75
93
        """Create a StraceResult.
76
94
 
77
95
        :param raw_log: The output that strace created.
78
96
        """
79
97
        self.raw_log = raw_log
 
98
        self.err_messages = err_messages
80
99
 
81
100
 
82
101
class _StraceFeature(Feature):