From patchwork Fri Jan 5 01:42:52 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 7132 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.2.78.2 with SMTP id r2csp182366jaa; Thu, 4 Jan 2018 17:43:13 -0800 (PST) X-Google-Smtp-Source: ACJfBospeRhrv/npp6CNVvMUS2X3N2LtdrhMyOY+rUpkNEw1EigHdHH5uoSWnDg9Zp5RF5oekrl8 X-Received: by 10.223.162.195 with SMTP id t3mr1153255wra.237.1515116593543; Thu, 04 Jan 2018 17:43:13 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1515116593; cv=none; d=google.com; s=arc-20160816; b=esmBji/ipRDCBWhU2T++7P40qy4p55HduCxsWlA6bzIg86Xb6JpJdjuWcVLZBpUoHN /sxdgLxYJG0b4yXr5XqcGrmr54iac2uw5S9L7aRvnXGVTznWdQEcwuBGnpLpgV0Vll2e 5fbQYBGm3Id6kGKG6wR/CoaJxRY4b9OyNU2e0/BDBpc0TVsQD7q5Jm6aOH8aK1nJ125z HteYPxPKYC0e3V30DsqXJlVyJDS8Hbm6L1I8Om0yQXKjSmtY9uJ6UfAal8Wwi8mPryL1 FZn/31SoQyXtpeou/e3RPK+6U2uYt2ntuKsAIBdKvSGtm6GUt5uo2OivjI0A22J7QEUn vONw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:mime-version:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:references:in-reply-to:message-id:date :to:from:dkim-signature:delivered-to:arc-authentication-results; bh=usSa5y0DxILc1YTPSC0sGbJ2czIFyIG8Q4m/msWXqNM=; b=ibUGD/Bb6ecNXWxVuTK+TvZgxvNVdVj7e8xvWvJR5sdtgWSSQgo3HYLaObH3YaIH06 jS02lGVVo/Yw3j2C29WWgv+k2PuMf/LVbTCQcc+FQQjV3u7GGQ7df/fmRBglcpt6ScNs 164VA/5TC/tj9j54zDJlSyzo1HTkrSdLXOg63Lk3cZ6UEkHFEVmE4KOpT9t3iifMEPww nM2wSjyuRc8ei9D6NMAXCUI3uDzobeQUqUE+v7L8EfxO4QiQGS9g31WcFSqLyPGOrbUQ uK7cdjKHH+IpnPL/ULUckSuZKUqujq8J1MA27kDCYY8Lv5X8BQJws3tRcm+Rwe16XxOg 41lQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=nSksZXVq; 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; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=gmail.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id e50si355644wre.331.2018.01.04.17.43.13; Thu, 04 Jan 2018 17:43:13 -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=@gmail.com header.s=20161025 header.b=nSksZXVq; 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; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=gmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id E5D73689909; Fri, 5 Jan 2018 03:42:54 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-qt0-f193.google.com (mail-qt0-f193.google.com [209.85.216.193]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 6079C68971E for ; Fri, 5 Jan 2018 03:42:48 +0200 (EET) Received: by mail-qt0-f193.google.com with SMTP id e2so4164300qti.0 for ; Thu, 04 Jan 2018 17:43:05 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:subject:date:message-id:in-reply-to:references; bh=hVKK2S0Wwh+x78Z9OpdqayW4MI9u+L/IwCSvPzf9drM=; b=nSksZXVqygfFzJLQo/S+YNnzw9WoLbkFOW2CS3/nrbhfVNYKQfJgolqX+lfZ9Op5Q3 xodVAj1oFYG0DK8344e/iDT8jJl47TiX0GhYhMbPg1BjLT1NJBkumRRRSawDAhREMvHL iXGaWTQ6o9qaMJIvRr4SGnoLdqd8dXgvC6Tmu6/n9m0HbiI+qpVxIp3zsqHafWo12Hdb fiYCbGC4aWJZLu7fdMMy15TBBYux2vuWa58ZBTHOnzx4E0cm+eR7gOod5ARdtsjswwYb Nry163KGfDXvFhAmCOwK0CqxtT5gtg+qxknQ5BgwBHLpz4G5ge34Nz6nTierx8dSPu4R Q0lA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references; bh=hVKK2S0Wwh+x78Z9OpdqayW4MI9u+L/IwCSvPzf9drM=; b=fsuGEXzwR5+o/2OkuWUkIk2Pm1DA41TsDcr4sqd5ak6oIw0gZ4LSErYZwg2juM2J+m O6QLvAgkoO0EWZNYeWma5KZ7dJbhKklhFVCBDrNYX6Bs92r19dXtUCbmFHxj6KAKkoeA 1cDLgeIxmdOxEPDgRd360+ktSO2XK/TLeKsSkts7O4wXQ6WcOcHeIBU4fDlzrStct9zM l1WyQ8QWure1HE7swk6XUYbx33dYUyY+NJi086WoYLHk4xoMRXGEquhbzAOzjVkBnU8J fdPbjEYDDJ0QXoHclocm+4Kgsfjpn4dOpyZe41Cx9mgjIVZKBGvkMQ28/Qc/lsLC5Mj+ l1og== X-Gm-Message-State: AKwxytds4SYy5WsuvY69VySmQRbjYAfjaMCovR04pYXF4hUEfDJXm5QE jV9vu0L5ilwGW2fMsHFb8mhiPw== X-Received: by 10.200.25.37 with SMTP id t34mr2146365qtj.147.1515116584422; Thu, 04 Jan 2018 17:43:04 -0800 (PST) Received: from localhost.localdomain ([181.229.225.176]) by smtp.gmail.com with ESMTPSA id w201sm2965519qka.65.2018.01.04.17.43.03 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 04 Jan 2018 17:43:04 -0800 (PST) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Thu, 4 Jan 2018 22:42:52 -0300 Message-Id: <20180105014252.10048-1-jamrial@gmail.com> X-Mailer: git-send-email 2.15.0 In-Reply-To: <20180104181904.5816-4-jamrial@gmail.com> References: <20180104181904.5816-4-jamrial@gmail.com> Subject: [FFmpeg-devel] [PATCH 3/3 v2] avfilter: use a mutex instead of atomics in avfilter_register() X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.20 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 MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Signed-off-by: James Almer --- libavfilter/avfilter.c | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/libavfilter/avfilter.c b/libavfilter/avfilter.c index b98b32bacb..ff7df672fd 100644 --- a/libavfilter/avfilter.c +++ b/libavfilter/avfilter.c @@ -19,7 +19,6 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#include "libavutil/atomic.h" #include "libavutil/avassert.h" #include "libavutil/avstring.h" #include "libavutil/buffer.h" @@ -33,6 +32,7 @@ #include "libavutil/pixdesc.h" #include "libavutil/rational.h" #include "libavutil/samplefmt.h" +#include "libavutil/thread.h" #define FF_INTERNAL_FIELDS 1 #include "framequeue.h" @@ -590,19 +590,26 @@ const AVFilter *avfilter_get_by_name(const char *name) return NULL; } +static AVMutex filter_register_mutex = AV_MUTEX_INITIALIZER; + int avfilter_register(AVFilter *filter) { - AVFilter **f = last_filter; + AVFilter **f; /* the filter must select generic or internal exclusively */ av_assert0((filter->flags & AVFILTER_FLAG_SUPPORT_TIMELINE) != AVFILTER_FLAG_SUPPORT_TIMELINE); - filter->next = NULL; + ff_mutex_lock(&filter_register_mutex); + f = last_filter; - while(*f || avpriv_atomic_ptr_cas((void * volatile *)f, NULL, filter)) + while (*f) f = &(*f)->next; + *f = filter; + filter->next = NULL; last_filter = &filter->next; + ff_mutex_unlock(&filter_register_mutex); + return 0; }