From patchwork Thu Jan 4 04:14:08 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 7115 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.2.79.195 with SMTP id r64csp16696623jad; Wed, 3 Jan 2018 20:14:40 -0800 (PST) X-Google-Smtp-Source: ACJfBosZa6/YR6fXuFo+2jtQzGPHlM2beWII77kE/moqg8WbdArYWVo1RMfPKi4xzaN515sta+zt X-Received: by 10.223.164.94 with SMTP id e30mr3338995wra.52.1515039280563; Wed, 03 Jan 2018 20:14:40 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1515039280; cv=none; d=google.com; s=arc-20160816; b=QGnRi26kyw0GjDQ4UtaKU0AS3oFpn8LTjYrWCwIYWIDYwsjfcMa+EeRD3JNrq0loTE W7Zmoax5l1zCNFprDaKnYFkaafDXU+KJzJYuttF0PXdiYljadmAqKnni3ew5nA6eWTnG 5YJm7wFGagxWZSbKrDtZGc1ErOuCI9aWGG3X40rx17PEsvaRFyc+D+d4HbpjPg+DOMZR mRnwQN6++E3DFecNG3aqKxu9lEYc3cFfMPJ8c439PBNkA6DzExrGz29R2UMo4ngz19tN pfSeDo1oRnDHSXE0HDg1WWnon80lnppQ0BTm/tRLs8m3v/NDe8ncl3lfElyO409gbJoz hQVQ== 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=fP3cFZQKNychC+sqR2VSv6tLQzwjJsYCW0hxOLYUXOo=; b=jHPKl8scjl/tP1IIeX/FPNXZEEfSsJqQhe6aY7PEMllgdHrMmyA23dbVDsVLKecZ8/ m2UGwkCua+cptepjiuFShhZZAb184U7eezeUSg1nFI3IfW0a6Af7WSvMwu3Uqdvrzgv0 dCM/wAqAplPuemBm2q6Ru74/pugEoNQyJZx9tyf/UhSD8eqFCXDjwbUEetVixiTplNUU YDgRtSGVfLXJqF8w5tAfIVdWCAemydutmqiql0PsKkpYWJ+wd93kA3+rmUIWsA3Madi9 XGqty2i0t+gyij4H9Z4DL9vkL7cNX7dA7qpdmUFSxZNQniKdOcY7wSIPpOpSnF2nn8r+ uxig== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=UdpWbgy2; 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 x193si1674083wmf.44.2018.01.03.20.14.40; Wed, 03 Jan 2018 20:14:40 -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=UdpWbgy2; 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 99EF5689811; Thu, 4 Jan 2018 06:14:14 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-qk0-f193.google.com (mail-qk0-f193.google.com [209.85.220.193]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 36647689887 for ; Thu, 4 Jan 2018 06:14:08 +0200 (EET) Received: by mail-qk0-f193.google.com with SMTP id j137so546042qke.10 for ; Wed, 03 Jan 2018 20:14:24 -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=a4sCyEFAGa39W2LS1gLVPI1uYtupqv2ZSDmep0XqYvE=; b=UdpWbgy2DHYUYYQODPqzm5IKkNCKktJqeXkzsueVC4XJsRhndJ7q3C83Ksep8DOobl qZ9pz/LIuiu3Q9mGT51Y3Iqv1BbDKm9Hp+JjliVJZXRT1O5AEaU2MgFLZjAWFX94J1UJ 7UxiWacX4B7PtttB2/OgMlpwp5eZFJIUTHVr1k5ji6LGOKxn8TZ7WzAwIzJv+bUyNa2x K0t8G8/L65bucqJjziWCh+8RwcYggMTXWZgYIQWMX42LbAUsisp4IrGAsbHNT3jp8M/j 9TELts2IiyILJeaC/GHTTyoqn/UitiqniDPPLDN7cpASy6XifvJnFtj9zuFqxzAqB5Jx tPSg== 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=a4sCyEFAGa39W2LS1gLVPI1uYtupqv2ZSDmep0XqYvE=; b=KsDo7fh2p2ZOhvd35mMzQl6txhvCDU4wvcpXvmYEyBjXxjqk+2/Sjd7p2EMWh61TKH aunbn+C2AoWRr/884i/Qn3CYAs6b21fH0r5kgDJhTlzu4/sb8dpTcbJea7S99Q4y6eu0 9iW7411TcB6vmcdPm+vbCA08EcOfl2njUeU/HW1zaR0yimXB/XbPCVEWlYys4H48I3Mo CUngjZQWFJb4n/fKfsenbgk6CJ6PrI4k/exG5YynERYI9ucFflIqzkRIb9FbedO+BHBz U5jwo18sC0hkcsE3QwBrq+I/Oj3zH4bIRimVDJ6Rpby2C0BAtf/kqR1+q/DPrXtrfw+q gg7w== X-Gm-Message-State: AKGB3mL9P94arife3C5BYaDZ/ygiw8XJvJI+PVb8HBOq3KQdc9NuaH6H 0GS5dU/blYxxpsgMzKPHK+J/jg== X-Received: by 10.55.167.73 with SMTP id q70mr4674517qke.47.1515039263787; Wed, 03 Jan 2018 20:14:23 -0800 (PST) Received: from localhost.localdomain ([181.229.225.176]) by smtp.gmail.com with ESMTPSA id q73sm166245qke.41.2018.01.03.20.14.22 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 03 Jan 2018 20:14:23 -0800 (PST) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Thu, 4 Jan 2018 01:14:08 -0300 Message-Id: <20180104041408.6268-2-jamrial@gmail.com> X-Mailer: git-send-email 2.15.0 In-Reply-To: <20180104041408.6268-1-jamrial@gmail.com> References: <20180104041408.6268-1-jamrial@gmail.com> Subject: [FFmpeg-devel] [PATCH 2/2] avutil/log: use thread wrappers for the locking functionality 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" w32threads and os2threads both support static mutex initialization now, so don't limit it to pthreads only. Signed-off-by: James Almer --- libavutil/log.c | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) diff --git a/libavutil/log.c b/libavutil/log.c index 7a6dd936e5..bd47f2a25f 100644 --- a/libavutil/log.c +++ b/libavutil/log.c @@ -39,11 +39,9 @@ #include "common.h" #include "internal.h" #include "log.h" +#include "thread.h" -#if HAVE_PTHREADS -#include -static pthread_mutex_t mutex = PTHREAD_MUTEX_INITIALIZER; -#endif +static AVMutex mutex = AV_MUTEX_INITIALIZER; #define LINE_SZ 1024 @@ -317,9 +315,7 @@ void av_log_default_callback(void* ptr, int level, const char* fmt, va_list vl) if (level > av_log_level) return; -#if HAVE_PTHREADS - pthread_mutex_lock(&mutex); -#endif + ff_mutex_lock(&mutex); format_line(ptr, level, fmt, vl, part, &print_prefix, type); snprintf(line, sizeof(line), "%s%s%s%s", part[0].str, part[1].str, part[2].str, part[3].str); @@ -356,9 +352,7 @@ void av_log_default_callback(void* ptr, int level, const char* fmt, va_list vl) #endif end: av_bprint_finalize(part+3, NULL); -#if HAVE_PTHREADS - pthread_mutex_unlock(&mutex); -#endif + ff_mutex_unlock(&mutex); } static void (*av_log_callback)(void*, int, const char*, va_list) =