← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/smart/protocol.py

  • Committer: John Arbash Meinel
  • Date: 2009-09-24 19:26:45 UTC
  • mto: (4634.52.3 2.0)
  • mto: This revision was merged to the branch mainline in revision 4716.
  • Revision ID: john@arbash-meinel.com-20090924192645-hyy1ycnnk6u3j5j6
Catch a corner case that we were missing.
The CHKInventory tests were passing, but failed for test_inv because
we were passing None to _getitems(). That only failed for InternalNodes,
but we were using a structure that didn't have internal nodes.
So now the test is parameterized on a small CHKInventory page size
to force those things out into the open.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/smart/protocol.py
1
 
# Copyright (C) 2006, 2007, 2008, 2009 Canonical Ltd
 
1
# Copyright (C) 2006, 2007 Canonical Ltd
2
2
#
3
3
# This program is free software; you can redistribute it and/or modify
4
4
# it under the terms of the GNU General Public License as published by
22
22
from cStringIO import StringIO
23
23
import struct
24
24
import sys
25
 
import thread
26
 
import threading
27
25
import time
28
26
 
29
27
import bzrlib
30
 
from bzrlib import (
31
 
    debug,
32
 
    errors,
33
 
    osutils,
34
 
    )
 
28
from bzrlib import debug
 
29
from bzrlib import errors
35
30
from bzrlib.smart import message, request
36
31
from bzrlib.trace import log_exception_quietly, mutter
37
32
from bzrlib.bencode import bdecode_as_tuple, bencode
119
114
class SmartServerRequestProtocolOne(SmartProtocolBase):
120
115
    """Server-side encoding and decoding logic for smart version 1."""
121
116
 
122
 
    def __init__(self, backing_transport, write_func, root_client_path='/',
123
 
            jail_root=None):
 
117
    def __init__(self, backing_transport, write_func, root_client_path='/'):
124
118
        self._backing_transport = backing_transport
125
119
        self._root_client_path = root_client_path
126
 
        self._jail_root = jail_root
127
120
        self.unused_data = ''
128
121
        self._finished = False
129
122
        self.in_buffer = ''
151
144
                req_args = _decode_tuple(first_line)
152
145
                self.request = request.SmartServerRequestHandler(
153
146
                    self._backing_transport, commands=request.request_handlers,
154
 
                    root_client_path=self._root_client_path,
155
 
                    jail_root=self._jail_root)
156
 
                self.request.args_received(req_args)
 
147
                    root_client_path=self._root_client_path)
 
148
                self.request.dispatch_command(req_args[0], req_args[1:])
157
149
                if self.request.finished_reading:
158
150
                    # trivial request
159
151
                    self.unused_data = self.in_buffer
620
612
            mutter('hpss call:   %s', repr(args)[1:-1])
621
613
            if getattr(self._request._medium, 'base', None) is not None:
622
614
                mutter('             (to %s)', self._request._medium.base)
623
 
            self._request_start_time = osutils.timer_func()
 
615
            self._request_start_time = time.time()
624
616
        self._write_args(args)
625
617
        self._request.finished_writing()
626
618
        self._last_verb = args[0]
635
627
            if getattr(self._request._medium, '_path', None) is not None:
636
628
                mutter('                  (to %s)', self._request._medium._path)
637
629
            mutter('              %d bytes', len(body))
638
 
            self._request_start_time = osutils.timer_func()
 
630
            self._request_start_time = time.time()
639
631
            if 'hpssdetail' in debug.debug_flags:
640
632
                mutter('hpss body content: %s', body)
641
633
        self._write_args(args)
654
646
            mutter('hpss call w/readv: %s', repr(args)[1:-1])
655
647
            if getattr(self._request._medium, '_path', None) is not None:
656
648
                mutter('                  (to %s)', self._request._medium._path)
657
 
            self._request_start_time = osutils.timer_func()
 
649
            self._request_start_time = time.time()
658
650
        self._write_args(args)
659
651
        readv_bytes = self._serialise_offsets(body)
