From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id 51CE7A0A0C; Sat, 19 Jun 2021 03:58:19 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id A9E8141102; Sat, 19 Jun 2021 03:58:13 +0200 (CEST) Received: from linux.microsoft.com (linux.microsoft.com [13.77.154.182]) by mails.dpdk.org (Postfix) with ESMTP id 2717440E32 for ; Sat, 19 Jun 2021 03:58:11 +0200 (CEST) Received: by linux.microsoft.com (Postfix, from userid 1059) id 5DF6F20B6C50; Fri, 18 Jun 2021 18:58:10 -0700 (PDT) DKIM-Filter: OpenDKIM Filter v2.11.0 linux.microsoft.com 5DF6F20B6C50 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linux.microsoft.com; s=default; t=1624067890; bh=4lWl4CQi7mSh0ZYLINU1YleYnuLY8mtT0fRdZJkHv9U=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=jmUliniMadMNqHshWW76mYb3wZODJxCu6QQSy3KDGDPxz7+ZZIWNu1ZSVB3nVkchw 9G8dpp1I/0306QY6mTVbFI3dCV5lGcRo+OCjSFRe6TimaQCAVP7BewoOzfXno3CAYh yeJchUqfqkqTQlxwjMCZZQHmJ3EnwxR4JDpiUju0= From: Narcisa Ana Maria Vasile To: dev@dpdk.org, thomas@monjalon.net, dmitry.kozliuk@gmail.com, khot@microsoft.com, navasile@microsoft.com, dmitrym@microsoft.com, roretzla@microsoft.com, talshn@nvidia.com, ocardona@microsoft.com Cc: bruce.richardson@intel.com, david.marchand@redhat.com, pallavi.kadam@intel.com Date: Fri, 18 Jun 2021 18:57:53 -0700 Message-Id: <1624067878-2130-2-git-send-email-navasile@linux.microsoft.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1624067878-2130-1-git-send-email-navasile@linux.microsoft.com> References: <1624053294-31255-1-git-send-email-navasile@linux.microsoft.com> <1624067878-2130-1-git-send-email-navasile@linux.microsoft.com> Subject: [dpdk-dev] [PATCH v2 1/6] eal: add function that sets thread name X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Sender: "dev" From: Narcisa Vasile Implement function that sets the name of a thread. On Windows, SetThreadDescription() is used. Use GetProcAddress() to obtain the address of the function for MinGW compatibility. Depends-on: series-17402 ("eal: Add EAL API for threading") Signed-off-by: Narcisa Vasile --- lib/eal/common/rte_thread.c | 17 ++++++++++ lib/eal/include/rte_thread.h | 18 +++++++++++ lib/eal/version.map | 1 + lib/eal/windows/rte_thread.c | 60 ++++++++++++++++++++++++++++++++++++ 4 files changed, 96 insertions(+) diff --git a/lib/eal/common/rte_thread.c b/lib/eal/common/rte_thread.c index 3fdb267337..fbff1168e5 100644 --- a/lib/eal/common/rte_thread.c +++ b/lib/eal/common/rte_thread.c @@ -373,6 +373,23 @@ rte_thread_barrier_destroy(rte_thread_barrier *barrier) return ret; } +int +rte_thread_name_set(rte_thread_t thread_id, const char *name) +{ + int ret = ENOSYS; +#if defined(__GLIBC__) && defined(__GLIBC_PREREQ) +#if __GLIBC_PREREQ(2, 12) + char truncated[RTE_THREAD_MAX_DESCRIPTION_LENGTH]; + + memcpy(truncated, name, sizeof(truncated)); + ret = pthread_setname_np((pthread_t)thread_id.opaque_id, truncated); +#endif +#endif + RTE_SET_USED(thread_id); + RTE_SET_USED(name); + return ret; +} + int rte_thread_key_create(rte_thread_key *key, void (*destructor)(void *)) { diff --git a/lib/eal/include/rte_thread.h b/lib/eal/include/rte_thread.h index 40da83467b..c65cfd8c9e 100644 --- a/lib/eal/include/rte_thread.h +++ b/lib/eal/include/rte_thread.h @@ -24,6 +24,8 @@ extern "C" { #include +#define RTE_THREAD_MAX_DESCRIPTION_LENGTH 16 + /** * Thread id descriptor. */ @@ -439,6 +441,22 @@ int rte_thread_barrier_wait(rte_thread_barrier *barrier); __rte_experimental int rte_thread_barrier_destroy(rte_thread_barrier *barrier); +/** + * Set the name of the thread represented by 'thread_id'. + * + * @param thread_id + * The id of the thread. + * + * @param name + * Thread name to set. + * + * @return + * On success, return 0. + * On failure, return a positive errno-style error number. + */ +__rte_experimental +int rte_thread_name_set(rte_thread_t thread_id, const char *name); + /** * Create a TLS data key visible to all threads in the process. * the created key is later used to get/set a value. diff --git a/lib/eal/version.map b/lib/eal/version.map index 6645f60a78..2a566c04af 100644 --- a/lib/eal/version.map +++ b/lib/eal/version.map @@ -443,6 +443,7 @@ EXPERIMENTAL { rte_thread_barrier_init; rte_thread_barrier_wait; rte_thread_barrier_destroy; + rte_thread_name_set; }; INTERNAL { diff --git a/lib/eal/windows/rte_thread.c b/lib/eal/windows/rte_thread.c index b2ff16f51f..995ae2491d 100644 --- a/lib/eal/windows/rte_thread.c +++ b/lib/eal/windows/rte_thread.c @@ -556,6 +556,66 @@ rte_thread_barrier_destroy(rte_thread_barrier *barrier) return 0; } +typedef HRESULT +(*SetThreadDescription_type)(HANDLE thread_handle, PCWSTR thread_description); + +int +rte_thread_name_set(rte_thread_t thread_id, const char *name) +{ + int ret = 0; + size_t count; + HRESULT hr; + HANDLE thread_handle = NULL; + WCHAR w_name[RTE_THREAD_MAX_DESCRIPTION_LENGTH]; + HMODULE kernel_lib = NULL; + SetThreadDescription_type SetThreadDescription_ptr; + + static const char library_name[] = "kernel32.dll"; + static const char function[] = "SetThreadDescription"; + + kernel_lib = LoadLibraryA(library_name); + if (kernel_lib == NULL) { + ret = thread_log_last_error("LoadLibraryA(\"kernel32.dll\")"); + goto cleanup; + } + + SetThreadDescription_ptr = (SetThreadDescription_type)( + (void *)GetProcAddress(kernel_lib, function)); + if (SetThreadDescription_ptr == NULL) { + ret = thread_log_last_error("GetProcAddress(\"kernel32.dll\", \"SetThreadDescription\")"); + goto cleanup; + } + + thread_handle = OpenThread(THREAD_SET_LIMITED_INFORMATION, FALSE, + thread_id.opaque_id); + if (thread_handle == NULL) { + ret = thread_log_last_error("OpenThread()"); + goto cleanup; + } + + count = mbstowcs(w_name, name, RTE_THREAD_MAX_DESCRIPTION_LENGTH); + if (count < 0) { + RTE_LOG(DEBUG, EAL, "Invalid thread name!\n"); + ret = EINVAL; + goto cleanup; + } + + hr = SetThreadDescription_ptr(thread_handle, w_name); + if (FAILED(hr)) { + ret = thread_log_last_error("SetThreadDescription()"); + goto cleanup; + } + +cleanup: + if (kernel_lib != NULL) + FreeLibrary(kernel_lib); + if (thread_handle != NULL) { + CloseHandle(thread_handle); + thread_handle = NULL; + } + return ret; +} + int rte_thread_key_create(rte_thread_key *key, __rte_unused void (*destructor)(void *)) -- 2.31.0.vfs.0.1