From patchwork Fri Dec 8 05:09:10 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rostislav Pehlivanov X-Patchwork-Id: 6598 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.2.161.94 with SMTP id m30csp111080jah; Thu, 7 Dec 2017 21:15:32 -0800 (PST) X-Google-Smtp-Source: AGs4zMZrDNd7PyHBJseBGMtbnMEC/qQtNBsPJlFyiDsLb3ps4PSdVSAEwNn5m5ZePptj8xw6rTiO X-Received: by 10.28.60.8 with SMTP id j8mr2948239wma.136.1512710132129; Thu, 07 Dec 2017 21:15:32 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1512710132; cv=none; d=google.com; s=arc-20160816; b=k8MvfCyxMOz9JoQIiit8nNkA6FWWwroeS0lQmGU24rXYjYyC1hlvRgJIi9FIlZ8H6w gZ0giPngErn8kpeE5zkrYdc/iHAQ/TdXIwe9CDNJchlPVZ0T1yqDAGrBYUdDzd6ZWhJ3 Ly6/GlaBtTQHtKPln/IIHNOJViwAL0518e8cKspgWfZwCGtvuklRByoDFGZPdI3+sWmB cPQo2FVNsyEagrdKoNWHfvv24PsUyzH+jmlKfr0L71EZwBuJFsRJquWktZbWRyW9jPgV +DEDoqSrufDN2/2av7iotBzoa3KWbUt5mvMxFnCkkKuZsWgiQAEJWjfuXmG7ITSjn8js q99g== 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:cc:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:message-id:date:to:from:dkim-signature :delivered-to:arc-authentication-results; bh=ftBpmcgNjEF3FjtKsuhij5I71JNBwt+eu7/wUcSA/U8=; b=X8mEBMLkasM9/TBwkaBm+lJJClsggegZtGd9MVZoDQsCPdMZj155bUTljG17lMQn99 1DIRpKqH+H8ySsukeJyj9eao7FEuIUn10yH+q09o38QQap41Fa6UCJsVIG7p4aTWc5Ug pReJa1n/5ETPK1TSUv79oAtO5FeRLmW5DBuGMTsf0v2G5660FKD/y1Y5aJIa3oH+Erkz KaXl46xgkHKkYmNbOunEID8FVRBkS4rI+FQ+fefj5X/JEs9On7NK5KFm62vfs5wKTjtt syTmVbJdK4ItCcyS8qT8lQ7eFElGghoeVWDF53YBVCLIIneE694w5s/fMzHR77LQhC7A x/Ow== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=fX37U9A6; 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 d33si542607wma.133.2017.12.07.21.15.31; Thu, 07 Dec 2017 21:15:32 -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=fX37U9A6; 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 96FCD68A327; Fri, 8 Dec 2017 07:15:23 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wm0-f68.google.com (mail-wm0-f68.google.com [74.125.82.68]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id CA94668A12A for ; Fri, 8 Dec 2017 07:15:17 +0200 (EET) Received: by mail-wm0-f68.google.com with SMTP id 9so1414266wme.4 for ; Thu, 07 Dec 2017 21:15:24 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id; bh=ucTFq5Jes6SDYfi46mEZIuW70jlBHhTzJhzn69bvdXQ=; b=fX37U9A6vbUGxEYETp0jZpoMR3PeFyBsYc7GPbn5qCu7rId4igflQNAjdagr4F1qJ0 RIopPxmHfOwwHXaFnp6pc0sYiJg37MlZu0tM5p2Ue2I+XmieOjap0f22GfjQHfTabHjs e67SUVZviiTMTrSWSbLYUbdXcw4rLd4qcDbiL9nKOTGvWuDX+QhBHZCHxrEBq13T1IPX JyvNsYfIk6ZqJktsseeAbD822yxd0mMDqguJ9T0i7qXYh0ckzWVOZWO/wSa8UzPm8vPQ Q/joj+Tvj6BOcBlbvfDRMiUmFCgFTRnETV5b8bgwbVXPUWeUarBTfMGxr0yV31C2GVWz Hl/w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=ucTFq5Jes6SDYfi46mEZIuW70jlBHhTzJhzn69bvdXQ=; b=JO3cokmDOpaEYBWFxKSWt/o3dAD/79uvdkzxsqq5v6MhBBRKzvrBg4fxaoZGB3i5rM UdjDnTFDFbuHx1PFKn8ChbI91e87Ai2QuvWc+TA74h+W/fFAL0XDJRRiE6hemh1/fMbA 84DcfvLG/usADRApShVXsS3T8EWgSrkT83kpUEo2UhtvShOycML1CBeoILBBBppZkPNk o6NEXw4iaVjMSaMaOW7T3Yz8qy5XCfPREWnOpceOIaaXeK7op6rPbKbOUmrY5YHF9TFK p/OPjbnh6Ioq81ucgWmmG+6hYumt1PlbQvc/kQ6F2eCu/ELYNyF6hHiKfIFGPOsJ4sKI tPVw== X-Gm-Message-State: AKGB3mL2OPCRAPBULpZTidLs02UqxhuwbuiFJpzrdB6ATVL6+5UfQ7iz 9DlydX0zwSjBw/UsVApUH6S3TiTF X-Received: by 10.28.7.133 with SMTP id 127mr2737669wmh.31.1512709754166; Thu, 07 Dec 2017 21:09:14 -0800 (PST) Received: from moonbase.pars.ee ([2a00:23c4:7c83:f700:a634:d9ff:fe80:bf0b]) by smtp.gmail.com with ESMTPSA id a74sm9472079wrc.7.2017.12.07.21.09.11 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 07 Dec 2017 21:09:12 -0800 (PST) From: Rostislav Pehlivanov To: ffmpeg-devel@ffmpeg.org Date: Fri, 8 Dec 2017 05:09:10 +0000 Message-Id: <20171208050910.19173-1-atomnuker@gmail.com> X-Mailer: git-send-email 2.15.1.424.g9478a66081 Subject: [FFmpeg-devel] [PATCH] lavc/utils: remove unnecessary locking 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 Cc: Rostislav Pehlivanov MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Its already done by lockmgr. Signed-off-by: Rostislav Pehlivanov --- libavcodec/utils.c | 6 ------ 1 file changed, 6 deletions(-) diff --git a/libavcodec/utils.c b/libavcodec/utils.c index baf09119fe..796d24dcbb 100644 --- a/libavcodec/utils.c +++ b/libavcodec/utils.c @@ -115,7 +115,6 @@ static int (*lockmgr_cb)(void **mutex, enum AVLockOp op) = NULL; #endif -static atomic_bool ff_avcodec_locked; static atomic_int entangled_thread_counter = ATOMIC_VAR_INIT(0); static void *codec_mutex; static void *avformat_mutex; @@ -1943,7 +1942,6 @@ int av_lockmgr_register(int (*cb)(void **mutex, enum AVLockOp op)) int ff_lock_avcodec(AVCodecContext *log_ctx, const AVCodec *codec) { - _Bool exp = 0; if (codec->caps_internal & FF_CODEC_CAP_INIT_THREADSAFE || !codec->init) return 0; @@ -1959,21 +1957,17 @@ int ff_lock_avcodec(AVCodecContext *log_ctx, const AVCodec *codec) atomic_load(&entangled_thread_counter)); if (!lockmgr_cb) av_log(log_ctx, AV_LOG_ERROR, "No lock manager is set, please see av_lockmgr_register()\n"); - atomic_store(&ff_avcodec_locked, 1); ff_unlock_avcodec(codec); return AVERROR(EINVAL); } - av_assert0(atomic_compare_exchange_strong(&ff_avcodec_locked, &exp, 1)); return 0; } int ff_unlock_avcodec(const AVCodec *codec) { - _Bool exp = 1; if (codec->caps_internal & FF_CODEC_CAP_INIT_THREADSAFE || !codec->init) return 0; - av_assert0(atomic_compare_exchange_strong(&ff_avcodec_locked, &exp, 0)); atomic_fetch_add(&entangled_thread_counter, -1); if (lockmgr_cb) { if ((*lockmgr_cb)(&codec_mutex, AV_LOCK_RELEASE))