/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 bzrlib/smart/medium.py

  • Committer: Martin Pool
  • Date: 2009-03-12 02:43:02 UTC
  • mfrom: (4121 +trunk)
  • mto: This revision was merged to the branch mainline in revision 4140.
  • Revision ID: mbp@sourcefrog.net-20090312024302-aynicfx1ywm0k9dl
merge trunk

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/smart/medium.py
40
40
    osutils,
41
41
    symbol_versioning,
42
42
    trace,
 
43
    ui,
43
44
    urlutils,
44
45
    )
45
46
from bzrlib.smart import client, protocol
162
163
        self._push_back(excess)
163
164
        return line
164
165
 
 
166
    def _report_activity(self, bytes, direction):
 
167
        """Notify that this medium has activity.
 
168
 
 
169
        Implementations should call this from all methods that actually do IO.
 
170
        Be careful that it's not called twice, if one method is implemented on
 
171
        top of another.
 
172
 
 
173
        :param bytes: Number of bytes read or written.
 
174
        :param direction: 'read' or 'write' or None.
 
175
        """
 
176
        ui.ui_factory.report_transport_activity(self, bytes, direction)
 
177
 
165
178
 
166
179
class SmartServerStreamMedium(SmartMedium):
167
180
    """Handles smart commands coming over a stream.
274
287
    def _read_bytes(self, desired_count):
275
288
        # We ignore the desired_count because on sockets it's more efficient to
276
289
        # read large chunks (of _MAX_READ_SIZE bytes) at a time.
277
 
        return osutils.until_no_eintr(self.socket.recv, _MAX_READ_SIZE)
 
290
        bytes = osutils.until_no_eintr(self.socket.recv, _MAX_READ_SIZE)
 
291
        self._report_activity(len(bytes), 'read')
 
292
        return bytes
278
293
 
279
294
    def terminate_due_to_error(self):
280
295
        # TODO: This should log to a server log file, but no such thing
283
298
        self.finished = True
284
299
 
285
300
    def _write_out(self, bytes):
286
 
        osutils.send_all(self.socket, bytes)
 
301
        osutils.send_all(self.socket, bytes, self._report_activity)
287
302
 
288
303
 
289
304
class SmartServerPipeStreamMedium(SmartServerStreamMedium):
689
704
    def _accept_bytes(self, bytes):
690
705
        """See SmartClientStreamMedium.accept_bytes."""
691
706
        self._writeable_pipe.write(bytes)
 
707
        self._report_activity(len(bytes), 'write')
692
708
 
693
709
    def _flush(self):
694
710
        """See SmartClientStreamMedium._flush()."""
696
712
 
697
713
    def _read_bytes(self, count):
698
714
        """See SmartClientStreamMedium._read_bytes."""
699
 
        return self._readable_pipe.read(count)
 
715
        bytes = self._readable_pipe.read(count)
 
716
        self._report_activity(len(bytes), 'read')
 
717
        return bytes
700
718
 
701
719
 
702
720
class SmartSSHClientMedium(SmartClientStreamMedium):
709
727
        :param vendor: An optional override for the ssh vendor to use. See
710
728
            bzrlib.transport.ssh for details on ssh vendors.
711
729
        """
712
 
        SmartClientStreamMedium.__init__(self, base)
713
730
        self._connected = False
714
731
        self._host = host
715
732
        self._password = password
716
733
        self._port = port
717
734
        self._username = username
 
735
        # SmartClientStreamMedium stores the repr of this object in its
 
736
        # _DebugCounter so we have to store all the values used in our repr
 
737
        # method before calling the super init.
 
738
        SmartClientStreamMedium.__init__(self, base)
718
739
        self._read_from = None
719
740
        self._ssh_connection = None
720
741
        self._vendor = vendor
721
742
        self._write_to = None
722
743
        self._bzr_remote_path = bzr_remote_path
723
 
        if self._bzr_remote_path is None:
724
 
            symbol_versioning.warn(
725
 
                'bzr_remote_path is required as of bzr 0.92',
726
 
                DeprecationWarning, stacklevel=2)
727
 
            self._bzr_remote_path = os.environ.get('BZR_REMOTE_PATH', 'bzr')
 
744
 
 
745
    def __repr__(self):
 
746
        return "%s(connected=%r, username=%r, host=%r, port=%r)" % (
 
747
            self.__class__.__name__,
 
748
            self._connected,
 
749
            self._username,
 
750
            self._host,
 
751
            self._port)
728
752
 
729
753
    def _accept_bytes(self, bytes):
730
754
        """See SmartClientStreamMedium.accept_bytes."""
731
755
        self._ensure_connection()
732
756
        self._write_to.write(bytes)
 
757
        self._report_activity(len(bytes), 'write')
733
758
 
734
759
    def disconnect(self):
735
760
        """See SmartClientMedium.disconnect()."""
765
790
        if not self._connected:
766
791
            raise errors.MediumNotConnected(self)
767
792
        bytes_to_read = min(count, _MAX_READ_SIZE)
768
 
        return self._read_from.read(bytes_to_read)
 
793
        bytes = self._read_from.read(bytes_to_read)
 
794
        self._report_activity(len(bytes), 'read')
 
795
        return bytes
769
796
 
770
797
 
771
798
# Port 4155 is the default port for bzr://, registered with IANA.
787
814
    def _accept_bytes(self, bytes):
788
815
        """See SmartClientMedium.accept_bytes."""
789
816
        self._ensure_connection()
790
 
        osutils.send_all(self._socket, bytes)
 
817
        osutils.send_all(self._socket, bytes, self._report_activity)
791
818
 
792
819
    def disconnect(self):
793
820
        """See SmartClientMedium.disconnect()."""
850
877
        # We ignore the desired_count because on sockets it's more efficient to
851
878
        # read large chunks (of _MAX_READ_SIZE bytes) at a time.
852
879
        try:
853
 
            return self._socket.recv(_MAX_READ_SIZE)
 
880
            bytes = osutils.until_no_eintr(self._socket.recv, _MAX_READ_SIZE)
854
881
        except socket.error, e:
855
882
            if len(e.args) and e.args[0] == errno.ECONNRESET:
856
883
                # Callers expect an empty string in that case
857
884
                return ''
858
885
            else:
859
886
                raise
 
887
        else:
 
888
            self._report_activity(len(bytes), 'read')
 
889
            return bytes
860
890
 
861
891
 
862
892
class SmartClientStreamMediumRequest(SmartClientMediumRequest):