Commit d50f09ff authored by Daniel P. Berrangé's avatar Daniel P. Berrangé Committed by Gerd Hoffmann
Browse files

ui: extend VNC trottling tracing to SASL codepaths 



In previous commit:

  commit 6aa22a29
  Author: Daniel P. Berrange <berrange@redhat.com>
  Date:   Mon Dec 18 19:12:27 2017 +0000

    ui: add trace events related to VNC client throttling

trace points related to unthrottling client I/O were missed from the
SASL codepaths.

Reported-by: default avatarLaszlo Ersek <lersek@redhat.com>
Signed-off-by: default avatarDaniel P. Berrangé <berrange@redhat.com>
Reviewed-by: default avatarLaszlo Ersek <lersek@redhat.com>
Message-id: 20180205114938.15784-5-berrange@redhat.com
Signed-off-by: default avatarGerd Hoffmann <kraxel@redhat.com>
parent cf070658

ui/vnc-auth-sasl.c

+11 −0
Original line number Diff line number Diff line
@@ -79,12 +79,23 @@ size_t vnc_client_write_sasl(VncState *vs) 


    vs->sasl.encodedOffset += ret;

    if (vs->sasl.encodedOffset == vs->sasl.encodedLength) {

        bool throttled = vs->force_update_offset != 0;

        size_t offset;

        if (vs->sasl.encodedRawLength >= vs->force_update_offset) {

            vs->force_update_offset = 0;

        } else {

            vs->force_update_offset -= vs->sasl.encodedRawLength;

        }

        if (throttled && vs->force_update_offset == 0) {

            trace_vnc_client_unthrottle_forced(vs, vs->ioc);

        }

        offset = vs->output.offset;

        buffer_advance(&vs->output, vs->sasl.encodedRawLength);

        if (offset >= vs->throttle_output_offset &&

            vs->output.offset < vs->throttle_output_offset) {

            trace_vnc_client_unthrottle_incremental(vs, vs->ioc,

                                                    vs->output.offset);

        }

        vs->sasl.encoded = NULL;

        vs->sasl.encodedOffset = vs->sasl.encodedLength = 0;

    }