~bzr-pqm/bzr/bzr.dev

5590.1.2 by John Arbash Meinel
Change tuned_gzip.GzipFile to be deprecated
1
# Copyright (C) 2006-2011 Canonical Ltd
1641.1.1 by Robert Collins
* Various microoptimisations to knit and gzip - reducing function call
2
# Written by Robert Collins <robert.collins@canonical.com>
3
#
4
# This program is free software; you can redistribute it and/or modify
5
# it under the terms of the GNU General Public License as published by
6
# the Free Software Foundation; either version 2 of the License, or
7
# (at your option) any later version.
8
#
9
# This program is distributed in the hope that it will be useful,
10
# but WITHOUT ANY WARRANTY; without even the implied warranty of
11
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
12
# GNU General Public License for more details.
13
#
14
# You should have received a copy of the GNU General Public License
15
# along with this program; if not, write to the Free Software
4183.7.1 by Sabin Iacob
update FSF mailing address
16
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
1641.1.1 by Robert Collins
* Various microoptimisations to knit and gzip - reducing function call
17
18
"""Bzrlib specific gzip tunings. We plan to feed these to the upstream gzip."""
19
1908.4.12 by John Arbash Meinel
Minor change to tuned_gzip.
20
from cStringIO import StringIO
1908.4.5 by John Arbash Meinel
Some small tweaks to knit and tuned_gzip to shave off another couple seconds
21
1641.1.1 by Robert Collins
* Various microoptimisations to knit and gzip - reducing function call
22
# make GzipFile faster:
23
import gzip
3734.2.1 by Vincent Ladeuil
Fix U32, LOWU32 disapearance in python-2.6.
24
from gzip import FEXTRA, FCOMMENT, FNAME, FHCRC
1641.1.1 by Robert Collins
* Various microoptimisations to knit and gzip - reducing function call
25
import sys
26
import struct
27
import zlib
28
1666.1.6 by Robert Collins
Make knit the default format.
29
# we want a \n preserved, break on \n only splitlines.
5590.1.2 by John Arbash Meinel
Change tuned_gzip.GzipFile to be deprecated
30
from bzrlib import symbol_versioning
1666.1.6 by Robert Collins
Make knit the default format.
31
2817.3.1 by Robert Collins
* New helper ``bzrlib.tuned_gzip.bytes_to_gzip`` which takes a byte string
32
__all__ = ["GzipFile", "bytes_to_gzip"]
33
34
3734.2.1 by Vincent Ladeuil
Fix U32, LOWU32 disapearance in python-2.6.
35
def U32(i):
36
    """Return i as an unsigned integer, assuming it fits in 32 bits.
37
38
    If it's >= 2GB when viewed as a 32-bit unsigned int, return a long.
39
    """
40
    if i < 0:
41
        i += 1L << 32
42
    return i
43
44
45
def LOWU32(i):
46
    """Return the low-order 32 bits of an int, as a non-negative int."""
47
    return i & 0xFFFFFFFFL
48
49
2817.3.1 by Robert Collins
* New helper ``bzrlib.tuned_gzip.bytes_to_gzip`` which takes a byte string
50
def bytes_to_gzip(bytes, factory=zlib.compressobj,
51
    level=zlib.Z_DEFAULT_COMPRESSION, method=zlib.DEFLATED,
52
    width=-zlib.MAX_WBITS, mem=zlib.DEF_MEM_LEVEL,
53
    crc32=zlib.crc32):
54
    """Create a gzip file containing bytes and return its content."""
4398.8.2 by John Arbash Meinel
Add a chunks_to_gzip function.
55
    return chunks_to_gzip([bytes])
56
57
58
def chunks_to_gzip(chunks, factory=zlib.compressobj,
59
    level=zlib.Z_DEFAULT_COMPRESSION, method=zlib.DEFLATED,
60
    width=-zlib.MAX_WBITS, mem=zlib.DEF_MEM_LEVEL,
61
    crc32=zlib.crc32):
62
    """Create a gzip file containing chunks and return its content.
63
64
    :param chunks: An iterable of strings. Each string can have arbitrary
65
        layout.
66
    """
2817.3.1 by Robert Collins
* New helper ``bzrlib.tuned_gzip.bytes_to_gzip`` which takes a byte string
67
    result = [
68
        '\037\213'  # self.fileobj.write('\037\213')  # magic header
69
        '\010'      # self.fileobj.write('\010')      # compression method
70
                    # fname = self.filename[:-3]
71
                    # flags = 0
72
                    # if fname:
73
                    #     flags = FNAME
74
        '\x00'      # self.fileobj.write(chr(flags))
75
        '\0\0\0\0'  # write32u(self.fileobj, long(time.time()))
76
        '\002'      # self.fileobj.write('\002')
77
        '\377'      # self.fileobj.write('\377')
78
                    # if fname:
79
        ''          #     self.fileobj.write(fname + '\000')
80
        ]
