From nobody Mon Feb 9 09:16:44 2026 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@gnu.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@gnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1506680631354849.4802438859566; Fri, 29 Sep 2017 03:23:51 -0700 (PDT) Received: from localhost ([::1]:34520 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dxsSP-0007vZ-HT for importer@patchew.org; Fri, 29 Sep 2017 06:23:45 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:41417) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dxsQr-00073L-Qf for qemu-devel@nongnu.org; Fri, 29 Sep 2017 06:22:12 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dxsQo-0005gF-8l for qemu-devel@nongnu.org; Fri, 29 Sep 2017 06:22:09 -0400 Received: from mx1.redhat.com ([209.132.183.28]:39706) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1dxsQn-0005fb-Vs for qemu-devel@nongnu.org; Fri, 29 Sep 2017 06:22:06 -0400 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 178343680B for ; Fri, 29 Sep 2017 10:22:05 +0000 (UTC) Received: from sirius.home.kraxel.org (ovpn-116-102.ams2.redhat.com [10.36.116.102]) by smtp.corp.redhat.com (Postfix) with ESMTP id 6D7E217C41; Fri, 29 Sep 2017 10:22:02 +0000 (UTC) Received: by sirius.home.kraxel.org (Postfix, from userid 1000) id 9F44D3F137; Fri, 29 Sep 2017 12:22:01 +0200 (CEST) DMARC-Filter: OpenDMARC Filter v1.3.2 mx1.redhat.com 178343680B Authentication-Results: ext-mx06.extmail.prod.ext.phx2.redhat.com; dmarc=none (p=none dis=none) header.from=redhat.com Authentication-Results: ext-mx06.extmail.prod.ext.phx2.redhat.com; spf=fail smtp.mailfrom=kraxel@redhat.com From: Gerd Hoffmann To: qemu-devel@nongnu.org Date: Fri, 29 Sep 2017 12:22:00 +0200 Message-Id: <20170929102201.15408-5-kraxel@redhat.com> In-Reply-To: <20170929102201.15408-1-kraxel@redhat.com> References: <20170929102201.15408-1-kraxel@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.30]); Fri, 29 Sep 2017 10:22:05 +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] [PULL 4/5] ui: add tracing of VNC operations related to QIOChannel X-BeenThere: qemu-devel@gnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Gerd Hoffmann Errors-To: qemu-devel-bounces+importer=patchew.org@gnu.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" From: "Daniel P. Berrange" Trace anything which opens/closes/wraps a QIOChannel in the VNC server. Signed-off-by: Daniel P. Berrange Message-id: 20170921121528.23935-2-berrange@redhat.com Signed-off-by: Gerd Hoffmann --- ui/vnc-auth-vencrypt.c | 2 ++ ui/vnc-ws.c | 6 +++--- ui/vnc.c | 11 ++++++++--- ui/trace-events | 6 ++++++ 4 files changed, 19 insertions(+), 6 deletions(-) diff --git a/ui/vnc-auth-vencrypt.c b/ui/vnc-auth-vencrypt.c index ffaab57550..8ab00ef784 100644 --- a/ui/vnc-auth-vencrypt.c +++ b/ui/vnc-auth-vencrypt.c @@ -28,6 +28,7 @@ #include "vnc.h" #include "qapi/error.h" #include "qemu/main-loop.h" +#include "trace.h" =20 static void start_auth_vencrypt_subauth(VncState *vs) { @@ -121,6 +122,7 @@ static int protocol_client_vencrypt_auth(VncState *vs, = uint8_t *data, size_t len VNC_DEBUG("Start TLS VeNCrypt handshake process\n"); object_unref(OBJECT(vs->ioc)); vs->ioc =3D QIO_CHANNEL(tls); + trace_vnc_client_io_wrap(vs, vs->ioc, "tls"); vs->tls =3D qio_channel_tls_get_session(tls); =20 qio_channel_tls_handshake(tls, diff --git a/ui/vnc-ws.c b/ui/vnc-ws.c index f530cd5474..aeaafe2c21 100644 --- a/ui/vnc-ws.c +++ b/ui/vnc-ws.c @@ -23,6 +23,7 @@ #include "vnc.h" #include "io/channel-websock.h" #include "qemu/bswap.h" +#include "trace.h" =20 static void vncws_tls_handshake_done(QIOTask *task, gpointer user_data) @@ -50,7 +51,6 @@ gboolean vncws_tls_handshake_io(QIOChannel *ioc G_GNUC_UN= USED, QIOChannelTLS *tls; Error *err =3D NULL; =20 - VNC_DEBUG("TLS Websocket connection required\n"); if (vs->ioc_tag) { g_source_remove(vs->ioc_tag); vs->ioc_tag =3D 0; @@ -70,9 +70,9 @@ gboolean vncws_tls_handshake_io(QIOChannel *ioc G_GNUC_UN= USED, =20 qio_channel_set_name(QIO_CHANNEL(tls), "vnc-ws-server-tls"); =20 - VNC_DEBUG("Start TLS WS handshake process\n"); object_unref(OBJECT(vs->ioc)); vs->ioc =3D QIO_CHANNEL(tls); + trace_vnc_client_io_wrap(vs, vs->ioc, "tls"); vs->tls =3D qio_channel_tls_get_session(tls); =20 qio_channel_tls_handshake(tls, @@ -110,7 +110,6 @@ gboolean vncws_handshake_io(QIOChannel *ioc G_GNUC_UNUS= ED, VncState *vs =3D opaque; QIOChannelWebsock *wioc; =20 - VNC_DEBUG("Websocket negotiate starting\n"); if (vs->ioc_tag) { g_source_remove(vs->ioc_tag); vs->ioc_tag =3D 0; @@ -121,6 +120,7 @@ gboolean vncws_handshake_io(QIOChannel *ioc G_GNUC_UNUS= ED, =20 object_unref(OBJECT(vs->ioc)); vs->ioc =3D QIO_CHANNEL(wioc); + trace_vnc_client_io_wrap(vs, vs->ioc, "websock"); =20 qio_channel_websock_handshake(wioc, vncws_handshake_done, diff --git a/ui/vnc.c b/ui/vnc.c index 0b5dbc62e4..ed6d659722 100644 --- a/ui/vnc.c +++ b/ui/vnc.c @@ -1118,6 +1118,7 @@ static void vnc_disconnect_start(VncState *vs) if (vs->disconnecting) { return; } + trace_vnc_client_disconnect_start(vs, vs->ioc); vnc_set_share_mode(vs, VNC_SHARE_MODE_DISCONNECTED); if (vs->ioc_tag) { g_source_remove(vs->ioc_tag); @@ -1130,6 +1131,8 @@ void vnc_disconnect_finish(VncState *vs) { int i; =20 + trace_vnc_client_disconnect_finish(vs, vs->ioc); + vnc_jobs_join(vs); /* Wait encoding jobs */ =20 vnc_lock_output(vs); @@ -1183,11 +1186,12 @@ ssize_t vnc_client_io_error(VncState *vs, ssize_t r= et, Error **errp) { if (ret <=3D 0) { if (ret =3D=3D 0) { - VNC_DEBUG("Closing down client sock: EOF\n"); + trace_vnc_client_eof(vs, vs->ioc); vnc_disconnect_start(vs); } else if (ret !=3D QIO_CHANNEL_ERR_BLOCK) { - VNC_DEBUG("Closing down client sock: ret %zd (%s)\n", - ret, errp ? error_get_pretty(*errp) : "Unknown"); + trace_vnc_client_io_error(vs, vs->ioc, + errp ? error_get_pretty(*errp) : + "Unknown"); vnc_disconnect_start(vs); } =20 @@ -2884,6 +2888,7 @@ static void vnc_connect(VncDisplay *vd, QIOChannelSoc= ket *sioc, bool first_client =3D QTAILQ_EMPTY(&vd->clients); int i; =20 + trace_vnc_client_connect(vs, sioc); vs->sioc =3D sioc; object_ref(OBJECT(vs->sioc)); vs->ioc =3D QIO_CHANNEL(sioc); diff --git a/ui/trace-events b/ui/trace-events index 34c2213700..e4c02e47f5 100644 --- a/ui/trace-events +++ b/ui/trace-events @@ -29,6 +29,12 @@ vnc_key_event_ext(bool down, int sym, int keycode, const= char *name) "down %d, s vnc_key_event_map(bool down, int sym, int keycode, const char *name) "down= %d, sym 0x%x -> keycode 0x%x [%s]" vnc_key_sync_numlock(bool on) "%d" vnc_key_sync_capslock(bool on) "%d" +vnc_client_eof(void *state, void *ioc) "VNC client EOF state=3D%p ioc=3D%p" +vnc_client_io_error(void *state, void *ioc, const char *msg) "VNC client I= /O error state=3D%p ioc=3D%p errmsg=3D%s" +vnc_client_connect(void *state, void *ioc) "VNC client connect 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" =20 # ui/input.c input_event_key_number(int conidx, int number, const char *qcode, bool dow= n) "con %d, key number 0x%x [%s], down %d" --=20 2.9.3