From patchwork Sun Jan 7 05:55:51 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Brad Smith X-Patchwork-Id: 45517 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:2449:b0:199:85ec:e0df with SMTP id t9csp367821pzc; Sat, 6 Jan 2024 21:56:04 -0800 (PST) X-Google-Smtp-Source: AGHT+IHw7/BzTWQSe1s2PMrJ4w4+0tOTgIKP89iZ9kxvp+z6xoOR/lH8M9z8YgW69TB9Qdl10cXc X-Received: by 2002:a5d:6805:0:b0:337:39c6:a911 with SMTP id w5-20020a5d6805000000b0033739c6a911mr2052382wru.2.1704606964576; Sat, 06 Jan 2024 21:56:04 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1704606964; cv=none; d=google.com; s=arc-20160816; b=orUKWUawgtEJbsdBtw7Rrix4Rq1IyupcjO2nvFm7GaXpEtiP5asrHxu0h6oJI3HUYW b08F/kNypSnFVw8Lu1IvRBNk2ItZGP9k1A25sc752lgEEmBdHjFimyprR6S7aoqRelim 9AiJCcIsfaOgcUBLzxc9R70gV5uG56rLDb5QtlMax9oIDFqWwiAge5rsoH5gKD2f/z+g ZzQmaPT0GdvLHkvW794Lh2VxZGEk4RRXOMk9+WLyQyRvOJ9BjkePNOgXA6s184VyvIGr R7rkO1DsqDXfxz3OONt0bELqdGJRih6LyYjch9XJf8TH80SjrgIyJGUDHjLb8WXXS0dX qrdQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:reply-to:list-subscribe :list-help:list-post:list-archive:list-unsubscribe:list-id :precedence:subject:content-disposition:mime-version:message-id:to :from:date:domainkey-signature:dkim-signature:delivered-to; bh=NJPz/Q4uFPdGJYMyasB1O8iEInvlAuhuYE5oiqE9A8o=; fh=e5zN9xSzcxLA6bGo3lF+CqTbY/oLwzApV03EO/RBfgQ=; b=HWkc1jx/RtQX0fIeItCH4Jp7VjWKrwQUNbF89XzQs4+5ejkQQMnFmhtzR+4te82lwe tsaZWkKti7orgxlLzXW43j0UhZlkkeUoGkx9Wf4rb8+Ux3DXMYWMF/RfvzpPh7y6a1dK qGPQONe2Z/eoFbCNDQbAvDSYoIh4NPBqT9KcFFqksJoTFsk1v5TPpdzOicCDI7MPOXrr EJi5xlpIh0vcjHJXWFMCi6boMhIhgIdGq0p8YDRSfB+h0h/j/K+PzbeCvcuqfMdu6lEx RjfeLaBhzmhlDoYvRZJga7Pn9xxVymW66kplAdt+oAgTp0PQV9QymGbTyriX0PAGiltT wLTg== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@comstyle.com header.s=default header.b=L6JUV1Jk; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id z68-20020a509e4a000000b00553fad4c99csi2151960ede.399.2024.01.06.21.56.04; Sat, 06 Jan 2024 21:56:04 -0800 (PST) Received-SPF: pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) client-ip=79.124.17.100; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@comstyle.com header.s=default header.b=L6JUV1Jk; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id D7AF468C9EC; Sun, 7 Jan 2024 07:56:00 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail.comstyle.com (speedy.comstyle.com [206.51.28.2]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 1735A68CBD7 for ; Sun, 7 Jan 2024 07:55:54 +0200 (EET) Received: from mail.comstyle.com (localhost [127.0.0.1]) by mail.comstyle.com (Postfix) with ESMTP id 4T75yw4lVcz8PbP for ; Sun, 7 Jan 2024 00:55:52 -0500 (EST) DKIM-Signature: v=1; a=rsa-sha1; c=relaxed; d=comstyle.com; h=date:from :to:subject:message-id:mime-version:content-type; s=default; bh= aASe4Xhzr8owJdfpGyk3vGRmMVg=; b=L6JUV1JkJEd9SVbqYouIC0bzyfNYL4qU fWYRW3JmAxggwYSZ8vlUkcixLpjHYNlMjCrsSoUPpjPTkq3bqLX1j9bTjqOYFcbO KxrY5fQu3WH9DM2KQv3K4RUzGS6vqiuWiHJRwEUiW15Z4W7p79EBKTvFDQ+mWoJb 6AJDjQWWcI4= DomainKey-Signature: a=rsa-sha1; c=nofws; d=comstyle.com; h=date:from:to :subject:message-id:mime-version:content-type; q=dns; s=default; b= pji96QuzCjHs04cWdEI88QQq0tH0FLZUNk0M3iEu+WDGDCv2GQsTZTpzlUJJNO2S X86Hf0t2TPM34Q0T3HZFyGVE3/P9wxlNJt0UVFVp37xNB1DqIr6xPEqwxNXKaHDv BuiaBTD9KMhFCSvHIHyr3QG20VJIEXs+A1oAtD6dscM= Received: from humpty.home.comstyle.com (unknown [IPv6:2001:470:b050:3:e3c:46ac:2d38:44f4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA512) (No client certificate requested) (Authenticated sender: brad) by mail.comstyle.com (Postfix) with ESMTPSA id 4T75yw2nGlz8PbN for ; Sun, 7 Jan 2024 00:55:52 -0500 (EST) Date: Sun, 7 Jan 2024 00:55:51 -0500 From: Brad Smith To: FFmpeg development discussions and patches Message-ID: MIME-Version: 1.0 Content-Disposition: inline Subject: [FFmpeg-devel] [PATCH v2] lavu/thread: add support for setting thread name on *bsd and solaris X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: FFmpeg development discussions and patches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: FFmpeg development discussions and patches Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: 0kcyKRFblxkZ lavu/thread: add support for setting thread name on *bsd and solaris FreeBSD/DragonFly/Solaris use pthread_setname_np(). OpenBSD uses pthread_set_name_np(). Signed-off-by: Brad Smith --- configure | 10 ++++++++++ libavutil/thread.h | 14 ++++++++++++-- 2 files changed, 22 insertions(+), 2 deletions(-) diff --git a/configure b/configure index 0b5e83bd20..67660b6292 100755 --- a/configure +++ b/configure @@ -2239,6 +2239,7 @@ HEADERS_LIST=" opencv2_core_core_c_h OpenGL_gl3_h poll_h + pthread_np_h sys_param_h sys_resource_h sys_select_h @@ -2341,6 +2342,8 @@ SYSTEM_FUNCS=" posix_memalign prctl pthread_cancel + pthread_set_name_np + pthread_setname_np sched_getaffinity SecItemImport SetConsoleTextAttribute @@ -6523,6 +6526,7 @@ check_headers malloc.h check_headers mftransform.h check_headers net/udplite.h check_headers poll.h +check_headers pthread_np.h check_headers sys/param.h check_headers sys/resource.h check_headers sys/select.h @@ -6691,6 +6695,12 @@ if ! disabled pthreads && ! enabled w32threads && ! enabled os2threads; then if enabled pthreads; then check_builtin sem_timedwait semaphore.h "sem_t *s; sem_init(s,0,0); sem_timedwait(s,0); sem_destroy(s)" $pthreads_extralibs check_func pthread_cancel $pthreads_extralibs + hdrs=pthread.h + if enabled pthread_np_h; then + hdrs="$hdrs pthread_np.h" + fi + check_lib pthread_set_name_np "$hdrs" pthread_set_name_np -lpthread + check_lib pthread_setname_np "$hdrs" pthread_setname_np -lpthread fi fi diff --git a/libavutil/thread.h b/libavutil/thread.h index 2ded498c89..fa74dd2ea7 100644 --- a/libavutil/thread.h +++ b/libavutil/thread.h @@ -26,6 +26,8 @@ #if HAVE_PRCTL #include +#elif (HAVE_PTHREAD_SETNAME_NP || HAVE_PTHREAD_SET_NAME_NP) && HAVE_PTHREAD_NP_H +#include #endif #include "error.h" @@ -213,11 +215,19 @@ static inline int ff_thread_once(char *control, void (*routine)(void)) static inline int ff_thread_setname(const char *name) { + int ret = 0; + #if HAVE_PRCTL - return AVERROR(prctl(PR_SET_NAME, name)); + ret = AVERROR(prctl(PR_SET_NAME, name)); +#elif HAVE_PTHREAD_SETNAME_NP + ret = AVERROR(pthread_setname_np(pthread_self(), name)); +#elif HAVE_PTHREAD_SET_NAME_NP + pthread_set_name_np(pthread_self(), name); +#else + ret = AVERROR(ENOSYS); #endif - return AVERROR(ENOSYS); + return ret; } #endif /* AVUTIL_THREAD_H */