From nobody Thu May 16 22:45:41 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1665480746; cv=none; d=zohomail.com; s=zohoarc; b=ddMzMZpXkrmktva2BSb26pSSvA42+DzzVKBPOOAvHdfnXQNk1qQRV/XCDtOIQ6NKXvU5xiEK53+f9z7oJAVQriFLstHQKwn0njCBuG68OxZ01Llfo2lrVCU59LqbgiLoOrWjG3PQNN+VpyXwUq+ruVL8aSG9FaPjCzokDCnAoLo= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1665480746; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Sender:Subject:To; bh=NhsWdloOvK+/orTWjbzy7AY8WlqPO6MLhmHSz13+eu4=; b=WX7z3mHSUNWtO0FgidiDj8HuxQbYgi61TlWIqiISNha92znY4GaUUL90PsFroENSPNAH1SuHfm4Y4ISz5J86VEKpDJwo9w375COs+4Hd0j+6n3sTc//D0n7qqEKF2lEFSxPrQsju7Zo7n8vOjCaZ0H0KWxKhVZIpx0e8ZB66dPM= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1665480746149937.2174592679253; Tue, 11 Oct 2022 02:32:26 -0700 (PDT) Received: from localhost ([::1]:39714 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oiBce-0003fn-2H for importer@patchew.org; Tue, 11 Oct 2022 05:32:24 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:51152) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oiBFt-0003Rj-TR for qemu-devel@nongnu.org; Tue, 11 Oct 2022 05:08:53 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]:41735) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oiBFp-0004kv-Nk for qemu-devel@nongnu.org; Tue, 11 Oct 2022 05:08:51 -0400 Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-554-3xqVeSlKPZq-7ygp-I_C9w-1; Tue, 11 Oct 2022 05:08:44 -0400 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.rdu2.redhat.com [10.11.54.7]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 0899B101A528; Tue, 11 Oct 2022 09:08:44 +0000 (UTC) Received: from localhost (unknown [10.39.208.20]) by smtp.corp.redhat.com (Postfix) with ESMTP id 8EBDB1415108; Tue, 11 Oct 2022 09:08:38 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1665479327; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=NhsWdloOvK+/orTWjbzy7AY8WlqPO6MLhmHSz13+eu4=; b=Ql8L900jnmEi/qYaaKfIdl6Ohkj2i1KkWj8gkJOYPRRRaj2LVAdEPeb9ArktbWDsn8+YZ4 l6G+0/IDp9gkWRjJAUYjlqUzY23C7j8hbzpd8FFl2MoTn0npjrIABjjSvUEd9Q4JVTSsYH oDvH4mKlRJxUAFbTDg7gmGhII53/b9M= X-MC-Unique: 3xqVeSlKPZq-7ygp-I_C9w-1 From: marcandre.lureau@redhat.com To: qemu-devel@nongnu.org Cc: bin.meng@windriver.com, richard.henderson@linaro.org, =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , Stefan Weil Subject: [PATCH v4] win32: set threads name Date: Tue, 11 Oct 2022 13:08:35 +0400 Message-Id: <20221011090835.3534934-1-marcandre.lureau@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.1 on 10.11.54.7 Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=170.10.133.124; envelope-from=marcandre.lureau@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -3 X-Spam_score: -0.4 X-Spam_bar: / X-Spam_report: (-0.4 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, URI_TRY_3LD=1.67 autolearn=no autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1665480748295100001 From: Marc-Andr=C3=A9 Lureau As described in: https://learn.microsoft.com/en-us/visualstudio/debugger/how-to-set-a-thread= -name-in-native-code?view=3Dvs-2022 SetThreadDescription() is available since Windows 10, version 1607 and in some versions only by "Run Time Dynamic Linking". Its declaration is not yet in mingw, so we lookup the function the same way glib does. Tested with Visual Studio Community 2022 debugger. Signed-off-by: Marc-Andr=C3=A9 Lureau Acked-by: Richard Henderson --- util/qemu-thread-win32.c | 55 ++++++++++++++++++++++++++++++++++++++-- 1 file changed, 53 insertions(+), 2 deletions(-) diff --git a/util/qemu-thread-win32.c b/util/qemu-thread-win32.c index a2d5a6e825..b20bfa9c1f 100644 --- a/util/qemu-thread-win32.c +++ b/util/qemu-thread-win32.c @@ -19,12 +19,39 @@ =20 static bool name_threads; =20 +typedef HRESULT (WINAPI *pSetThreadDescription) (HANDLE hThread, + PCWSTR lpThreadDescriptio= n); +static pSetThreadDescription SetThreadDescriptionFunc; +static HMODULE kernel32_module; + +static bool load_set_thread_description(void) +{ + static gsize _init_once =3D 0; + + if (g_once_init_enter(&_init_once)) { + kernel32_module =3D LoadLibrary("kernel32.dll"); + if (kernel32_module) { + SetThreadDescriptionFunc =3D + (pSetThreadDescription)GetProcAddress(kernel32_module, + "SetThreadDescriptio= n"); + if (!SetThreadDescriptionFunc) { + FreeLibrary(kernel32_module); + } + } + g_once_init_leave(&_init_once, 1); + } + + return !!SetThreadDescriptionFunc; +} + void qemu_thread_naming(bool enable) { - /* But note we don't actually name them on Windows yet */ name_threads =3D enable; =20 - fprintf(stderr, "qemu: thread naming not supported on this host\n"); + if (enable && !load_set_thread_description()) { + fprintf(stderr, "qemu: thread naming not supported on this host\n"= ); + name_threads =3D false; + } } =20 static void error_exit(int err, const char *msg) @@ -400,6 +427,26 @@ void *qemu_thread_join(QemuThread *thread) return ret; } =20 +static bool +set_thread_description(HANDLE h, const char *name) +{ + HRESULT hr; + g_autofree wchar_t *namew =3D NULL; + + if (!load_set_thread_description()) { + return false; + } + + namew =3D g_utf8_to_utf16(name, -1, NULL, NULL, NULL); + if (!namew) { + return false; + } + + hr =3D SetThreadDescriptionFunc(h, namew); + + return SUCCEEDED(hr); +} + void qemu_thread_create(QemuThread *thread, const char *name, void *(*start_routine)(void *), void *arg, int mode) @@ -423,7 +470,11 @@ void qemu_thread_create(QemuThread *thread, const char= *name, if (!hThread) { error_exit(GetLastError(), __func__); } + if (name_threads && name && !set_thread_description(hThread, name)) { + fprintf(stderr, "qemu: failed to set thread description: %s\n", na= me); + } CloseHandle(hThread); + thread->data =3D data; } =20 --=20 2.37.3