From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from ffbox0-bg.ffmpeg.org (ffbox0-bg.ffmpeg.org [79.124.17.100]) by master.gitmailbox.com (Postfix) with ESMTPS id 4F443461D0 for ; Sat, 13 Dec 2025 15:49:03 +0000 (UTC) Authentication-Results: ffbox; dkim=fail (body hash mismatch (got b'i8l7Xwhu+lX55A33uMPO1V98W+M9542zwbWGGP1uT9o=', expected b'o0lkSJq/RBvVYV3UbZpjudGegVhsvvMatovcqNOuw6w=')) header.d=ffmpeg.org header.i=@ffmpeg.org header.a=rsa-sha256 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ffmpeg.org; i=@ffmpeg.org; q=dns/txt; s=mail; t=1765640921; h=mime-version : to : date : message-id : reply-to : subject : list-id : list-archive : list-archive : list-help : list-owner : list-post : list-subscribe : list-unsubscribe : from : cc : content-type : content-transfer-encoding : from; bh=i8l7Xwhu+lX55A33uMPO1V98W+M9542zwbWGGP1uT9o=; b=YdE65MONE5UPiLuWdH3fX6ZWf7g9ynHx/UBD/jlGGo1QJM3j3C3bK01+1RyEySc+DmMqn PImGY4xD3kSZzqbgBAUb+5WvIv0FvkU34Q+M59ShfwTrkXquK4SqX0orWcxAz8oGZwi2L8l tn7juFsnfcsrwGggs+ZppMNirTGsiYKWWZTOjcUge96K5I6TLCUK+nRLHC4PbDoVM7gpBYS 898o0xCfW7yQBjwv9lhnTb2P8Kwf79LqUMTgC2C0us1WuKbQXcGAY0VEOrYWMTl0dO35vgs NvaItiu+D3t1KxLiwNPwHBFfHE5W0ggr/CHaF3F2hohoTQ+3UO/W5XpF2NWw== Received: from [172.19.0.3] (unknown [172.19.0.3]) by ffbox0-bg.ffmpeg.org (Postfix) with ESMTP id 9B9BD690854; Sat, 13 Dec 2025 17:48:41 +0200 (EET) ARC-Seal: i=1; cv=none; a=rsa-sha256; d=ffmpeg.org; s=arc; t=1765640903; b=H9yxxZiOT6yAczDFVZJIRz+o6t25qto8sphyRSp/n3wJUqfYmjsA51GoXm7MUJxltn5vZ Dgda4wlty6rDwdE2ShjwNiU53LBZbWKrpiSz5qtdUNfQ1rVE4QldXp+p5/8A3Ny7mLncNok U3zZ8Vf3k8ijgKJA5ri8AYZi9PHm/4wB4V6QKI/ei2uBeD+DDrRlB1fRn7yVJBeAskaYjiw /aLHZK+HQEa8NPWT2tQPkPh6xLCBsaRBOl5zW7RjS4651pmoVogYLfrMT+7KLxVKxiszeyp 9ck0XkXJZKnWHjvTNv8vcAPnSTTHl6T/xS4lRXaHYGa1c7NPN41OZQS+Txig== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=ffmpeg.org; s=arc; t=1765640903; h=from : sender : reply-to : subject : date : message-id : to : cc : mime-version : content-type : content-transfer-encoding : content-id : content-description : resent-date : resent-from : resent-sender : resent-to : resent-cc : resent-message-id : in-reply-to : references : list-id : list-help : list-unsubscribe : list-subscribe : list-post : list-owner : list-archive; bh=kMbvoi4fqJUgKzVaW4IbrTK158waG6oKBKhu4ebHX1Y=; b=iGd/00adnt3/31+e5yyuz4nAn6ULHsfsIGgBKJ5UBe8JRM2/5qmc2ebVqquTEcqOvo2iH ukrLFpbk9Hk26x0D8980MeCVnyZut5l35B/ukh+S/xF6cAO/XSXsnIyV8cJ6ld2qI4b77Uu TU9QufdunixWVhQDjDjJv7QzJIo05ir7UP0dYU+OrNlOrEdlitYFFKTPReSlz15MuUNxuVU Ak5BeP6Wx8dDPGp0cbDdUBpMSKK2ikPSQcBJEgoj0iulVEo5mJFrUpl1Xkpq9jLd139z54s dc526OOtgN0amuUM0G9W6M194Dw3RA7OLykaRj9pdO/w0Py1+SMyX5zMgpWA== ARC-Authentication-Results: i=1; ffmpeg.org; dkim=pass header.d=ffmpeg.org header.i=@ffmpeg.org; arc=none; dmarc=pass header.from=ffmpeg.org policy.dmarc=quarantine Authentication-Results: ffmpeg.org; dkim=pass header.d=ffmpeg.org header.i=@ffmpeg.org; arc=none (Message is not ARC signed); dmarc=pass (Used From Domain Record) header.from=ffmpeg.org policy.dmarc=quarantine DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ffmpeg.org; i=@ffmpeg.org; q=dns/txt; s=mail; t=1765640894; h=content-type : mime-version : content-transfer-encoding : from : to : reply-to : subject : date : from; bh=o0lkSJq/RBvVYV3UbZpjudGegVhsvvMatovcqNOuw6w=; b=EpXKie4iGAr8hqJtptqNDVlAa1dfWIezwl7juaJcghseK2Lup6POzu9v2nybkxuU9Fofv GUiwtZU5StHk4gsNumLGUOTLHeGoL1uqKcCihmNQjHvOrOzfmMva/RFY45XjvtKUfK/GJaD sOKIzjAuHfyPi+7r7VUhX/SnnaEkN/Q975FHB+mcRnfY4C21Wf2TNAJ6JdteM4qd2l47iQ5 OJ2FIGfW6B/fkVUzqQuiaN417se5aYpuzJN3IZdNatgqYRG8mY6rxnAsnW7mUsDp9N6P+2R 09ZLuLoJYpKljvsragIEcIiv7EWd9zULUQtPx4i6s/s4bekkPSPwjvaYGDPg== Received: from 55ca25703178 (code.ffmpeg.org [188.245.149.3]) by ffbox0-bg.ffmpeg.org (Postfix) with ESMTPS id 3127A6905FC for ; Sat, 13 Dec 2025 17:48:14 +0200 (EET) MIME-Version: 1.0 To: ffmpeg-devel@ffmpeg.org Date: Sat, 13 Dec 2025 15:48:13 -0000 Message-ID: <176564089438.39.17144024787994168078@2cb04c0e5124> Message-ID-Hash: PW3HW7Z6SAMK7NGDY6EGQBWDUGHILH5X X-Message-ID-Hash: PW3HW7Z6SAMK7NGDY6EGQBWDUGHILH5X X-MailFrom: code@ffmpeg.org X-Mailman-Rule-Hits: nonmember-moderation X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; loop; banned-address; header-match-ffmpeg-devel.ffmpeg.org-0; header-match-ffmpeg-devel.ffmpeg.org-1; header-match-ffmpeg-devel.ffmpeg.org-2; header-match-ffmpeg-devel.ffmpeg.org-3; emergency; member-moderation X-Mailman-Version: 3.3.10 Precedence: list Reply-To: FFmpeg development discussions and patches Subject: [FFmpeg-devel] [PATCH] avutil/log: use atomics to load and store logging level, flags and callback pointer (PR #21186) List-Id: FFmpeg development discussions and patches Archived-At: Archived-At: List-Archive: List-Archive: List-Help: List-Owner: List-Post: List-Subscribe: List-Unsubscribe: From: James Almer via ffmpeg-devel Cc: James Almer Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Archived-At: List-Archive: List-Post: PR #21186 opened by James Almer (jamrial) URL: https://code.ffmpeg.org/FFmpeg/FFmpeg/pulls/21186 Patch URL: https://code.ffmpeg.org/FFmpeg/FFmpeg/pulls/21186.patch Based on code setting CPU flags in libavutil/cpu.c >>From 717e0d27f68a38f0d239abe359d687233856de94 Mon Sep 17 00:00:00 2001 From: James Almer Date: Sat, 13 Dec 2025 12:45:10 -0300 Subject: [PATCH] avutil/log: use atomics to load and store logging level, flags and callback pointer Based on code setting cpu flags in libavutil/cpu.c Signed-off-by: James Almer --- libavutil/log.c | 26 ++++++++++++++------------ 1 file changed, 14 insertions(+), 12 deletions(-) diff --git a/libavutil/log.c b/libavutil/log.c index af893dde17..f9d565613a 100644 --- a/libavutil/log.c +++ b/libavutil/log.c @@ -34,6 +34,7 @@ #endif #include #include +#include #include #include #include @@ -55,8 +56,8 @@ static AVMutex mutex = AV_MUTEX_INITIALIZER; #define BACKTRACE_LOGLEVEL AV_LOG_ERROR #endif -static int av_log_level = AV_LOG_INFO; -static int flags; +static atomic_int av_log_level = AV_LOG_INFO; +static atomic_int av_log_flags = 0; #define NB_LEVELS 8 #if defined(_WIN32) && HAVE_SETCONSOLETEXTATTRIBUTE && HAVE_GETSTDHANDLE @@ -326,6 +327,7 @@ static void format_line(void *avcl, int level, const char *fmt, va_list vl, av_bprint_init(part+2, 0, AV_BPRINT_SIZE_AUTOMATIC); av_bprint_init(part+3, 0, 65536); av_bprint_init(part+4, 0, AV_BPRINT_SIZE_AUTOMATIC); + int flags = atomic_load_explicit(&av_log_flags, memory_order_relaxed); if(type) type[0] = type[1] = AV_CLASS_CATEGORY_NA + 16; if (*print_prefix && avc) { @@ -391,7 +393,7 @@ void av_log_default_callback(void* ptr, int level, const char* fmt, va_list vl) level &= 0xff; } - if (level > av_log_level) + if (level > atomic_load_explicit(&av_log_level, memory_order_relaxed)) return; ff_mutex_lock(&mutex); @@ -403,7 +405,7 @@ void av_log_default_callback(void* ptr, int level, const char* fmt, va_list vl) is_atty = isatty(2) ? 1 : -1; #endif - if (print_prefix && (flags & AV_LOG_SKIP_REPEATED) && !strcmp(line, prev) && + if (print_prefix && (atomic_load_explicit(&av_log_flags, memory_order_relaxed) & AV_LOG_SKIP_REPEATED) && !strcmp(line, prev) && *line && line[strlen(line) - 1] != '\r'){ count++; if (is_atty == 1) @@ -436,8 +438,7 @@ end: ff_mutex_unlock(&mutex); } -static void (*av_log_callback)(void*, int, const char*, va_list) = - av_log_default_callback; +static uintptr_t av_log_callback = (uintptr_t)av_log_default_callback; void av_log(void* avcl, int level, const char *fmt, ...) { @@ -459,7 +460,8 @@ void av_log_once(void* avcl, int initial_level, int subsequent_level, int *state void av_vlog(void* avcl, int level, const char *fmt, va_list vl) { AVClass* avc = avcl ? *(AVClass **) avcl : NULL; - void (*log_callback)(void*, int, const char*, va_list) = av_log_callback; + void (*log_callback)(void*, int, const char*, va_list) = + (void *)atomic_load_explicit(&av_log_callback, memory_order_relaxed); if (avc && avc->version >= (50 << 16 | 15 << 8 | 2) && avc->log_level_offset_offset && level >= AV_LOG_FATAL) level += *(int *) (((uint8_t *) avcl) + avc->log_level_offset_offset); @@ -469,27 +471,27 @@ void av_vlog(void* avcl, int level, const char *fmt, va_list vl) int av_log_get_level(void) { - return av_log_level; + return atomic_load_explicit(&av_log_level, memory_order_relaxed); } void av_log_set_level(int level) { - av_log_level = level; + atomic_store_explicit(&av_log_level, level, memory_order_relaxed); } void av_log_set_flags(int arg) { - flags = arg; + atomic_store_explicit(&av_log_flags, arg, memory_order_relaxed); } int av_log_get_flags(void) { - return flags; + return atomic_load_explicit(&av_log_flags, memory_order_relaxed); } void av_log_set_callback(void (*callback)(void*, int, const char*, va_list)) { - av_log_callback = callback; + atomic_store_explicit(&av_log_callback, (uintptr_t)callback, memory_order_relaxed); } static void missing_feature_sample(int sample, void *avc, const char *msg, -- 2.49.1 _______________________________________________ ffmpeg-devel mailing list -- ffmpeg-devel@ffmpeg.org To unsubscribe send an email to ffmpeg-devel-leave@ffmpeg.org