/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar
1641.1.1 by Robert Collins
* Various microoptimisations to knit and gzip - reducing function call
1
# Copyright (C) 2005, 2006 by Canonical Ltd
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
16
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
17
18
"""Bzrlib specific gzip tunings. We plan to feed these to the upstream gzip."""
19
20
# make GzipFile faster:
21
import gzip
22
from gzip import U32, LOWU32, FEXTRA, FCOMMENT, FNAME, FHCRC
23
import sys
24
import struct
25
import zlib
26
27
__all__ = ["GzipFile"]
28
29
30
class GzipFile(gzip.GzipFile):
31
    """Knit tuned version of GzipFile.
32
33
    This is based on the following lsprof stats:
34
    python 2.4 stock GzipFile write:
35
    58971      0   5644.3090   2721.4730   gzip:193(write)
36
    +58971     0   1159.5530   1159.5530   +<built-in method compress>
37
    +176913    0    987.0320    987.0320   +<len>
38
    +58971     0    423.1450    423.1450   +<zlib.crc32>
39
    +58971     0    353.1060    353.1060   +<method 'write' of 'cStringIO.
40
                                            StringO' objects>
41
    tuned GzipFile write:
42
    58971      0   4477.2590   2103.1120   bzrlib.knit:1250(write)
43
    +58971     0   1297.7620   1297.7620   +<built-in method compress>
44
    +58971     0    406.2160    406.2160   +<zlib.crc32>
45
    +58971     0    341.9020    341.9020   +<method 'write' of 'cStringIO.
46
                                            StringO' objects>
47
    +58971     0    328.2670    328.2670   +<len>
48
49
50
    Yes, its only 1.6 seconds, but they add up.
51
    """
52
53
    def _add_read_data(self, data):
54
        # 4169 calls in 183
55
        # temp var for len(data) and switch to +='s.
56
        # 4169 in 139
57
        len_data = len(data)
58
        self.crc = zlib.crc32(data, self.crc)
59
        self.extrabuf += data
60
        self.extrasize += len_data
61
        self.size += len_data
62
63
    def _read(self, size=1024):
64
        # various optimisations:
65
        # reduces lsprof count from 2500 to 
66
        # 8337 calls in 1272, 365 internal
67
        if self.fileobj is None:
68
            raise EOFError, "Reached EOF"
69
70
        if self._new_member:
71
            # If the _new_member flag is set, we have to
72
            # jump to the next member, if there is one.
73
            #
74
            # First, check if we're at the end of the file;
75
            # if so, it's time to stop; no more members to read.
76
            next_header_bytes = self.fileobj.read(10)
77
            if next_header_bytes == '':
78
                raise EOFError, "Reached EOF"
79
80
            self._init_read()
81
            self._read_gzip_header(next_header_bytes)
82
            self.decompress = zlib.decompressobj(-zlib.MAX_WBITS)
83
            self._new_member = False
84
85
        # Read a chunk of data from the file
86
        buf = self.fileobj.read(size)
87
88
        # If the EOF has been reached, flush the decompression object
89
        # and mark this object as finished.
90
91
        if buf == "":
92
            self._add_read_data(self.decompress.flush())
93
            assert len(self.decompress.unused_data) >= 8, "what does flush do?"
94
            self._read_eof()
95
            # tell the driving read() call we have stuffed all the data
96
            # in self.extrabuf
97
            raise EOFError, 'Reached EOF'
98
99
        self._add_read_data(self.decompress.decompress(buf))
100
101
        if self.decompress.unused_data != "":
102
            # Ending case: we've come to the end of a member in the file,
103
            # so seek back to the start of the data for the next member which
104
            # is the length of the decompress objects unused data - the first
105
            # 8 bytes for the end crc and size records.
106
            #
107
            # so seek back to the start of the unused data, finish up
108
            # this member, and read a new gzip header.
109
            # (The number of bytes to seek back is the length of the unused
110
            # data, minus 8 because those 8 bytes are part of this member.
111
            seek_length = len (self.decompress.unused_data) - 8
112
            if seek_length:
113
                assert seek_length > 0
114
                self.fileobj.seek(-seek_length, 1)
115
116
            # Check the CRC and file size, and set the flag so we read
117
            # a new member on the next call
118
            self._read_eof()
119
            self._new_member = True
120
121
    def _read_eof(self):
122
        """tuned to reduce function calls and eliminate file seeking:
123
        pass 1:
124
        reduces lsprof count from 800 to 288
125
        4168 in 296 
126
        avoid U32 call by using struct format L
127
        4168 in 200
128
        """
129
        # We've read to the end of the file, so we should have 8 bytes of 
130
        # unused data in the decompressor. If we dont, there is a corrupt file.
131
        # We use these 8 bytes to calculate the CRC and the recorded file size.
132
        # We then check the that the computed CRC and size of the
133
        # uncompressed data matches the stored values.  Note that the size
134
        # stored is the true file size mod 2**32.
135
        crc32, isize = struct.unpack("<LL", self.decompress.unused_data[0:8])
136
        # note that isize is unsigned - it can exceed 2GB
137
        if crc32 != U32(self.crc):
138
            raise IOError, "CRC check failed"
139
        elif isize != LOWU32(self.size):
140
            raise IOError, "Incorrect length of data produced"
141
142
    def _read_gzip_header(self, bytes=None):
143
        """Supply bytes if the minimum header size is already read.
144
        
145
        :param bytes: 10 bytes of header data.
146
        """