660
652
        bytes = self._encode_bulk_data(readv_bytes)
686
678
        if 'hpss' in debug.debug_flags:
687
679
            if self._request_start_time is not None:
688
680
                mutter('   result:   %6.3fs  %s',
689
 
                       osutils.timer_func() - self._request_start_time,
 
681
                       time.time() - self._request_start_time,
690
682
                       repr(result)[1:-1])
691
683
                self._request_start_time = None
692
684
            else:
866
858
 
867
859
 
868
860
def build_server_protocol_three(backing_transport, write_func,
869
 
                                root_client_path, jail_root=None):
 
861
                                root_client_path):
870
862
    request_handler = request.SmartServerRequestHandler(
871
863
        backing_transport, commands=request.request_handlers,
872
 
        root_client_path=root_client_path, jail_root=jail_root)
 
864
        root_client_path=root_client_path)
873
865
    responder = ProtocolThreeResponder(write_func)
874
866
    message_handler = message.ConventionalRequestHandler(request_handler, responder)
875
867
    return ProtocolThreeDecoder(message_handler)
1067
1059
class _ProtocolThreeEncoder(object):
1068
1060
 
1069
1061
    response_marker = request_marker = MESSAGE_VERSION_THREE
1070
 
    BUFFER_SIZE = 1024*1024 # 1 MiB buffer before flushing
1071
1062
 
1072
1063
    def __init__(self, write_func):
1073
1064
        self._buf = []
1074
 
        self._buf_len = 0
1075
1065
        self._real_write_func = write_func
1076
1066
 
1077
1067
    def _write_func(self, bytes):
1078
 
        # TODO: It is probably more appropriate to use sum(map(len, _buf))
1079
 
        #       for total number of bytes to write, rather than buffer based on
1080
 
        #       the number of write() calls
1081
 
        # TODO: Another possibility would be to turn this into an async model.
1082
 
        #       Where we let another thread know that we have some bytes if
1083
 
        #       they want it, but we don't actually block for it
1084
 
        #       Note that osutils.send_all always sends 64kB chunks anyway, so
1085
 
        #       we might just push out smaller bits at a time?
1086
1068
        self._buf.append(bytes)
1087
 
        self._buf_len += len(bytes)
1088
 
        if self._buf_len > self.BUFFER_SIZE:
 
1069
        if len(self._buf) > 100:
1089
1070
            self.flush()
1090
1071
 
1091
1072
    def flush(self):
1092
1073
        if self._buf:
1093
1074
            self._real_write_func(''.join(self._buf))
1094
1075
            del self._buf[:]
1095
 
            self._buf_len = 0
1096
1076
 
1097
1077
    def _serialise_offsets(self, offsets):
1098
1078
        """Serialise a readv offset list."""
1147
1127
        _ProtocolThreeEncoder.__init__(self, write_func)
1148
1128
        self.response_sent = False
1149
1129
        self._headers = {'Software version': bzrlib.__version__}
1150
 
        if 'hpss' in debug.debug_flags:
1151
 
            self._thread_id = thread.get_ident()
1152
 
            self._response_start_time = None
1153
 
 
1154
 
    def _trace(self, action, message, extra_bytes=None, include_time=False):
1155
 
        if self._response_start_time is None:
1156
 
            self._response_start_time = osutils.timer_func()
1157
 
        if include_time:
1158
 
            t = '%5.3fs ' % (time.clock() - self._response_start_time)
1159
 
        else:
1160
 
            t = ''
1161
 
        if extra_bytes is None:
1162
 
            extra = ''
1163
 
        else:
1164
 
            extra = ' ' + repr(extra_bytes[:40])
1165
 
            if len(extra) > 33:
1166
 
                extra = extra[:29] + extra[-1] + '...'
1167
 
        mutter('%12s: [%s] %s%s%s'
1168
 
               % (action, self._thread_id, t, message, extra))
1169
1130
 
1170
1131
    def send_error(self, exception):
1171
1132
        if self.response_sent:
1177
1138
                ('UnknownMethod', exception.verb))
