From patchwork Mon Nov 21 15:18:57 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Niedermayer X-Patchwork-Id: 1513 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.103.90.1 with SMTP id o1csp1654620vsb; Mon, 21 Nov 2016 07:19:19 -0800 (PST) X-Received: by 10.194.94.39 with SMTP id cz7mr9807195wjb.204.1479741559512; Mon, 21 Nov 2016 07:19:19 -0800 (PST) Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id e8si20718961wjh.217.2016.11.21.07.19.19; Mon, 21 Nov 2016 07:19:19 -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; 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 Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 358E0689B91; Mon, 21 Nov 2016 17:19:05 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from vie01a-dmta-pe04-2.mx.upcmail.net (vie01a-dmta-pe04-2.mx.upcmail.net [62.179.121.164]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id BD22068994F for ; Mon, 21 Nov 2016 17:18:58 +0200 (EET) Received: from [172.31.216.43] (helo=vie01a-pemc-psmtp-pe01) by vie01a-dmta-pe04.mx.upcmail.net with esmtp (Exim 4.87) (envelope-from ) id 1c8qN3-0007ra-BG for ffmpeg-devel@ffmpeg.org; Mon, 21 Nov 2016 16:19:01 +0100 Received: from localhost ([213.47.41.20]) by vie01a-pemc-psmtp-pe01 with SMTP @ mailcloud.upcmail.net id AfK01u00W0S5wYM01fK1C5; Mon, 21 Nov 2016 16:19:01 +0100 X-SourceIP: 213.47.41.20 From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Mon, 21 Nov 2016 16:18:57 +0100 Message-Id: <20161121151858.703-2-michael@niedermayer.cc> X-Mailer: git-send-email 2.10.2 In-Reply-To: <20161121151858.703-1-michael@niedermayer.cc> References: <20161121151858.703-1-michael@niedermayer.cc> Subject: [FFmpeg-devel] [PATCH 2/3] avutil/atomic: Add avpriv_atomic_int64_cas() 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: Michael Niedermayer --- libavutil/atomic.c | 20 ++++++++++++++++++++ libavutil/atomic.h | 10 ++++++++++ libavutil/atomic_gcc.h | 12 ++++++++++++ 3 files changed, 42 insertions(+) diff --git a/libavutil/atomic.c b/libavutil/atomic.c index 64cff25..27561ad 100644 --- a/libavutil/atomic.c +++ b/libavutil/atomic.c @@ -70,6 +70,17 @@ void *avpriv_atomic_ptr_cas(void * volatile *ptr, void *oldval, void *newval) return ret; } +int64_t avpriv_atomic_int64_cas(int64_t volatile *ptr, int64_t oldval, int64_t newval) +{ + int64_t ret; + pthread_mutex_lock(&atomic_lock); + ret = *ptr; + if (ret == oldval) + *ptr = newval; + pthread_mutex_unlock(&atomic_lock); + return ret; +} + #elif !HAVE_THREADS int avpriv_atomic_int_get(volatile int *ptr) @@ -97,6 +108,15 @@ void *avpriv_atomic_ptr_cas(void * volatile *ptr, void *oldval, void *newval) return *ptr; } +int64_t avpriv_atomic_int64_cas(int64_t volatile *ptr, int64_t oldval, int64_t newval) +{ + if (*ptr == oldval) { + *ptr = newval; + return oldval; + } + return *ptr; +} + #else /* HAVE_THREADS */ /* This should never trigger, unless a new threading implementation diff --git a/libavutil/atomic.h b/libavutil/atomic.h index 15906d2..cabc4f0 100644 --- a/libavutil/atomic.h +++ b/libavutil/atomic.h @@ -74,6 +74,16 @@ int avpriv_atomic_int_add_and_fetch(volatile int *ptr, int inc); */ void *avpriv_atomic_ptr_cas(void * volatile *ptr, void *oldval, void *newval); +/** + * Atomic int64_t compare and swap. + * + * @param ptr pointer to the int64_t to operate on + * @param oldval do the swap if the current value of *ptr equals to oldval + * @param newval value to replace *ptr with + * @return the value of *ptr before comparison + */ +int64_t avpriv_atomic_int64_cas(int64_t volatile *ptr, int64_t oldval, int64_t newval); + #endif /* HAVE_ATOMICS_NATIVE */ #endif /* AVUTIL_ATOMIC_H */ diff --git a/libavutil/atomic_gcc.h b/libavutil/atomic_gcc.h index 5f9fc49..c7e0dba 100644 --- a/libavutil/atomic_gcc.h +++ b/libavutil/atomic_gcc.h @@ -75,4 +75,16 @@ static inline void *atomic_ptr_cas_gcc(void * volatile *ptr, #endif } +#define avpriv_atomic_int64_cas atomic_int64_cas_gcc +static inline int64_t atomic_int64_cas_gcc(int64_t volatile *ptr, + int64_t oldval, int64_t newval) +{ +#if HAVE_SYNC_VAL_COMPARE_AND_SWAP + return __sync_val_compare_and_swap(ptr, oldval, newval); +#else + __atomic_compare_exchange_n(ptr, &oldval, newval, 0, __ATOMIC_SEQ_CST, __ATOMIC_SEQ_CST); + return oldval; +#endif +} + #endif /* AVUTIL_ATOMIC_GCC_H */