← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/progress.py

  • Committer: John Arbash Meinel
  • Date: 2010-08-05 16:27:35 UTC
  • mto: This revision was merged to the branch mainline in revision 5374.
  • Revision ID: john@arbash-meinel.com-20100805162735-172opvx34sr5gpbl
Find a case where we are wasting a bit of memory.

Specifically the 'build_details' tuple contains a lot of wasted references,
and we hold on to one of these for each record we are fetching.
And for something like 'bzr pack', that is all keys.

For just loading all text build details on my bzr+ repository, With:
locations = b.repository.texts._index.get_build_details(b.repository.texts.keys())
This drops the memory consumption from:
WorkingSize   77604KiB
 to
WorkingSize   64640KiB

Or around 10.6MB. I worked it out to a savings of about 80 bytes/record
on data that can have hundreds of thousands of records (in 32-bit).

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/progress.py
166
166
            self.ui_factory.clear_term()
167
167
 
168
168
 
 
169
# NOTE: This is also deprecated; you should provide a ProgressView instead.
 
170
class _BaseProgressBar(object):
 
171
 
 
172
    def __init__(self,
 
173
                 to_file=None,
 
174
                 show_pct=False,
 
175
                 show_spinner=False,
 
176
                 show_eta=False,
 
177
                 show_bar=True,
 
178
                 show_count=True,
 
179
                 to_messages_file=None,
 
180
                 _stack=None):
 
181
        object.__init__(self)
 
182
        if to_file is None:
 
183
            to_file = sys.stderr
 
184
        if to_messages_file is None:
 
185
            to_messages_file = sys.stdout
 
186
        self.to_file = to_file
 
187
        self.to_messages_file = to_messages_file
 
188
        self.last_msg = None
 
189
        self.last_cnt = None
 
190
        self.last_total = None
 
191
        self.show_pct = show_pct
 
192
        self.show_spinner = show_spinner
 
193
        self.show_eta = show_eta
 
194
        self.show_bar = show_bar
 
195
        self.show_count = show_count
 
196
        self._stack = _stack
 
197
        # seed throttler
 
198
        self.MIN_PAUSE = 0.1 # seconds
 
199
        now = time.time()
 
200
        # starting now
 
201
        self.start_time = now
 
202
        # next update should not throttle
 
203
        self.last_update = now - self.MIN_PAUSE - 1
 
204
 
 
205
    def finished(self):
 
206
        """Return this bar to its progress stack."""
 
207
        self.clear()
 
208
        self._stack.return_pb(self)
 
209
 
 
210
 
169
211
class DummyProgress(object):
170
212
    """Progress-bar standin that does nothing.
171
213