147
        """starting cost: 300 in 3998
148
        15998 reads from 3998 calls
149
        final cost 168
150
        """
151
        if bytes is None:
152
            bytes = self.fileobj.read(10)
153
        magic = bytes[0:2]
154
        if magic != '\037\213':
155
            raise IOError, 'Not a gzipped file'
156
        method = ord(bytes[2:3])
157
        if method != 8:
158
            raise IOError, 'Unknown compression method'
159
        flag = ord(bytes[3:4])
160
        # modtime = self.fileobj.read(4) (bytes [4:8])
161
        # extraflag = self.fileobj.read(1) (bytes[8:9])
162
        # os = self.fileobj.read(1) (bytes[9:10])
163
        # self.fileobj.read(6)
164
165
        if flag & FEXTRA:
166
            # Read & discard the extra field, if present
167
            xlen = ord(self.fileobj.read(1))
168
            xlen = xlen + 256*ord(self.fileobj.read(1))
169
            self.fileobj.read(xlen)
170
        if flag & FNAME:
171
            # Read and discard a null-terminated string containing the filename
172
            while True:
173
                s = self.fileobj.read(1)
174
                if not s or s=='\000':
175
                    break
176
        if flag & FCOMMENT:
177
            # Read and discard a null-terminated string containing a comment
178
            while True:
179
                s = self.fileobj.read(1)
180
                if not s or s=='\000':
181
                    break
182
        if flag & FHCRC:
183
            self.fileobj.read(2)     # Read & discard the 16-bit header CRC
184
185
    def readline(self, size=-1):
186
        """Tuned to remove buffer length calls in _unread and...
187
        
188
        also removes multiple len(c) calls, inlines _unread,
189
        total savings - lsprof 5800 to 5300
190
        phase 2:
191
        4168 calls in 2233
192
        8176 calls to read() in 1684
193
        changing the min chunk size to 200 halved all the cache misses
194
        leading to a drop to:
195
        4168 calls in 1977
196
        4168 call to read() in 1646
197
        - i.e. just reduced the function call overhead. May be worth 
198
          keeping.
199
        """
200
        if size < 0: size = sys.maxint
201
        bufs = []
202
        readsize = min(200, size)    # Read from the file in small chunks
203
        while True:
204
            if size == 0:
205
                return "".join(bufs) # Return resulting line
206
207
            # c is the chunk
208
            c = self.read(readsize)
209
            # number of bytes read
210
            len_c = len(c)
211
            i = c.find('\n')
212
            if size is not None:
213
                # We set i=size to break out of the loop under two
214
                # conditions: 1) there's no newline, and the chunk is
215
                # larger than size, or 2) there is a newline, but the
216
                # resulting line would be longer than 'size'.
217
                if i==-1 and len_c > size: i=size-1
218
                elif size <= i: i = size -1
219
220
            if i >= 0 or c == '':
221
                # if i>= 0 we have a newline or have triggered the above
222
                # if size is not None condition.
223
                # if c == '' its EOF.
224
                bufs.append(c[:i+1])    # Add portion of last chunk
225
                # -- inlined self._unread --
226
                ## self._unread(c[i+1:], len_c - i)   # Push back rest of chunk
227
                self.extrabuf = c[i+1:] + self.extrabuf
228
                self.extrasize = len_c - i + self.extrasize
229
                self.offset -= len_c - i
230
                # -- end inlined self._unread --
231
                return ''.join(bufs)    # Return resulting line
232
233
            # Append chunk to list, decrease 'size',
234
            bufs.append(c)
235
            size = size - len_c
236
            readsize = min(size, readsize * 2)
237
238
    def readlines(self, sizehint=0):
239
        # optimise to avoid all the buffer manipulation
240
        # lsprof changed from:
241
        # 4168 calls in 5472 with 32000 calls to readline()
242
        # to :
243
        # 4168 calls in 417.
244
        # Negative numbers result in reading all the lines
245
        if sizehint <= 0:
246
            sizehint = -1
247
        content = self.read(sizehint)
248
        return content.splitlines(True)
249
250
    def _unread(self, buf, len_buf=None):
251
        """tuned to remove unneeded len calls.
252
        
253
        because this is such an inner routine in readline, and readline is
254
        in many inner loops, this has been inlined into readline().
255
256
        The len_buf parameter combined with the reduction in len calls dropped
257
        the lsprof ms count for this routine on my test data from 800 to 200 - 
258
        a 75% saving.
259
        """
260
        if len_buf is None:
261
            len_buf = len(buf)
262
        self.extrabuf = buf + self.extrabuf
263
        self.extrasize = len_buf + self.extrasize
264
        self.offset -= len_buf
265
266
    def write(self, data):
267
        if self.mode != gzip.WRITE:
268
            import errno
269
            raise IOError(errno.EBADF, "write() on read-only GzipFile object")
270
271
        if self.fileobj is None:
272
            raise ValueError, "write() on closed GzipFile object"
273
        data_len = len(data)
274
        if data_len > 0:
275
            self.size = self.size + data_len
276
            self.crc = zlib.crc32(data, self.crc)
277
            self.fileobj.write( self.compress.compress(data) )
278
            self.offset += data_len
279
280
    def writelines(self, lines):
281
        # profiling indicated a significant overhead 
282
        # calling write for each line.
283
        # this batch call is a lot faster :).
284
        # (4 seconds to 1 seconds for the sample upgrades I was testing).
285
        self.write(''.join(lines))
286
287