81
    # using a compressobj avoids a small header and trailer that the compress()
82
    # utility function adds.
83
    compress = factory(level, method, width, mem, 0)
4398.8.2 by John Arbash Meinel
Add a chunks_to_gzip function.
84
    crc = 0
85
    total_len = 0
86
    for chunk in chunks:
87
        crc = crc32(chunk, crc)
88
        total_len += len(chunk)
89
        zbytes = compress.compress(chunk)
90
        if zbytes:
91
            result.append(zbytes)
2817.3.1 by Robert Collins
* New helper ``bzrlib.tuned_gzip.bytes_to_gzip`` which takes a byte string
92
    result.append(compress.flush())
93
    # size may exceed 2GB, or even 4GB
4398.8.2 by John Arbash Meinel
Add a chunks_to_gzip function.
94
    result.append(struct.pack("<LL", LOWU32(crc), LOWU32(total_len)))
2817.3.1 by Robert Collins
* New helper ``bzrlib.tuned_gzip.bytes_to_gzip`` which takes a byte string
95
    return ''.join(result)
1641.1.1 by Robert Collins
* Various microoptimisations to knit and gzip - reducing function call
96
97
98
class GzipFile(gzip.GzipFile):
99
    """Knit tuned version of GzipFile.
100
101
    This is based on the following lsprof stats:
102
    python 2.4 stock GzipFile write:
103
    58971      0   5644.3090   2721.4730   gzip:193(write)
104
    +58971     0   1159.5530   1159.5530   +<built-in method compress>
105
    +176913    0    987.0320    987.0320   +<len>
106
    +58971     0    423.1450    423.1450   +<zlib.crc32>
107
    +58971     0    353.1060    353.1060   +<method 'write' of 'cStringIO.
108
                                            StringO' objects>
109
    tuned GzipFile write:
110
    58971      0   4477.2590   2103.1120   bzrlib.knit:1250(write)
111
    +58971     0   1297.7620   1297.7620   +<built-in method compress>
112
    +58971     0    406.2160    406.2160   +<zlib.crc32>
113
    +58971     0    341.9020    341.9020   +<method 'write' of 'cStringIO.
114
                                            StringO' objects>
115
    +58971     0    328.2670    328.2670   +<len>
116
117
118
    Yes, its only 1.6 seconds, but they add up.
119
    """
120
5590.1.2 by John Arbash Meinel
Change tuned_gzip.GzipFile to be deprecated
121
    def __init__(self, *args, **kwargs):
122
        symbol_versioning.warn(
123
            symbol_versioning.deprecated_in((2, 3, 0))
124
            % 'bzrlib.tuned_gzip.GzipFile',
125
            DeprecationWarning, stacklevel=2)
126
        gzip.GzipFile.__init__(self, *args, **kwargs)
127
1641.1.1 by Robert Collins
* Various microoptimisations to knit and gzip - reducing function call
128
    def _add_read_data(self, data):
129
        # 4169 calls in 183
130
        # temp var for len(data) and switch to +='s.
131
        # 4169 in 139
132
        len_data = len(data)
133
        self.crc = zlib.crc32(data, self.crc)
134
        self.extrabuf += data
135
        self.extrasize += len_data
136
        self.size += len_data
137
1908.4.3 by John Arbash Meinel
Shave another second off of _record_to_data time, by optimizing single write versus multiple writes
138
    def _write_gzip_header(self):
139
        """A tuned version of gzip._write_gzip_header
140
141
        We have some extra constrains that plain Gzip does not.
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
142
        1) We want to write the whole blob at once. rather than multiple
1908.4.10 by John Arbash Meinel
Small cleanups
143
           calls to fileobj.write().
1908.4.3 by John Arbash Meinel
Shave another second off of _record_to_data time, by optimizing single write versus multiple writes
144
        2) We never have a filename
145
        3) We don't care about the time
146
        """
147
        self.fileobj.write(
148
           '\037\213'   # self.fileobj.write('\037\213')  # magic header
149
            '\010'      # self.fileobj.write('\010')      # compression method
150
                        # fname = self.filename[:-3]
151
                        # flags = 0
152
                        # if fname:
153
                        #     flags = FNAME
154
            '\x00'      # self.fileobj.write(chr(flags))
155
            '\0\0\0\0'  # write32u(self.fileobj, long(time.time()))
156
            '\002'      # self.fileobj.write('\002')
157
            '\377'      # self.fileobj.write('\377')
158
                        # if fname:
159
            ''          #     self.fileobj.write(fname + '\000')
160
            )