1178
1139
            self.send_response(failure)
1179
1140
            return
1180
 
        if 'hpss' in debug.debug_flags:
1181
 
            self._trace('error', str(exception))
1182
1141
        self.response_sent = True
1183
1142
        self._write_protocol_version()
1184
1143
        self._write_headers(self._headers)
1198
1157
            self._write_success_status()
1199
1158
        else:
1200
1159
            self._write_error_status()
1201
 
        if 'hpss' in debug.debug_flags:
1202
 
            self._trace('response', repr(response.args))
1203
1160
        self._write_structure(response.args)
1204
1161
        if response.body is not None:
1205
1162
            self._write_prefixed_body(response.body)
1206
 
            if 'hpss' in debug.debug_flags:
1207
 
                self._trace('body', '%d bytes' % (len(response.body),),
1208
 
                            response.body, include_time=True)
1209
1163
        elif response.body_stream is not None:
1210
 
            count = num_bytes = 0
1211
 
            first_chunk = None
1212
1164
            for exc_info, chunk in _iter_with_errors(response.body_stream):
1213
 
                count += 1
1214
1165
                if exc_info is not None:
1215
1166
                    self._write_error_status()
1216
1167
                    error_struct = request._translate_error(exc_info[1])
1221
1172
                        self._write_error_status()
1222
1173
                        self._write_structure(chunk.args)
1223
1174
                        break
1224
 
                    num_bytes += len(chunk)
1225
 
                    if first_chunk is None:
1226
 
                        first_chunk = chunk
1227
1175
                    self._write_prefixed_body(chunk)
1228
 
                    if 'hpssdetail' in debug.debug_flags:
1229
 
                        # Not worth timing separately, as _write_func is
1230
 
                        # actually buffered
1231
 
                        self._trace('body chunk',
1232
 
                                    '%d bytes' % (len(chunk),),
1233
 
                                    chunk, suppress_time=True)
1234
 
            if 'hpss' in debug.debug_flags:
1235
 
                self._trace('body stream',
1236
 
                            '%d bytes %d chunks' % (num_bytes, count),
1237
 
                            first_chunk)
1238
1176
        self._write_end()
1239
 
        if 'hpss' in debug.debug_flags:
1240
 
            self._trace('response end', '', include_time=True)
1241
1177
 
1242
1178
 
1243
1179
def _iter_with_errors(iterable):
1295
1231
            base = getattr(self._medium_request._medium, 'base', None)
1296
1232
            if base is not None:
1297
1233
                mutter('             (to %s)', base)
1298
 
            self._request_start_time = osutils.timer_func()
 
1234
            self._request_start_time = time.time()
1299
1235
        self._write_protocol_version()
1300
1236
        self._write_headers(self._headers)
1301
1237
        self._write_structure(args)
1313
1249
            if path is not None:
1314
1250
                mutter('                  (to %s)', path)
1315
1251
            mutter('              %d bytes', len(body))
1316
 
            self._request_start_time = osutils.timer_func()
 
1252
            self._request_start_time = time.time()
1317
1253
        self._write_protocol_version()
1318
1254
        self._write_headers(self._headers)
1319
1255
        self._write_structure(args)
1332
1268
            path = getattr(self._medium_request._medium, '_path', None)
1333
1269
            if path is not None:
1334
1270
                mutter('                  (to %s)', path)
1335
 
            self._request_start_time = osutils.timer_func()
 
1271
            self._request_start_time = time.time()
1336
1272
        self._write_protocol_version()
1337
1273
        self._write_headers(self._headers)
1338
1274
        self._write_structure(args)
1349
1285
            path = getattr(self._medium_request._medium, '_path', None)
1350
1286
            if path is not None:
1351
1287
                mutter('                  (to %s)', path)
1352
 
            self._request_start_time = osutils.timer_func()
 
1288
            self._request_start_time = time.time()
1353
1289
        self._write_protocol_version()
1354
1290
        self._write_headers(self._headers)
1355
1291
        self._write_structure(args)