From patchwork Thu Nov 30 11:55:03 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Rostislav Pehlivanov X-Patchwork-Id: 6472 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.2.161.94 with SMTP id m30csp533134jah; Thu, 30 Nov 2017 04:02:02 -0800 (PST) X-Google-Smtp-Source: AGs4zMYWuN5xEXOReCuV4ahi+gPR5NJomG8qFxIYRSOxcI1mNUypqFcC6KAq2xXnphBwUDIf59Lh X-Received: by 10.223.150.175 with SMTP id u44mr1734038wrb.115.1512043322506; Thu, 30 Nov 2017 04:02:02 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1512043322; cv=none; d=google.com; s=arc-20160816; b=Q+IDlaMGBzKui9Q/hBQC6O07McJ2/HUqSI+Hu/Zi0XSZQbN5IxXia91Ryqdeu4Ds9E GSYLPcSyhHrESZgW4pnTdR0SqQX/ybFJFpy1YCW2Ef6t565fq21l0ZsaUzZOfC/LBKU6 prn4W4/7UUSCDopoNcFmVsStg3nmaWXYnKkxqywlEQAREOax7Ugk91SjgeY5gVmTcI83 ddYuPLknFp2cNur5lPiufGv6GG4VD92R/gWuoG+bKEjpDlk8EemGvcTC+zSRRSRgDdeL Szrgjg9cpVvSUyFOnuPUd7dBTrmPFSwBvHEB9YiqiSH6M5t/WRcVLRYvH61UvzC9tfx5 EvCA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:reply-to:list-subscribe:list-help:list-post :list-archive:list-unsubscribe:list-id:precedence:subject:to :message-id:date:from:references:in-reply-to:mime-version :dkim-signature:delivered-to:arc-authentication-results; bh=2NHVJdF2rx8PHl0agIovKtAcjDbK47JP+xPAUuMIfmI=; b=ilRrHU/17GGo6Kle4pXAk38LQh7snlGH251z322w6GWunWmnEVchTQ/T5VlWJIN6JX TUP/O/N+T1UaZmSeLy7J6/FjDcg82pZNNGCOwMJ6ZPkANcVtGZRmf9NlhVsoi8NC/c3q 9PEW51YKzHUTE+SdhKD/7+EKf3i2ORAEBWELsdXOKfac6xY/qDDCD56d7XK/aVr6teBy PVLmGWr9ONFSe0IwsqsxkoawoeDDFQilzLahzzZ/ZjJ9Ibna950UVNyQPqKPFjD/sptA NeysP0i21hfyBeXvHAGf3F1zNnS7YLVF39G67Z77aoTA0xZFpw7B5QuhgmHjVAwmVEtG txpw== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=gyHyn1RQ; 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 j60si3160403wrj.132.2017.11.30.04.01.39; Thu, 30 Nov 2017 04:02:02 -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=gyHyn1RQ; 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 3E8E568A3BD; Thu, 30 Nov 2017 14:01:35 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-qt0-f194.google.com (mail-qt0-f194.google.com [209.85.216.194]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id AF0A468A38D for ; Thu, 30 Nov 2017 14:01:28 +0200 (EET) Received: by mail-qt0-f194.google.com with SMTP id d4so8371709qtj.5 for ; Thu, 30 Nov 2017 04:01:32 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=mime-version:in-reply-to:references:from:date:message-id:subject:to; bh=Z73mK7Xxtr10zSaNcTti/Mut4GzoMeNRjKJ2RLeba/M=; b=gyHyn1RQaEwZh3gvSdqvuqxdvIe5JCHNwrzlQea8ZhdFFXQ/40TYWSW9M6Aw80ZmjM Md0u8Bf8pZp8NQ8Gz6fIobFA+yMAFunofLZPkJzZFApBIRavmMxMKdugESW2dxB1iGYv 2Zpw5xsQ9Bz2AVC1Mc0t33yHPGLh4IBGAd2tA0no3J7Vd5pNBUy3mlkwjdX0PTB8K5GT G48ooWozvtYEXnDmOeNdg1MmKeuPlFYE2ezTi4L7AXAUcZLlC3YgsXbh5jauLWAwD2oQ WAkuuPs3bwwHxkrQSLmGWI1hbBDCUnlVd60gyFP0ts97tx3oIJb/IUDY2FEauIq7fg6M 8IIg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:in-reply-to:references:from:date :message-id:subject:to; bh=Z73mK7Xxtr10zSaNcTti/Mut4GzoMeNRjKJ2RLeba/M=; b=k6yv2mBgeo0c91j6XotWufKldZ/ydmXo4fdKnzLWKwEUKUSfQ3gBMkI8Fr6totxYoY dPYb1xDRDCf16uOhGfge1WnoVAixeBFHIt3lejpyzbrsIYc62BLSWpE2f/1BOQqQdbSb 0gCzwgjbMS8VwS4hYGB4uxST8iDeiNaYqyvgFWmktMAHY+1yh8fm/9fC04OT04UziWSx HJQ1fimm1IRr9dHaEtMqCDsl48zUlHUhDZgO0Tlrh5FzwqlRD/weRN3MLAu5JwbkCSFE jp6ypQRPqVz+sAp2YEoNB04VR1qTBdPnmsFENr5zPoMdkZHxBzxtOKM0UuOv4DjhCUVL 7YxQ== X-Gm-Message-State: AKGB3mJh8ESC3K2EfKFANOL+QA4NMR+yfJwsrg6wI77IdcXRGXNle0OK u3ipnj1uZLyt+6c9VxAJL3qpuxFSAlwIUSgCiqOXew== X-Received: by 10.200.46.55 with SMTP id r52mr3056657qta.304.1512042904507; Thu, 30 Nov 2017 03:55:04 -0800 (PST) MIME-Version: 1.0 Received: by 10.140.28.117 with HTTP; Thu, 30 Nov 2017 03:55:03 -0800 (PST) In-Reply-To: <20171128012619.GV4636@nb4> References: <20171127043021.20321-1-atomnuker@gmail.com> <20171128012619.GV4636@nb4> From: Rostislav Pehlivanov Date: Thu, 30 Nov 2017 11:55:03 +0000 Message-ID: To: FFmpeg development discussions and patches X-Content-Filtered-By: Mailman/MimeDel 2.1.20 Subject: Re: [FFmpeg-devel] [PATCH 1/4] lavc/parser: use C11 atomics 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" On 28 November 2017 at 01:26, Michael Niedermayer wrote: > On Mon, Nov 27, 2017 at 04:30:18AM +0000, Rostislav Pehlivanov wrote: > > Signed-off-by: Rostislav Pehlivanov > > --- > > libavcodec/parser.c | 14 ++++++++------ > > 1 file changed, 8 insertions(+), 6 deletions(-) > > > > diff --git a/libavcodec/parser.c b/libavcodec/parser.c > > index 670680ea7c..baf1de4d88 100644 > > --- a/libavcodec/parser.c > > +++ b/libavcodec/parser.c > > @@ -23,30 +23,32 @@ > > #include > > #include > > #include > > +#include > > > > #include "libavutil/avassert.h" > > -#include "libavutil/atomic.h" > > #include "libavutil/internal.h" > > #include "libavutil/mem.h" > > > > #include "internal.h" > > #include "parser.h" > > > > -static AVCodecParser *av_first_parser = NULL; > > +static _Atomic(AVCodecParser *)av_first_parser = NULL; > > This doesnt build here > > libavcodec/parser.c:35:8: warning: return type defaults to ‘int’ [enabled > by default] > static _Atomic(AVCodecParser *)av_first_parser = NULL; > ^ > libavcodec/parser.c: In function ‘_Atomic’: > libavcodec/parser.c:35:32: error: expected declaration specifiers before > ‘av_first_parser’ > static _Atomic(AVCodecParser *)av_first_parser = NULL; > ^ > libavcodec/parser.c:38:1: error: expected ‘=’, ‘,’, ‘;’, ‘asm’ or > ‘__attribute__’ before ‘{’ token > { > ^ > libavcodec/parser.c:46:1: error: expected ‘=’, ‘,’, ‘;’, ‘asm’ or > ‘__attribute__’ before ‘{’ token > { > ^ > libavcodec/parser.c:55:1: error: expected ‘=’, ‘,’, ‘;’, ‘asm’ or ‘__a > > > [...] > -- > Michael GnuPG fingerprint: 9FF2128B147EF6730BADF133611EC787040B0FAB > > Observe your enemies, for they first find out your faults. -- Antisthenes > > _______________________________________________ > ffmpeg-devel mailing list > ffmpeg-devel@ffmpeg.org > http://ffmpeg.org/mailman/listinfo/ffmpeg-devel > > Does the attached patch work? From b9ed59e9aff4a0fcc40f444f307c87acad55e139 Mon Sep 17 00:00:00 2001 From: Rostislav Pehlivanov Date: Mon, 27 Nov 2017 01:56:41 +0000 Subject: [PATCH v2 1/2] lavc/parser: use C11 atomics Signed-off-by: Rostislav Pehlivanov --- libavcodec/parser.c | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/libavcodec/parser.c b/libavcodec/parser.c index 670680ea7c..d6df62bf70 100644 --- a/libavcodec/parser.c +++ b/libavcodec/parser.c @@ -23,30 +23,32 @@ #include #include #include +#include #include "libavutil/avassert.h" -#include "libavutil/atomic.h" #include "libavutil/internal.h" #include "libavutil/mem.h" #include "internal.h" #include "parser.h" -static AVCodecParser *av_first_parser = NULL; +static _Atomic(AVCodecParser *) av_first_parser = NULL; AVCodecParser *av_parser_next(const AVCodecParser *p) { if (p) return p->next; else - return av_first_parser; + return atomic_load(&av_first_parser); } void av_register_codec_parser(AVCodecParser *parser) { + AVCodecParser *old_parser; do { - parser->next = av_first_parser; - } while (parser->next != avpriv_atomic_ptr_cas((void * volatile *)&av_first_parser, parser->next, parser)); + parser->next = old_parser = atomic_load(&av_first_parser); + atomic_compare_exchange_strong(&av_first_parser, &old_parser, parser); + } while (parser->next != old_parser); } AVCodecParserContext *av_parser_init(int codec_id) @@ -58,7 +60,7 @@ AVCodecParserContext *av_parser_init(int codec_id) if (codec_id == AV_CODEC_ID_NONE) return NULL; - for (parser = av_first_parser; parser; parser = parser->next) { + for (parser = atomic_load(&av_first_parser); parser; parser = parser->next) { if (parser->codec_ids[0] == codec_id || parser->codec_ids[1] == codec_id || parser->codec_ids[2] == codec_id || -- 2.15.1.424.g9478a66081