[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 9/9] ui: extend VNC trottling tracing to SASL codepat
From: |
Gerd Hoffmann |
Subject: |
[Qemu-devel] [PULL 9/9] ui: extend VNC trottling tracing to SASL codepaths |
Date: |
Fri, 16 Feb 2018 12:54:10 +0100 |
From: Daniel P. Berrangé <address@hidden>
In previous commit:
commit 6aa22a29187e1908f5db738d27c64a9efc8d0bfa
Author: Daniel P. Berrange <address@hidden>
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 <address@hidden>
Signed-off-by: Daniel P. Berrangé <address@hidden>
Reviewed-by: Laszlo Ersek <address@hidden>
Message-id: address@hidden
Signed-off-by: Gerd Hoffmann <address@hidden>
---
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.9.3
- [Qemu-devel] [PULL 0/9] Ui 20180216 patches, Gerd Hoffmann, 2018/02/16
- [Qemu-devel] [PULL 6/9] ui: avoid risk of 32-bit int overflow in VNC buffer check, Gerd Hoffmann, 2018/02/16
- [Qemu-devel] [PULL 4/9] sdl: restore optimized redraw, Gerd Hoffmann, 2018/02/16
- [Qemu-devel] [PULL 7/9] ui: avoid 'local_err' variable shadowing in VNC SASL auth, Gerd Hoffmann, 2018/02/16
- [Qemu-devel] [PULL 1/9] vnc: remove bogus object_unref on client socket, Gerd Hoffmann, 2018/02/16
- [Qemu-devel] [PULL 5/9] sdl2: fix mouse grab, Gerd Hoffmann, 2018/02/16
- [Qemu-devel] [PULL 3/9] vnc: fix segfault in closed connection handling, Gerd Hoffmann, 2018/02/16
- [Qemu-devel] [PULL 9/9] ui: extend VNC trottling tracing to SASL codepaths,
Gerd Hoffmann <=
- [Qemu-devel] [PULL 8/9] ui: check VNC audio frequency limit at time of reading from client, Gerd Hoffmann, 2018/02/16
- [Qemu-devel] [PULL 2/9] vnc: add qapi/error.h include to stubs, Gerd Hoffmann, 2018/02/16
- Re: [Qemu-devel] [PULL 0/9] Ui 20180216 patches, Peter Maydell, 2018/02/16