From patchwork Tue Oct 18 16:53:04 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anton Khirnov X-Patchwork-Id: 38806 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:4a86:b0:9d:28a3:170e with SMTP id fn6csp2206674pzb; Tue, 18 Oct 2022 09:54:31 -0700 (PDT) X-Google-Smtp-Source: AMsMyM5aNvRr12FA0bCGvvCM5OQCv2flTri6RpX6jo4gN1QwNEgT0ktzWw1y+/e6Aht19C4OK77z X-Received: by 2002:a17:907:2bd4:b0:78d:48c9:29b0 with SMTP id gv20-20020a1709072bd400b0078d48c929b0mr3102587ejc.562.1666112071281; Tue, 18 Oct 2022 09:54:31 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1666112071; cv=none; d=google.com; s=arc-20160816; b=asouuWBHgQ0Tto13Jfc0PNTS16P0RpuPTbW+jrmzaa0OZNYtC7EWm2Cnt7LCz0TsoL fb+iDjxVVAivFxv1NZufE76/Iws7EZ0XTMaMDxCYithgGSbvPCvqrpO1c7/LCmwQy+Q/ ncLlNa0MG0v17LHFOztwVmKvu6eiktz5QX2omKhsCUBD9UpArKH+iydYbsDmq870om0w 1EZYjnhVrKjM/xtKNhhtcjS0/6R4JG3q6ffRc1Ev9ylcy5jUgcujLVmm+Lyn/b0VaGNw 5VwyYbzqzJb9Tv3YF+Tew2O1UAaUSkp0VNc/L/CGcIOHhkK5hfyH+8J6bu5NqAr7I4ob t1aQ== 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:mime-version:message-id:date:to:from :delivered-to; bh=/VWOW9HfR6DIAl50atWDpbrqAULpU2/X4GmPNoYMyEQ=; b=JHvaOD5FapwMtdsFRt4HHKQ0vtBPfNJZGD/yZhb3XZPEtdWOdflav7v3XJDPjWRzhh OF74ku5LNCa5bnrf8+722JqbToyciDZUL/6RX/bID6pw0VibP89cAgWunGBs6o5S6BEK 2/YAwxZSQ4StxtqiVHHnJBfCI1iXTm2bLrz2z3YXBAOPrHpMOlPJaiD1NdRYZL1n/Ys4 foiWVcVQM/9bnvbD6aNY3zgJikvtyUo7s525Wu4JmEYfhv+7kYNrre4ybjZMm20cm7Ee ulPVcKfpvyXlifuZhqJ2ftn3PqaoB5XVrtnD9bl1w588wgYCtiVOpCo8FXlsLdtL/aWj wcpQ== ARC-Authentication-Results: i=1; mx.google.com; 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 bq3-20020a056402214300b0044f2eb2de9asi10659350edb.444.2022.10.18.09.54.30; Tue, 18 Oct 2022 09:54:31 -0700 (PDT) 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; 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 5261368BD43; Tue, 18 Oct 2022 19:54:09 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail0.khirnov.net (red.khirnov.net [176.97.15.12]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id D60E968BBFE for ; Tue, 18 Oct 2022 19:54:00 +0300 (EEST) Received: from localhost (localhost [IPv6:::1]) by mail0.khirnov.net (Postfix) with ESMTP id 4DC852404E4 for ; Tue, 18 Oct 2022 18:54:00 +0200 (CEST) Received: from mail0.khirnov.net ([IPv6:::1]) by localhost (mail0.khirnov.net [IPv6:::1]) (amavisd-new, port 10024) with ESMTP id V-A8EZv5BcQU for ; Tue, 18 Oct 2022 18:53:58 +0200 (CEST) Received: from libav.khirnov.net (libav.khirnov.net [IPv6:2a00:c500:561:201::7]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "libav.khirnov.net", Issuer "smtp.khirnov.net SMTP CA" (verified OK)) by mail0.khirnov.net (Postfix) with ESMTPS id BEC742400F4 for ; Tue, 18 Oct 2022 18:53:58 +0200 (CEST) Received: from libav.khirnov.net (libav.khirnov.net [IPv6:::1]) by libav.khirnov.net (Postfix) with ESMTP id BE08E3A0212 for ; Tue, 18 Oct 2022 18:53:58 +0200 (CEST) From: Anton Khirnov To: ffmpeg-devel@ffmpeg.org Date: Tue, 18 Oct 2022 18:53:04 +0200 Message-Id: <20221018165307.28242-1-anton@khirnov.net> X-Mailer: git-send-email 2.35.1 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 1/4] lavu/thread: add an internal function for setting thread name 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: rr5RqF93WzJ7 Linux-only for now. --- configure | 2 ++ libavutil/thread.h | 16 +++++++++++++++- 2 files changed, 17 insertions(+), 1 deletion(-) diff --git a/configure b/configure index f3fd91f592..494a03486c 100755 --- a/configure +++ b/configure @@ -2310,6 +2310,7 @@ SYSTEM_FUNCS=" nanosleep PeekNamedPipe posix_memalign + prctl pthread_cancel sched_getaffinity SecItemImport @@ -6294,6 +6295,7 @@ check_func mmap check_func mprotect # Solaris has nanosleep in -lrt, OpenSolaris no longer needs that check_func_headers time.h nanosleep || check_lib nanosleep time.h nanosleep -lrt +check_func_headers sys/prctl.h prctl check_func sched_getaffinity check_func setrlimit check_struct "sys/stat.h" "struct stat" st_mtim.tv_nsec -D_BSD_SOURCE diff --git a/libavutil/thread.h b/libavutil/thread.h index 7106fd0d47..2f5e7e1cb5 100644 --- a/libavutil/thread.h +++ b/libavutil/thread.h @@ -24,6 +24,12 @@ #include "config.h" +#if HAVE_PRCTL +#include +#endif + +#include "error.h" + #if HAVE_PTHREADS || HAVE_W32THREADS || HAVE_OS2THREADS #if HAVE_PTHREADS @@ -33,7 +39,6 @@ #include -#include "error.h" #include "log.h" #include "macros.h" @@ -187,4 +192,13 @@ static inline int ff_thread_once(char *control, void (*routine)(void)) #endif +static inline int ff_thread_setname(const char *name) +{ +#if HAVE_PRCTL + return AVERROR(prctl(PR_SET_NAME, name)); +#endif + + return AVERROR(ENOSYS); +} + #endif /* AVUTIL_THREAD_H */ From patchwork Tue Oct 18 16:53:05 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anton Khirnov X-Patchwork-Id: 38807 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:4a86:b0:9d:28a3:170e with SMTP id fn6csp2206711pzb; Tue, 18 Oct 2022 09:54:39 -0700 (PDT) X-Google-Smtp-Source: AMsMyM64tZuf1wN/lpGa3b8MCJy+Q7S3WS6GnP/JZf2EoEr7VHSkRF2rsZTERjwwd1HVFC9YuvgT X-Received: by 2002:a17:907:808:b0:730:54cc:b597 with SMTP id wv8-20020a170907080800b0073054ccb597mr3220459ejb.434.1666112079085; Tue, 18 Oct 2022 09:54:39 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1666112079; cv=none; d=google.com; s=arc-20160816; b=UK/LZp/jIO9Th1dzGmKX+JcCh4QaPCgqM+RnMDJjj9LpIqNaNgvRH3eCrzZJNewb8Q xlZfaD76kH9sPfu2d34536KDJjXcSPur/d4ZKAhuwregNpMyX++mBzsaZYC7bX5Ynf36 JpqJeWODv5x5k2Ye9iiq2x9mxHZN11BNiDsf36yFerBB5VoDCS5lG8XHnw/PdWML9lIs 7dpG7KlisI6BRSDiwnTl+GsSc+/6FSbqMR9bGTYkxSU/cmsabII88rXAdUDioldmrZI4 qskLSf22MjlEFLNMDySz44zX11oh+G/H3a16/+fXJw0+OvuX7ED8KUDcKBs2n9Xlu1Ws riow== 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:mime-version:references:in-reply-to:message-id :date:to:from:delivered-to; bh=pujeQs7W1VbvlJN8nyvvJb4HGvyiAdP0mQSzz6+mvyo=; b=ftoRDHJBzAel9N/lE1WUPa6fnNHNQ3QDCGbq8OwiR/HooglHArC8B0o1EXJ5H4/u4v X4EDajZ/vq/JNPywospr/ZxBu5EBMoZm/ZYcXZ5x7GX7JVkR2dgM9g5gqZ9mzHB3uf/f kKMfsHUi93WcCtczn9O0JeziYK9vl7X5XkEZadQOHXsbt1JoXRW36GXl5ZTUeVphidju 9JbLixmIVRgETO5ttxfFc7jQY9jdBcXJj3wd+TOAKo1Eq6N+oVHzX5/4JtniZqExVe86 eryuf8W8R+DuG/vLzN+VQckOZMRKg5DwSo/U2UyS0n8iPFuE+dU+y6C4ee9cBffnbr+2 1ncQ== ARC-Authentication-Results: i=1; mx.google.com; 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 dr8-20020a170907720800b0078b3edae43csi13839326ejc.37.2022.10.18.09.54.38; Tue, 18 Oct 2022 09:54:39 -0700 (PDT) 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; 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 4796768BD5F; Tue, 18 Oct 2022 19:54:10 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail0.khirnov.net (red.khirnov.net [176.97.15.12]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 2637268BBFE for ; Tue, 18 Oct 2022 19:54:01 +0300 (EEST) Received: from localhost (localhost [IPv6:::1]) by mail0.khirnov.net (Postfix) with ESMTP id 94E852400F4 for ; Tue, 18 Oct 2022 18:54:00 +0200 (CEST) Received: from mail0.khirnov.net ([IPv6:::1]) by localhost (mail0.khirnov.net [IPv6:::1]) (amavisd-new, port 10024) with ESMTP id XbPZCY1qFP-B for ; Tue, 18 Oct 2022 18:54:00 +0200 (CEST) Received: from libav.khirnov.net (libav.khirnov.net [IPv6:2a00:c500:561:201::7]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "libav.khirnov.net", Issuer "smtp.khirnov.net SMTP CA" (verified OK)) by mail0.khirnov.net (Postfix) with ESMTPS id CF64E2404F7 for ; Tue, 18 Oct 2022 18:53:58 +0200 (CEST) Received: from libav.khirnov.net (libav.khirnov.net [IPv6:::1]) by libav.khirnov.net (Postfix) with ESMTP id C1CBE3A0922 for ; Tue, 18 Oct 2022 18:53:58 +0200 (CEST) From: Anton Khirnov To: ffmpeg-devel@ffmpeg.org Date: Tue, 18 Oct 2022 18:53:05 +0200 Message-Id: <20221018165307.28242-2-anton@khirnov.net> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20221018165307.28242-1-anton@khirnov.net> References: <20221018165307.28242-1-anton@khirnov.net> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 2/4] lavc/pthread_frame: set worker thread names 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: +U92+9Qf9vqS --- libavcodec/pthread_frame.c | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/libavcodec/pthread_frame.c b/libavcodec/pthread_frame.c index f8fddc5e4d..7cd352160e 100644 --- a/libavcodec/pthread_frame.c +++ b/libavcodec/pthread_frame.c @@ -179,6 +179,17 @@ static void async_unlock(FrameThreadContext *fctx) pthread_mutex_unlock(&fctx->async_mutex); } +static void thread_set_name(PerThreadContext *p) +{ + AVCodecContext *avctx = p->avctx; + int idx = p - p->parent->threads; + char name[16]; + + snprintf(name, sizeof(name), "d:%.7s:ft%d", avctx->codec->name, idx); + + ff_thread_setname(name); +} + /** * Codec worker thread. * @@ -192,6 +203,8 @@ static attribute_align_arg void *frame_worker_thread(void *arg) AVCodecContext *avctx = p->avctx; const FFCodec *codec = ffcodec(avctx->codec); + thread_set_name(p); + pthread_mutex_lock(&p->mutex); while (1) { while (atomic_load(&p->state) == STATE_INPUT_READY && !p->die) From patchwork Tue Oct 18 16:53:06 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anton Khirnov X-Patchwork-Id: 38805 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:4a86:b0:9d:28a3:170e with SMTP id fn6csp2206652pzb; Tue, 18 Oct 2022 09:54:22 -0700 (PDT) X-Google-Smtp-Source: AMsMyM47EmZqiwnqbFBa2iHiQQVZx72GwgMmC4JO6EGV1NmQPkYshC8asbt7iBLT0rRbdZhtyTIB X-Received: by 2002:a17:907:968e:b0:78d:d4c7:b74f with SMTP id hd14-20020a170907968e00b0078dd4c7b74fmr3235715ejc.727.1666112062243; Tue, 18 Oct 2022 09:54:22 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1666112062; cv=none; d=google.com; s=arc-20160816; b=ExBQYtaq7QdUeVUGmWOWgZST4Vwa/xNynWf8f50lf5U99YjG4GurGaLZSLHU3HjOcs Df49a+xonZilb+yIA2QkbZvggkqHw5XY+Q3k+g6Bdx+j+hLus+V0y+lPKq5o0TpOeiKQ xF92heUEGt99RJuJHdGlFgLoKGpOk2zI4JjZwuhcLWyutsyaMgBv40TbJ124GHe6QpAe ceV6lbd+TnbtnRB+JF0ze2z/cUfFkVFpCRpnQknRKLCo+oemU8ExLV0GNVwZmsAVCMin scGkwmd34Dull0srr/S+WALlpiB0uYEMrvzC9md1hBR42maM3ZPiU93ifC92CoddJn/C +ZnA== 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:mime-version:references:in-reply-to:message-id :date:to:from:delivered-to; bh=zs0lyWlh7YTTvWhPbRwb1gR3kXZJge/DNR5Ny+FyZI0=; b=X4nEqSJHv4OzMDDztR8ldjV37OqQuBvdDvqLZgGv+mqy9faGYqMGtBzXJsu17LLsMC FppU/Xo31sprV6u8Kcohpnzpjb+oPveFMAjPKV+9vhhR/xjbeImx+puehPMjCMjr3Czk SHD8EXUE+1+k9jVPAuyTq85Nl2Bxq8y52EywXVYuUhg/RLN2hjw/QQ65cC0LVEPWKpec aspJX6JKTWrAO6KyVYZ6tWzmXzYw2PCpElsK52mMOCuOvgtAMfipQprXsQymWhNGTONx nsKeirO5u2tXjolbgJXguboQ29DxyoUTltyZDJbUMpD2/1oiaQ+wFDkaFIs8zG4kfeLC jLHA== ARC-Authentication-Results: i=1; mx.google.com; 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 h4-20020a0564020e0400b00453b9f11bb1si11505819edh.206.2022.10.18.09.54.21; Tue, 18 Oct 2022 09:54:22 -0700 (PDT) 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; 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 55B4F68BD51; Tue, 18 Oct 2022 19:54:08 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail0.khirnov.net (red.khirnov.net [176.97.15.12]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id B1ED368BBFE for ; Tue, 18 Oct 2022 19:54:00 +0300 (EEST) Received: from localhost (localhost [IPv6:::1]) by mail0.khirnov.net (Postfix) with ESMTP id 20B672404F5 for ; Tue, 18 Oct 2022 18:54:00 +0200 (CEST) Received: from mail0.khirnov.net ([IPv6:::1]) by localhost (mail0.khirnov.net [IPv6:::1]) (amavisd-new, port 10024) with ESMTP id OS9N3XEvIsgn for ; Tue, 18 Oct 2022 18:53:59 +0200 (CEST) Received: from libav.khirnov.net (libav.khirnov.net [IPv6:2a00:c500:561:201::7]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "libav.khirnov.net", Issuer "smtp.khirnov.net SMTP CA" (verified OK)) by mail0.khirnov.net (Postfix) with ESMTPS id C70EA2404E4 for ; Tue, 18 Oct 2022 18:53:58 +0200 (CEST) Received: from libav.khirnov.net (libav.khirnov.net [IPv6:::1]) by libav.khirnov.net (Postfix) with ESMTP id C2DB43A13D9 for ; Tue, 18 Oct 2022 18:53:58 +0200 (CEST) From: Anton Khirnov To: ffmpeg-devel@ffmpeg.org Date: Tue, 18 Oct 2022 18:53:06 +0200 Message-Id: <20221018165307.28242-3-anton@khirnov.net> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20221018165307.28242-1-anton@khirnov.net> References: <20221018165307.28242-1-anton@khirnov.net> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 3/4] lavf: set internal thread names 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: WzBqvSAvZ0D7 --- libavformat/async.c | 2 ++ libavformat/fifo.c | 2 ++ libavformat/udp.c | 4 ++++ 3 files changed, 8 insertions(+) diff --git a/libavformat/async.c b/libavformat/async.c index 3c6f89cab9..e096b0bc6f 100644 --- a/libavformat/async.c +++ b/libavformat/async.c @@ -189,6 +189,8 @@ static void *async_buffer_task(void *arg) int ret = 0; int64_t seek_ret; + ff_thread_setname("async"); + while (1) { int fifo_space, to_copy; diff --git a/libavformat/fifo.c b/libavformat/fifo.c index 692c854be2..7b35c9bf02 100644 --- a/libavformat/fifo.c +++ b/libavformat/fifo.c @@ -432,6 +432,8 @@ static void *fifo_consumer_thread(void *data) fifo_thread_ctx.avf = avf; fifo_thread_ctx.last_received_dts = AV_NOPTS_VALUE; + ff_thread_setname("fifo-consumer"); + while (1) { uint8_t just_flushed = 0; diff --git a/libavformat/udp.c b/libavformat/udp.c index 3b36a4a094..e8980b29d8 100644 --- a/libavformat/udp.c +++ b/libavformat/udp.c @@ -487,6 +487,8 @@ static void *circular_buffer_task_rx( void *_URLContext) UDPContext *s = h->priv_data; int old_cancelstate; + ff_thread_setname("udp-rx"); + pthread_setcancelstate(PTHREAD_CANCEL_DISABLE, &old_cancelstate); pthread_mutex_lock(&s->mutex); if (ff_socket_nonblock(s->udp_fd, 0) < 0) { @@ -552,6 +554,8 @@ static void *circular_buffer_task_tx( void *_URLContext) int64_t burst_interval = s->bitrate ? (s->burst_bits * 1000000 / s->bitrate) : 0; int64_t max_delay = s->bitrate ? ((int64_t)h->max_packet_size * 8 * 1000000 / s->bitrate + 1) : 0; + ff_thread_setname("udp-tx"); + pthread_mutex_lock(&s->mutex); if (ff_socket_nonblock(s->udp_fd, 0) < 0) { From patchwork Tue Oct 18 16:53:07 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anton Khirnov X-Patchwork-Id: 38804 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:4a86:b0:9d:28a3:170e with SMTP id fn6csp2206600pzb; Tue, 18 Oct 2022 09:54:13 -0700 (PDT) X-Google-Smtp-Source: AMsMyM6dLvaQKzY9/zG0VcL0uvrZfip2UwQABbgTXOZ+4KFZNsij/CamxKGNiDPSiXIWXsu6Dqcz X-Received: by 2002:a17:907:7f25:b0:78d:e76a:ef18 with SMTP id qf37-20020a1709077f2500b0078de76aef18mr3213482ejc.378.1666112052746; Tue, 18 Oct 2022 09:54:12 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1666112052; cv=none; d=google.com; s=arc-20160816; b=bJCTyEyeo4UnKJUdw3wnD/cM5A2TKy22nssn+/nwXga5Vn19YWevONWwOkwAx3HSyX OngPEm+0dP7IEi//Etw8A6u8FBWQjq2w+YKTZzh/92n77fE+uzxXU+sDV+MqrJN21K9t T+LK7SnwDyEEls11aovsinDVwF3yGYGjXjz9jU3PEVlHDIRYeuVBzYCCPITmMGaWCMi7 XO8KzO7aY3o0/O2OKDQnajomlafBwenYbCQsb3qRMIf3mfjbXA+NpBQZJfCnurhD+P/8 3cz7xyXPGT7hkFaBmkRRFbkPTgsOwgso39ZJ6owWOciOAC0P6ABybzmCDpoJ7ks2E5pd W2Vw== 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:mime-version:references:in-reply-to:message-id :date:to:from:delivered-to; bh=EOZlUCFAnWpm4Oyeu7C3dcFGJlQJBXJCqJUg81DHRdw=; b=hZzRl8TGUtHzITGbYhTJwxO4zJ1Ya35OH5PoVPErEEyRwDUXVHxBr8cWrRR3RRjrTn sasUGJwEuKHo60gtyRFVa31pH5l1obTFStp9hcyUiSLgqJm7Xs8hMBE8BWdt7JYEAUS0 w99lOYHmpCOjTAgVQefguTOt3+0aG3ZXOAqPUhYwgSR+nk6rs3fYJRF2nIozA6IBZBTt BI4rXMlRxt1v1cFPPgk1o9F8EDC9cKKuqM8sXrhF9W+YNP/tFoNs+bXLtBwcagOdeYZZ BhmFhVYhtxioPbnTclkFEPyAW+lEa2+BD175HCe+I6FQbj6ug7i1zxTNHyZZfeDHNzWY Kt4g== ARC-Authentication-Results: i=1; mx.google.com; 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 hr12-20020a1709073f8c00b00770872942d8si11409766ejc.958.2022.10.18.09.54.11; Tue, 18 Oct 2022 09:54:12 -0700 (PDT) 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; 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 4F70368BD47; Tue, 18 Oct 2022 19:54:07 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail0.khirnov.net (red.khirnov.net [176.97.15.12]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 563BA68BBFE for ; Tue, 18 Oct 2022 19:54:00 +0300 (EEST) Received: from localhost (localhost [IPv6:::1]) by mail0.khirnov.net (Postfix) with ESMTP id A02BB2404F8 for ; Tue, 18 Oct 2022 18:53:59 +0200 (CEST) Received: from mail0.khirnov.net ([IPv6:::1]) by localhost (mail0.khirnov.net [IPv6:::1]) (amavisd-new, port 10024) with ESMTP id uEE_BBzck4Lm for ; Tue, 18 Oct 2022 18:53:58 +0200 (CEST) Received: from libav.khirnov.net (libav.khirnov.net [IPv6:2a00:c500:561:201::7]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "libav.khirnov.net", Issuer "smtp.khirnov.net SMTP CA" (verified OK)) by mail0.khirnov.net (Postfix) with ESMTPS id CB67D2404F5 for ; Tue, 18 Oct 2022 18:53:58 +0200 (CEST) Received: from libav.khirnov.net (libav.khirnov.net [IPv6:::1]) by libav.khirnov.net (Postfix) with ESMTP id C44523A13E9 for ; Tue, 18 Oct 2022 18:53:58 +0200 (CEST) From: Anton Khirnov To: ffmpeg-devel@ffmpeg.org Date: Tue, 18 Oct 2022 18:53:07 +0200 Message-Id: <20221018165307.28242-4-anton@khirnov.net> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20221018165307.28242-1-anton@khirnov.net> References: <20221018165307.28242-1-anton@khirnov.net> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 4/4] fftools/ffmpeg: set thread names 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: 1nlAcCTWXSFg --- fftools/ffmpeg_demux.c | 9 +++++++++ fftools/ffmpeg_mux.c | 9 +++++++++ 2 files changed, 18 insertions(+) diff --git a/fftools/ffmpeg_demux.c b/fftools/ffmpeg_demux.c index 6e89f5999a..487053c592 100644 --- a/fftools/ffmpeg_demux.c +++ b/fftools/ffmpeg_demux.c @@ -177,6 +177,13 @@ static void ts_fixup(InputFile *ifile, AVPacket *pkt, int *repeat_pict) *repeat_pict = av_stream_get_parser(ist->st)->repeat_pict; } +static void thread_set_name(InputFile *f) +{ + char name[16]; + snprintf(name, sizeof(name), "dmx%d:%s", f->index, f->ctx->iformat->name); + ff_thread_setname(name); +} + static void *input_thread(void *arg) { InputFile *f = arg; @@ -190,6 +197,8 @@ static void *input_thread(void *arg) goto finish; } + thread_set_name(f); + while (1) { DemuxMsg msg = { NULL }; diff --git a/fftools/ffmpeg_mux.c b/fftools/ffmpeg_mux.c index 2b70143978..778626e20f 100644 --- a/fftools/ffmpeg_mux.c +++ b/fftools/ffmpeg_mux.c @@ -184,6 +184,13 @@ static int sync_queue_process(Muxer *mux, OutputStream *ost, AVPacket *pkt) return 0; } +static void thread_set_name(OutputFile *of) +{ + char name[16]; + snprintf(name, sizeof(name), "mux%d:%s", of->index, of->format->name); + ff_thread_setname(name); +} + static void *muxer_thread(void *arg) { Muxer *mux = arg; @@ -197,6 +204,8 @@ static void *muxer_thread(void *arg) goto finish; } + thread_set_name(of); + while (1) { OutputStream *ost; int stream_idx;