161
1641.1.1 by Robert Collins
* Various microoptimisations to knit and gzip - reducing function call
162
    def _read(self, size=1024):
163
        # various optimisations:
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
164
        # reduces lsprof count from 2500 to
1641.1.1 by Robert Collins
* Various microoptimisations to knit and gzip - reducing function call
165
        # 8337 calls in 1272, 365 internal
166
        if self.fileobj is None:
167
            raise EOFError, "Reached EOF"
168
169
        if self._new_member:
170
            # If the _new_member flag is set, we have to
171
            # jump to the next member, if there is one.
172
            #
173
            # First, check if we're at the end of the file;
174
            # if so, it's time to stop; no more members to read.
175
            next_header_bytes = self.fileobj.read(10)
176
            if next_header_bytes == '':
177
                raise EOFError, "Reached EOF"
178
179
            self._init_read()
180
            self._read_gzip_header(next_header_bytes)
181
            self.decompress = zlib.decompressobj(-zlib.MAX_WBITS)
182
            self._new_member = False
183
184
        # Read a chunk of data from the file
185
        buf = self.fileobj.read(size)
186
187
        # If the EOF has been reached, flush the decompression object
188
        # and mark this object as finished.
189
190
        if buf == "":
191
            self._add_read_data(self.decompress.flush())
3376.2.4 by Martin Pool
Remove every assert statement from bzrlib!
192
            if len(self.decompress.unused_data) < 8:
193
                raise AssertionError("what does flush do?")
1666.1.11 by Robert Collins
Really fix short-read support in tuned_gzip. The python zlib module behaved differently than thought.
194
            self._gzip_tail = self.decompress.unused_data[0:8]
1641.1.1 by Robert Collins
* Various microoptimisations to knit and gzip - reducing function call
195
            self._read_eof()
196
            # tell the driving read() call we have stuffed all the data
197
            # in self.extrabuf
198
            raise EOFError, 'Reached EOF'
199
200
        self._add_read_data(self.decompress.decompress(buf))
201
202
        if self.decompress.unused_data != "":
203
            # Ending case: we've come to the end of a member in the file,
204
            # so seek back to the start of the data for the next member which
205
            # is the length of the decompress objects unused data - the first
206
            # 8 bytes for the end crc and size records.
207
            #
208
            # so seek back to the start of the unused data, finish up
209
            # this member, and read a new gzip header.
210
            # (The number of bytes to seek back is the length of the unused
211
            # data, minus 8 because those 8 bytes are part of this member.
212
            seek_length = len (self.decompress.unused_data) - 8
1666.1.2 by Robert Collins
Fix race condition between end of stream and end of file with tuned_gzip.
213
            if seek_length > 0:
214
                # we read too much data
1641.1.1 by Robert Collins
* Various microoptimisations to knit and gzip - reducing function call
215
                self.fileobj.seek(-seek_length, 1)
1666.1.11 by Robert Collins
Really fix short-read support in tuned_gzip. The python zlib module behaved differently than thought.
216
                self._gzip_tail = self.decompress.unused_data[0:8]
1666.1.2 by Robert Collins
Fix race condition between end of stream and end of file with tuned_gzip.
217
            elif seek_length < 0:
218
                # we haven't read enough to check the checksum.
3376.2.4 by Martin Pool
Remove every assert statement from bzrlib!
219
                if not (-8 < seek_length):
220
                    raise AssertionError("too great a seek")
1666.1.2 by Robert Collins
Fix race condition between end of stream and end of file with tuned_gzip.
221
                buf = self.fileobj.read(-seek_length)
1666.1.11 by Robert Collins
Really fix short-read support in tuned_gzip. The python zlib module behaved differently than thought.
222
                self._gzip_tail = self.decompress.unused_data + buf
223
            else:
224
                self._gzip_tail = self.decompress.unused_data
1641.1.1 by Robert Collins
* Various microoptimisations to knit and gzip - reducing function call
225
226
            # Check the CRC and file size, and set the flag so we read
227
            # a new member on the next call
228
            self._read_eof()
229
            self._new_member = True
230
231
    def _read_eof(self):
232
        """tuned to reduce function calls and eliminate file seeking:
233
        pass 1:
234
        reduces lsprof count from 800 to 288
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
235
        4168 in 296
1641.1.1 by Robert Collins
* Various microoptimisations to knit and gzip - reducing function call
236
        avoid U32 call by using struct format L
237
        4168 in 200
238
        """
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
239
        # We've read to the end of the file, so we should have 8 bytes of
