From: "Daniel P. Berrangé" <berrange@redhat.com>
To: qemu-devel@nongnu.org
Cc: "Gerd Hoffmann" <kraxel@redhat.com>,
"Laszlo Ersek" <lersek@redhat.com>,
"Daniel P. Berrangé" <berrange@redhat.com>
Subject: [Qemu-devel] [PATCH 4/4] ui: extend VNC trottling tracing to SASL codepaths
Date: Mon, 5 Feb 2018 11:49:38 +0000 [thread overview]
Message-ID: <20180205114938.15784-5-berrange@redhat.com> (raw)
In-Reply-To: <20180205114938.15784-1-berrange@redhat.com>
In previous commit:
commit 6aa22a29187e1908f5db738d27c64a9efc8d0bfa
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: Laszlo Ersek <lersek@redhat.com>
Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
---
ui/vnc-auth-sasl.c | 11 +++++++++++
1 file changed, 11 insertions(+)
diff --git a/ui/vnc-auth-sasl.c b/ui/vnc-auth-sasl.c
index 8ebd0d3d00..3751a777a4 100644
--- a/ui/vnc-auth-sasl.c
+++ b/ui/vnc-auth-sasl.c
@@ -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;
}
--
2.14.3
next prev parent reply other threads:[~2018-02-05 11:49 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-02-05 11:49 [Qemu-devel] [PATCH 0/4] Misc VNC fixes / sanity checks Daniel P. Berrangé
2018-02-05 11:49 ` [Qemu-devel] [PATCH 1/4] ui: avoid risk of 32-bit int overflow in VNC buffer check Daniel P. Berrangé
2018-02-05 12:58 ` Laszlo Ersek
2018-02-05 19:32 ` Philippe Mathieu-Daudé
2018-02-05 11:49 ` [Qemu-devel] [PATCH 2/4] ui: avoid 'local_err' variable shadowing in VNC SASL auth Daniel P. Berrangé
2018-02-05 12:58 ` Laszlo Ersek
2018-02-05 19:32 ` Philippe Mathieu-Daudé
2018-02-05 11:49 ` [Qemu-devel] [PATCH 3/4] ui: check VNC audio frequency limit at time of reading from client Daniel P. Berrangé
2018-02-05 13:03 ` Laszlo Ersek
2018-02-05 19:32 ` Philippe Mathieu-Daudé
2018-02-05 11:49 ` Daniel P. Berrangé [this message]
2018-02-05 13:08 ` [Qemu-devel] [PATCH 4/4] ui: extend VNC trottling tracing to SASL codepaths Laszlo Ersek
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20180205114938.15784-5-berrange@redhat.com \
--to=berrange@redhat.com \
--cc=kraxel@redhat.com \
--cc=lersek@redhat.com \
--cc=qemu-devel@nongnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).