/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar

« back to all changes in this revision

Viewing changes to tools/time_graph.py

  • Committer: John Arbash Meinel
  • Date: 2009-06-10 18:58:02 UTC
  • mto: (4371.4.5 vila-better-heads)
  • mto: This revision was merged to the branch mainline in revision 4449.
  • Revision ID: john@arbash-meinel.com-20090610185802-wsybzjfil447yhy2
Change VF.annotate to use the new KnownGraph code.

This shows a significant savings in the time for 'annotate NEWS', of about 5s/20s
for knit formats, and 45s => 20s for GC formats.


Also, factor the code into a helper, so that we can prepare for writing
a pyrex version.

Show diffs side-by-side

added added

removed removed

Lines of Context:
tools/time_graph.py
4
4
import time
5
5
import sys
6
6
import optparse
7
 
from bzrlib import (
8
 
    branch,
9
 
    commands,
10
 
    graph,
11
 
    ui,
12
 
    trace,
13
 
    _known_graph_py,
14
 
    _known_graph_pyx,
15
 
    )
 
7
from bzrlib import branch, commands, graph, ui, trace
16
8
from bzrlib.ui import text
17
9
 
18
10
p = optparse.OptionParser()
19
 
p.add_option('--quick', default=False, action='store_true')
20
11
p.add_option('--max-combinations', default=500, type=int)
21
12
p.add_option('--lsprof', default=None, type=str)
22
13
opts, args = p.parse_args(sys.argv[1:])
23
 
 
24
14
trace.enable_default_logging()
25
15
ui.ui_factory = text.TextUIFactory()
26
16
 
27
 
begin = time.clock()
28
17
if len(args) >= 1:
29
18
    b = branch.Branch.open(args[0])
30
19
else:
36
25
                         if p[1] is not None)
37
26
finally:
38
27
    b.unlock()
39
 
end = time.clock()
40
28
 
41
 
print 'Found %d nodes, loaded in %.3fs' % (len(parent_map), end - begin)
 
29
print 'Found %d nodes' % (len(parent_map),)
42
30
 
43
31
def all_heads_comp(g, combinations):
44
32
    h = []
51
39
    finally:
52
40
        pb.finished()
53
41
    return h
54
 
 
55
42
combinations = []
56
43
# parents = parent_map.keys()
57
44
# for p1 in parents:
66
53
for revision_id, parent_ids in parent_map.iteritems():
67
54
    if parent_ids is not None and len(parent_ids) > 1:
68
55
        combinations.append(parent_ids)
69
 
# The largest portion of the graph that has to be walked for a heads() check
70
 
# combinations = [('john@arbash-meinel.com-20090312021943-tu6tcog48aiujx4s',
71
 
#                  'john@arbash-meinel.com-20090312130552-09xa2xsitf6rilzc')]
72
56
if opts.max_combinations > 0 and len(combinations) > opts.max_combinations:
73
57
    combinations = random.sample(combinations, opts.max_combinations)
74
58
 
75
59
print '      %d combinations' % (len(combinations),)
76
 
 
77
 
def combi_graph(graph_klass, comb):
78
 
    # DEBUG
79
 
    graph._counters[1] = 0
80
 
    graph._counters[2] = 0
81
 
 
82
 
    begin = time.clock()
83
 
    g = graph_klass(parent_map)
84
 
    if opts.lsprof is not None:
85
 
        heads = commands.apply_lsprofiled(opts.lsprof, all_heads_comp, g, comb)
86
 
    else:
87
 
        heads = all_heads_comp(g, comb)
88
 
    end = time.clock()
89
 
    return dict(elapsed=(end - begin), graph=g, heads=heads)
90
 
 
91
 
def report(name, g):
92
 
    print '%s: %.3fs' % (name, g['elapsed'])
93
 
    counters_used = False
94
 
    for c in graph._counters:
95
 
        if c:
96
 
            counters_used = True
97
 
    if counters_used:
98
 
        print '  %s' % (graph._counters,)
99
 
 
100
 
known_python = combi_graph(_known_graph_py.KnownGraph, combinations)
101
 
report('Known', known_python)
102
 
 
103
 
known_pyrex = combi_graph(_known_graph_pyx.KnownGraph, combinations)
104
 
report('Known (pyx)', known_pyrex)
105
 
 
106
 
def _simple_graph(parent_map):
107
 
    return graph.Graph(graph.DictParentsProvider(parent_map))
108
 
 
109
 
if opts.quick:
110
 
    if known_python['heads'] != known_pyrex['heads']:
111
 
        import pdb; pdb.set_trace()
112
 
    print 'ratio: %.1f:1 faster' % (
113
 
        known_python['elapsed'] / known_pyrex['elapsed'],)
 
60
t1 = time.clock()
 
61
known_g = graph.KnownGraph(parent_map)
 
62
if opts.lsprof is not None:
 
63
    h_known = commands.apply_lsprofiled(opts.lsprof,
 
64
        all_heads_comp, known_g, combinations)
114
65
else:
115
 
    orig = combi_graph(_simple_graph, combinations)
116
 
    report('Orig', orig)
117
 
 
118
 
    if orig['heads'] != known_pyrex['heads']:
119
 
        import pdb; pdb.set_trace()
120
 
 
121
 
    print 'ratio: %.1f:1 faster' % (
122
 
        orig['elapsed'] / known_pyrex['elapsed'],)
 
66
    h_known = all_heads_comp(known_g, combinations)
 
67
t2 = time.clock()
 
68
print "Known: %.3fs" % (t2-t1,)
 
69
print "  %s" % (graph._counters,)
 
70
simple_g = graph.Graph(graph.DictParentsProvider(parent_map))
 
71
graph._counters[1] = 0
 
72
graph._counters[2] = 0
 
73
h_simple = all_heads_comp(simple_g, combinations)
 
74
t3 = time.clock()
 
75
print "Orig: %.3fs" % (t3-t2,)
 
76
print "  %s" % (graph._counters,)
 
77
if h_simple != h_known:
 
78
    import pdb; pdb.set_trace()
 
79
print 'ratio: %.3fs' % ((t2-t1) / (t3-t2))