1759.2.2 by Jelmer Vernooij
Revert some of my spelling fixes and fix some typos after review by Aaron.
240
        # unused data in the decompressor. If we don't, there is a corrupt file.
1641.1.1 by Robert Collins
* Various microoptimisations to knit and gzip - reducing function call
241
        # We use these 8 bytes to calculate the CRC and the recorded file size.
242
        # We then check the that the computed CRC and size of the
243
        # uncompressed data matches the stored values.  Note that the size
244
        # stored is the true file size mod 2**32.
3376.2.4 by Martin Pool
Remove every assert statement from bzrlib!
245
        if not (len(self._gzip_tail) == 8):
246
            raise AssertionError("gzip trailer is incorrect length.")
1666.1.11 by Robert Collins
Really fix short-read support in tuned_gzip. The python zlib module behaved differently than thought.
247
        crc32, isize = struct.unpack("<LL", self._gzip_tail)
1641.1.1 by Robert Collins
* Various microoptimisations to knit and gzip - reducing function call
248
        # note that isize is unsigned - it can exceed 2GB
249
        if crc32 != U32(self.crc):
1666.1.2 by Robert Collins
Fix race condition between end of stream and end of file with tuned_gzip.
250
            raise IOError, "CRC check failed %d %d" % (crc32, U32(self.crc))
1641.1.1 by Robert Collins
* Various microoptimisations to knit and gzip - reducing function call
251
        elif isize != LOWU32(self.size):
252
            raise IOError, "Incorrect length of data produced"
253
254
    def _read_gzip_header(self, bytes=None):
255
        """Supply bytes if the minimum header size is already read.
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
256
1641.1.1 by Robert Collins
* Various microoptimisations to knit and gzip - reducing function call
257
        :param bytes: 10 bytes of header data.
258
        """
259
        """starting cost: 300 in 3998
260
        15998 reads from 3998 calls
261
        final cost 168
262
        """
263
        if bytes is None:
264
            bytes = self.fileobj.read(10)
265
        magic = bytes[0:2]
266
        if magic != '\037\213':
267
            raise IOError, 'Not a gzipped file'
268
        method = ord(bytes[2:3])
269
        if method != 8:
270
            raise IOError, 'Unknown compression method'
271
        flag = ord(bytes[3:4])
272
        # modtime = self.fileobj.read(4) (bytes [4:8])
273
        # extraflag = self.fileobj.read(1) (bytes[8:9])
274
        # os = self.fileobj.read(1) (bytes[9:10])
275
        # self.fileobj.read(6)
276
277
        if flag & FEXTRA:
278
            # Read & discard the extra field, if present
279
            xlen = ord(self.fileobj.read(1))
280
            xlen = xlen + 256*ord(self.fileobj.read(1))
281
            self.fileobj.read(xlen)
282
        if flag & FNAME:
283
            # Read and discard a null-terminated string containing the filename
284
            while True:
285
                s = self.fileobj.read(1)
286
                if not s or s=='\000':
287
                    break
288
        if flag & FCOMMENT:
289
            # Read and discard a null-terminated string containing a comment
290
            while True:
291
                s = self.fileobj.read(1)
292
                if not s or s=='\000':
293
                    break
294
        if flag & FHCRC:
295
            self.fileobj.read(2)     # Read & discard the 16-bit header CRC
296
297
    def readline(self, size=-1):
298
        """Tuned to remove buffer length calls in _unread and...
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
299
1641.1.1 by Robert Collins
* Various microoptimisations to knit and gzip - reducing function call
300
        also removes multiple len(c) calls, inlines _unread,
301
        total savings - lsprof 5800 to 5300
302
        phase 2:
303
        4168 calls in 2233
304
        8176 calls to read() in 1684
305
        changing the min chunk size to 200 halved all the cache misses
306
        leading to a drop to:
307
        4168 calls in 1977
308
        4168 call to read() in 1646
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
309
        - i.e. just reduced the function call overhead. May be worth
1641.1.1 by Robert Collins
* Various microoptimisations to knit and gzip - reducing function call
310
          keeping.
311
        """
312
        if size < 0: size = sys.maxint
313
        bufs = []
314
        readsize = min(200, size)    # Read from the file in small chunks
315
        while True:
316
            if size == 0:
317
                return "".join(bufs) # Return resulting line
318
319
            # c is the chunk
320
            c = self.read(readsize)
321
            # number of bytes read
