From patchwork Fri Jan 5 01:40:44 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 7130 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.2.78.2 with SMTP id r2csp180924jaa; Thu, 4 Jan 2018 17:41:07 -0800 (PST) X-Google-Smtp-Source: ACJfBotrb3SlhTslAOAE3ZTpJQhxfi32BcTEzcthwiP0WMly5imy6mjia7hDh8jknK6c00MZd5VL X-Received: by 10.28.128.83 with SMTP id b80mr1098235wmd.41.1515116467749; Thu, 04 Jan 2018 17:41:07 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1515116467; cv=none; d=google.com; s=arc-20160816; b=O8usMV1aQ0m4JNu4xXDm5htZBFvXPtSD8WsoSxmRw1NZjD6g5t5w7tJTLoOCsG3Ahp vaUmpWnaaglVrotM7a36P6LJSvjDXb+9VVRhwEcm9+6YENMN1Q2VitQFvYdFot2PaCAN HIwuucKg94/Vy/ci+rP83nCFTKNhRyk9mZaWMEH3heRKBsn6/bLymg4jhKZloSCJvMyQ odRutZ0oy0e+vhBPhivGlPWrX8nJnu97Wv5sNbWHIGv24y4FfDnI7IycDjxAkg9GBqRo uSq10AXqC6mnvtmVR/QnPehBsKutKS0cYM0qC5ZvUU6F2ICINchsUYQRv7cyREtu7oPY 97CA== 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=QnWUJLfhkuDo8PHkixIAHgXBpo1WHjZfdeGhWLqM3Yc=; b=OlVARsbNr4N2grmLQRAudUmZv5QAAtQF4eo3Hg7ICNiJ+rUznuo0VZpIIlY7cMRu/l 9ZTlVyLwCBmvH/m1VQ5rdsDuv6fcJb+DVhwAmZxd4rrGKuY0NFonH3YN4o3SCwSEl99T PNN9kxRUgEe+sZq2cSd26umGlbh4/HHEC7oFU2ReSfRL2ThlVZ/EjgB7AAbH5FMrgi05 UVdUK0yVmPPt/qbwRfrDpUhjpxbyP/zuzrE0Uuf7CVvDckMGM3fdc3yfMslXRLU4uf1p PZcyLIj/J3vfdtFZY/yOR7fXQO1YVUCYhiXIonDAfwkRARvq/MVTOM+Pq43EfBPdMEIL HodQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=Gtt43W1o; 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 e124si3038316wma.119.2018.01.04.17.41.06; Thu, 04 Jan 2018 17:41:07 -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=Gtt43W1o; 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 66B8368971E; Fri, 5 Jan 2018 03:40:48 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-qt0-f195.google.com (mail-qt0-f195.google.com [209.85.216.195]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 203636882FD for ; Fri, 5 Jan 2018 03:40:41 +0200 (EET) Received: by mail-qt0-f195.google.com with SMTP id k19so4159903qtj.6 for ; Thu, 04 Jan 2018 17:40:58 -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=kIvwyHCmZhXSq9lonekiJceJc13TSsrMTNaCwONrkys=; b=Gtt43W1oCceogsEkHEY8pD68l8Stf3VGjpMXBueiwQT3nWPga7zddfNfiNmE1dOYk4 BqDFb7bpxtpx3PgtmSTD5Fdd1a7m8SgKDaTs4M18TxEKYEWzG8fePrSjimddZ+HTFjcQ AWtXsiTdTGgvpa/F30k3GxIOCjU3xRvvKlRBTuerW3Du51+cq+LlB9OJZjfQ3/lI1Y4Y 4FozwjJlEA2Cmn23VFhf8ByJ708dGt5R7qzhzsZkAttoCaiNRtCixLsgoGZXIS9Ni5Jl GqxiRw1cfZroOYM5czmNOVMPeHww8oQJz7dB8gQIKYXGl1i2oTyIZqAyQsnyPxJB5pBn FyXQ== 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=kIvwyHCmZhXSq9lonekiJceJc13TSsrMTNaCwONrkys=; b=CiAgApY1OMxkCkcuL9uBWngWew7Ph+IiHpODCLqfHwgmhpi8euz5/RX/P9lAFst1xA GO0CEEW9dpI/Wa3gzDKAs2gisqGF6huCNB9WTQk/pJzeF9ys+yE1J9XxgtidSQGKh/QF /oqvVSxuhbCjzaY7szLT/hQi4wpj/h+u14j8CGreOpMSXarUnnr82gQAYPIcypOXI/ee HL/OIkMn0zW5JiYGlLyccG9iRL7CfqsLiCkMLG2s2VaIYhKoVR5iT45iMgmnBGVHYziT YZFxJxAWb1yxS4a8nY+xj6Zhl4amubb4Iu8KS4TPUczcXw2Rj0vdrLAKAMuKr05KMfM8 gE3A== X-Gm-Message-State: AKwxytevjiG8ZbnPw3zt+IMS08CB1ZMzd5Bnst5uFLX2097M7MSWoKM5 o/dA/I/ak9eK70qFOIbUA3kjXg== X-Received: by 10.200.34.19 with SMTP id o19mr2250268qto.52.1515116456852; Thu, 04 Jan 2018 17:40:56 -0800 (PST) Received: from localhost.localdomain ([181.229.225.176]) by smtp.gmail.com with ESMTPSA id g8sm2786661qth.68.2018.01.04.17.40.55 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 04 Jan 2018 17:40:56 -0800 (PST) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Thu, 4 Jan 2018 22:40:44 -0300 Message-Id: <20180105014044.2132-1-jamrial@gmail.com> X-Mailer: git-send-email 2.15.0 In-Reply-To: <20180104181904.5816-1-jamrial@gmail.com> References: <20180104181904.5816-1-jamrial@gmail.com> Subject: [FFmpeg-devel] [PATCH 1/3 v2] avcodec/util: use a mutex instead of atomics in avcodec_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 --- libavcodec/utils.c | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/libavcodec/utils.c b/libavcodec/utils.c index dfbfe98d63..4d736d2e7d 100644 --- a/libavcodec/utils.c +++ b/libavcodec/utils.c @@ -26,7 +26,6 @@ */ #include "config.h" -#include "libavutil/atomic.h" #include "libavutil/attributes.h" #include "libavutil/avassert.h" #include "libavutil/avstring.h" @@ -127,17 +126,24 @@ int av_codec_is_decoder(const AVCodec *codec) return codec && (codec->decode || codec->receive_frame); } +static AVMutex codec_register_mutex = AV_MUTEX_INITIALIZER; + av_cold void avcodec_register(AVCodec *codec) { AVCodec **p; avcodec_init(); + + ff_mutex_lock(&codec_register_mutex); p = last_avcodec; - codec->next = NULL; - while(*p || avpriv_atomic_ptr_cas((void * volatile *)p, NULL, codec)) + while (*p) p = &(*p)->next; + *p = codec; + codec->next = NULL; last_avcodec = &codec->next; + ff_mutex_unlock(&codec_register_mutex); + if (codec->init_static_data) codec->init_static_data(codec); }