From nobody Tue Oct 28 20:59:21 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1513625411656772.6024738657306; Mon, 18 Dec 2017 11:30:11 -0800 (PST) Received: from localhost ([::1]:33337 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eR16z-0004ZB-FM for importer@patchew.org; Mon, 18 Dec 2017 14:30:05 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:50615) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eR0qd-0006ZT-EG for qemu-devel@nongnu.org; Mon, 18 Dec 2017 14:13:13 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1eR0qa-0005VR-Co for qemu-devel@nongnu.org; Mon, 18 Dec 2017 14:13:11 -0500 Received: from mx1.redhat.com ([209.132.183.28]:50688) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1eR0qa-0005UN-1Y for qemu-devel@nongnu.org; Mon, 18 Dec 2017 14:13:08 -0500 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 30A7734CD for ; Mon, 18 Dec 2017 19:13:07 +0000 (UTC) Received: from t460.redhat.com (unknown [10.33.36.45]) by smtp.corp.redhat.com (Postfix) with ESMTP id 263C078401; Mon, 18 Dec 2017 19:13:06 +0000 (UTC) From: "Daniel P. Berrange" To: qemu-devel@nongnu.org Date: Mon, 18 Dec 2017 19:12:27 +0000 Message-Id: <20171218191228.31018-13-berrange@redhat.com> In-Reply-To: <20171218191228.31018-1-berrange@redhat.com> References: <20171218191228.31018-1-berrange@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.29]); Mon, 18 Dec 2017 19:13:07 +0000 (UTC) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PATCH v1 12/13] ui: add trace events related to VNC client throttling X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , Gerd Hoffmann , P J P Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" The VNC client throttling is quite subtle so will benefit from having trace points available for live debugging. Signed-off-by: Daniel P. Berrange --- ui/trace-events | 7 +++++++ ui/vnc.c | 23 +++++++++++++++++++++++ 2 files changed, 30 insertions(+) diff --git a/ui/trace-events b/ui/trace-events index 1a9f126330..85f74f948b 100644 --- a/ui/trace-events +++ b/ui/trace-events @@ -35,6 +35,13 @@ vnc_client_connect(void *state, void *ioc) "VNC client c= onnect state=3D%p ioc=3D%p" vnc_client_disconnect_start(void *state, void *ioc) "VNC client disconnect= start state=3D%p ioc=3D%p" vnc_client_disconnect_finish(void *state, void *ioc) "VNC client disconnec= t finish state=3D%p ioc=3D%p" vnc_client_io_wrap(void *state, void *ioc, const char *type) "VNC client I= /O wrap state=3D%p ioc=3D%p type=3D%s" +vnc_client_throttle_threshold(void *state, void *ioc, size_t oldoffset, si= ze_t offset, int client_width, int client_height, int bytes_per_pixel, void= *audio_cap) "VNC client throttle threshold state=3D%p ioc=3D%p oldoffset= =3D%zu newoffset=3D%zu width=3D%d height=3D%d bpp=3D%d audio=3D%p" +vnc_client_throttle_incremental(void *state, void *ioc, int job_update, si= ze_t offset) "VNC client throttle incremental state=3D%p ioc=3D%p job-updat= e=3D%d offset=3D%zu" +vnc_client_throttle_forced(void *state, void *ioc, int job_update, size_t = offset) "VNC client throttle forced state=3D%p ioc=3D%p job-update=3D%d off= set=3D%zu" +vnc_client_throttle_audio(void *state, void *ioc, size_t offset) "VNC clie= nt throttle audio state=3D%p ioc=3D%p offset=3D%zu" +vnc_client_unthrottle_forced(void *state, void *ioc) "VNC client unthrottl= e forced offset state=3D%p ioc=3D%p" +vnc_client_unthrottle_incremental(void *state, void *ioc, size_t offset) "= VNC client unthrottle incremental state=3D%p ioc=3D%p offset=3D%zu" +vnc_client_output_limit(void *state, void *ioc, size_t offset, size_t thre= shold) "VNC client output limit state=3D%p ioc=3D%p offset=3D%zu threshold= =3D%zu" vnc_auth_init(void *display, int websock, int auth, int subauth) "VNC auth= init state=3D%p websock=3D%d auth=3D%d subauth=3D%d" vnc_auth_start(void *state, int method) "VNC client auth start state=3D%p = method=3D%d" vnc_auth_pass(void *state, int method) "VNC client auth passed state=3D%p = method=3D%d" diff --git a/ui/vnc.c b/ui/vnc.c index a4f0279cdc..1b5a399dc0 100644 --- a/ui/vnc.c +++ b/ui/vnc.c @@ -1011,6 +1011,12 @@ static void vnc_update_throttle_offset(VncState *vs) */ offset =3D MAX(offset, 1024 * 1024); =20 + if (vs->throttle_output_offset !=3D offset) { + trace_vnc_client_throttle_threshold( + vs, vs->ioc, vs->throttle_output_offset, offset, vs->client_wi= dth, + vs->client_height, vs->client_pf.bytes_per_pixel, vs->audio_ca= p); + } + vs->throttle_output_offset =3D offset; } =20 @@ -1028,6 +1034,8 @@ static bool vnc_should_update(VncState *vs) vs->job_update =3D=3D VNC_STATE_UPDATE_NONE) { return true; } + trace_vnc_client_throttle_incremental( + vs, vs->ioc, vs->job_update, vs->output.offset); break; case VNC_STATE_UPDATE_FORCE: /* Only allow forced updates if the pending send queue @@ -1042,6 +1050,8 @@ static bool vnc_should_update(VncState *vs) vs->job_update =3D=3D VNC_STATE_UPDATE_NONE) { return true; } + trace_vnc_client_throttle_forced( + vs, vs->ioc, vs->job_update, vs->force_update_offset); break; } return false; @@ -1158,6 +1168,8 @@ static void audio_capture(void *opaque, void *buf, in= t size) vnc_write_u16(vs, VNC_MSG_SERVER_QEMU_AUDIO_DATA); vnc_write_u32(vs, size); vnc_write(vs, buf, size); + } else { + trace_vnc_client_throttle_audio(vs, vs->ioc, vs->output.offset); } vnc_unlock_output(vs); vnc_flush(vs); @@ -1328,6 +1340,7 @@ ssize_t vnc_client_write_buf(VncState *vs, const uint= 8_t *data, size_t datalen) */ static ssize_t vnc_client_write_plain(VncState *vs) { + size_t offset; ssize_t ret; =20 #ifdef CONFIG_VNC_SASL @@ -1348,11 +1361,19 @@ static ssize_t vnc_client_write_plain(VncState *vs) return 0; =20 if (ret >=3D vs->force_update_offset) { + if (vs->force_update_offset !=3D 0) { + trace_vnc_client_unthrottle_forced(vs, vs->ioc); + } vs->force_update_offset =3D 0; } else { vs->force_update_offset -=3D ret; } + offset =3D vs->output.offset; buffer_advance(&vs->output, ret); + if (offset >=3D vs->throttle_output_offset && + vs->output.offset < vs->throttle_output_offset) { + trace_vnc_client_unthrottle_incremental(vs, vs->ioc, vs->output.of= fset); + } =20 if (vs->output.offset =3D=3D 0) { if (vs->ioc_tag) { @@ -1549,6 +1570,8 @@ void vnc_write(VncState *vs, const void *data, size_t= len) if (vs->throttle_output_offset !=3D 0 && vs->output.offset > (vs->throttle_output_offset * VNC_THROTTLE_OUTPUT_LIMIT_SCALE)) { + trace_vnc_client_output_limit(vs, vs->ioc, vs->output.offset, + vs->throttle_output_offset); vnc_disconnect_start(vs); return; } --=20 2.14.3