322
            len_c = len(c)
323
            i = c.find('\n')
324
            if size is not None:
325
                # We set i=size to break out of the loop under two
326
                # conditions: 1) there's no newline, and the chunk is
327
                # larger than size, or 2) there is a newline, but the
328
                # resulting line would be longer than 'size'.
329
                if i==-1 and len_c > size: i=size-1
330
                elif size <= i: i = size -1
331
332
            if i >= 0 or c == '':
333
                # if i>= 0 we have a newline or have triggered the above
334
                # if size is not None condition.
335
                # if c == '' its EOF.
336
                bufs.append(c[:i+1])    # Add portion of last chunk
337
                # -- inlined self._unread --
338
                ## self._unread(c[i+1:], len_c - i)   # Push back rest of chunk
339
                self.extrabuf = c[i+1:] + self.extrabuf
340
                self.extrasize = len_c - i + self.extrasize
341
                self.offset -= len_c - i
342
                # -- end inlined self._unread --
343
                return ''.join(bufs)    # Return resulting line
344
345
            # Append chunk to list, decrease 'size',
346
            bufs.append(c)
347
            size = size - len_c
348
            readsize = min(size, readsize * 2)
349
350
    def readlines(self, sizehint=0):
351
        # optimise to avoid all the buffer manipulation
352
        # lsprof changed from:
353
        # 4168 calls in 5472 with 32000 calls to readline()
354
        # to :
355
        # 4168 calls in 417.
356
        # Negative numbers result in reading all the lines
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
357
1908.4.15 by John Arbash Meinel
comment on tuned_gzip.readlines() functionality.
358
        # python's gzip routine uses sizehint. This is a more efficient way
359
        # than python uses to honor it. But it is even more efficient to
360
        # just read the entire thing and use cStringIO to split into lines.
361
        # if sizehint <= 0:
362
        #     sizehint = -1
363
        # content = self.read(sizehint)
364
        # return bzrlib.osutils.split_lines(content)
1908.4.12 by John Arbash Meinel
Minor change to tuned_gzip.
365
        content = StringIO(self.read(-1))
1908.4.5 by John Arbash Meinel
Some small tweaks to knit and tuned_gzip to shave off another couple seconds
366
        return content.readlines()
1641.1.1 by Robert Collins
* Various microoptimisations to knit and gzip - reducing function call
367
368
    def _unread(self, buf, len_buf=None):
369
        """tuned to remove unneeded len calls.
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
370
1641.1.1 by Robert Collins
* Various microoptimisations to knit and gzip - reducing function call
371
        because this is such an inner routine in readline, and readline is
372
        in many inner loops, this has been inlined into readline().
373
374
        The len_buf parameter combined with the reduction in len calls dropped
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
375
        the lsprof ms count for this routine on my test data from 800 to 200 -
1641.1.1 by Robert Collins
* Various microoptimisations to knit and gzip - reducing function call
376
        a 75% saving.
377
        """
378
        if len_buf is None:
379
            len_buf = len(buf)
380
        self.extrabuf = buf + self.extrabuf
381
        self.extrasize = len_buf + self.extrasize
382
        self.offset -= len_buf
383
384
    def write(self, data):
385
        if self.mode != gzip.WRITE:
386
            import errno
387
            raise IOError(errno.EBADF, "write() on read-only GzipFile object")
388
389
        if self.fileobj is None:
390
            raise ValueError, "write() on closed GzipFile object"
391
        data_len = len(data)
392
        if data_len > 0:
393
            self.size = self.size + data_len
394
            self.crc = zlib.crc32(data, self.crc)
395
            self.fileobj.write( self.compress.compress(data) )
396
            self.offset += data_len
397
398
    def writelines(self, lines):
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
399
        # profiling indicated a significant overhead
1641.1.1 by Robert Collins
* Various microoptimisations to knit and gzip - reducing function call
400
        # calling write for each line.
401
        # this batch call is a lot faster :).
402
        # (4 seconds to 1 seconds for the sample upgrades I was testing).
403
        self.write(''.join(lines))
404
5340.9.2 by Martin
Add close method for tuned_gzip on Python 2.7 to adapt to gzip positive crc requirement
405
    if sys.version_info > (2, 7):
406
        # As of Python 2.7 the crc32 must be positive when close is called
407
        def close(self):
408
            if self.fileobj is None:
409
                return
410
            if self.mode == gzip.WRITE:
411
                self.crc &= 0xFFFFFFFFL
412
            gzip.GzipFile.close(self)
1641.1.1 by Robert Collins
* Various microoptimisations to knit and gzip - reducing function call
413