lavu: remove the custom atomic API
It has been replaced by C11 stdatomic.h and is now unused.
This commit is contained in:
Anton Khirnov
parent
59c7022740
commit
5cc0057f49
2
configure
vendored
2
configure
vendored
@ -1651,7 +1651,6 @@ HAVE_LIST="
|
|||||||
$(add_suffix _external $ARCH_EXT_LIST)
|
$(add_suffix _external $ARCH_EXT_LIST)
|
||||||
$(add_suffix _inline $ARCH_EXT_LIST)
|
$(add_suffix _inline $ARCH_EXT_LIST)
|
||||||
$ARCH_FEATURES
|
$ARCH_FEATURES
|
||||||
$ATOMICS_LIST
|
|
||||||
$BUILTIN_LIST
|
$BUILTIN_LIST
|
||||||
$HAVE_LIST_CMDLINE
|
$HAVE_LIST_CMDLINE
|
||||||
$HAVE_LIST_PUB
|
$HAVE_LIST_PUB
|
||||||
@ -1662,7 +1661,6 @@ HAVE_LIST="
|
|||||||
$THREADS_LIST
|
$THREADS_LIST
|
||||||
$TOOLCHAIN_FEATURES
|
$TOOLCHAIN_FEATURES
|
||||||
$TYPES_LIST
|
$TYPES_LIST
|
||||||
atomics_native
|
|
||||||
dos_paths
|
dos_paths
|
||||||
dxva2_lib
|
dxva2_lib
|
||||||
libc_msvcrt
|
libc_msvcrt
|
||||||
|
|||||||
@ -64,7 +64,6 @@ BUILT_HEADERS = avconfig.h
|
|||||||
|
|
||||||
OBJS = adler32.o \
|
OBJS = adler32.o \
|
||||||
aes.o \
|
aes.o \
|
||||||
atomic.o \
|
|
||||||
audio_fifo.o \
|
audio_fifo.o \
|
||||||
avstring.o \
|
avstring.o \
|
||||||
base64.o \
|
base64.o \
|
||||||
@ -123,13 +122,9 @@ SKIPHEADERS-$(CONFIG_DXVA2) += hwcontext_dxva2.h
|
|||||||
SKIPHEADERS-$(CONFIG_LIBMFX) += hwcontext_qsv.h
|
SKIPHEADERS-$(CONFIG_LIBMFX) += hwcontext_qsv.h
|
||||||
SKIPHEADERS-$(CONFIG_VAAPI) += hwcontext_vaapi.h
|
SKIPHEADERS-$(CONFIG_VAAPI) += hwcontext_vaapi.h
|
||||||
SKIPHEADERS-$(CONFIG_VDPAU) += hwcontext_vdpau.h
|
SKIPHEADERS-$(CONFIG_VDPAU) += hwcontext_vdpau.h
|
||||||
SKIPHEADERS-$(HAVE_ATOMICS_GCC) += atomic_gcc.h
|
|
||||||
SKIPHEADERS-$(HAVE_ATOMICS_SUNCC) += atomic_suncc.h
|
|
||||||
SKIPHEADERS-$(HAVE_ATOMICS_WIN32) += atomic_win32.h
|
|
||||||
|
|
||||||
TESTPROGS = adler32 \
|
TESTPROGS = adler32 \
|
||||||
aes \
|
aes \
|
||||||
atomic \
|
|
||||||
avstring \
|
avstring \
|
||||||
base64 \
|
base64 \
|
||||||
blowfish \
|
blowfish \
|
||||||
|
|||||||
@ -1,109 +0,0 @@
|
|||||||
/*
|
|
||||||
* Copyright (c) 2012 Ronald S. Bultje <rsbultje@gmail.com>
|
|
||||||
*
|
|
||||||
* This file is part of Libav.
|
|
||||||
*
|
|
||||||
* Libav is free software; you can redistribute it and/or
|
|
||||||
* modify it under the terms of the GNU Lesser General Public
|
|
||||||
* License as published by the Free Software Foundation; either
|
|
||||||
* version 2.1 of the License, or (at your option) any later version.
|
|
||||||
*
|
|
||||||
* Libav is distributed in the hope that it will be useful,
|
|
||||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
||||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
|
||||||
* Lesser General Public License for more details.
|
|
||||||
*
|
|
||||||
* You should have received a copy of the GNU Lesser General Public
|
|
||||||
* License along with Libav; if not, write to the Free Software
|
|
||||||
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
|
|
||||||
*/
|
|
||||||
|
|
||||||
#include "config.h"
|
|
||||||
#include "atomic.h"
|
|
||||||
|
|
||||||
#if !HAVE_ATOMICS_NATIVE
|
|
||||||
|
|
||||||
#if HAVE_PTHREADS
|
|
||||||
|
|
||||||
#include <pthread.h>
|
|
||||||
|
|
||||||
static pthread_mutex_t atomic_lock = PTHREAD_MUTEX_INITIALIZER;
|
|
||||||
|
|
||||||
int avpriv_atomic_int_get(volatile int *ptr)
|
|
||||||
{
|
|
||||||
int res;
|
|
||||||
|
|
||||||
pthread_mutex_lock(&atomic_lock);
|
|
||||||
res = *ptr;
|
|
||||||
pthread_mutex_unlock(&atomic_lock);
|
|
||||||
|
|
||||||
return res;
|
|
||||||
}
|
|
||||||
|
|
||||||
void avpriv_atomic_int_set(volatile int *ptr, int val)
|
|
||||||
{
|
|
||||||
pthread_mutex_lock(&atomic_lock);
|
|
||||||
*ptr = val;
|
|
||||||
pthread_mutex_unlock(&atomic_lock);
|
|
||||||
}
|
|
||||||
|
|
||||||
int avpriv_atomic_int_add_and_fetch(volatile int *ptr, int inc)
|
|
||||||
{
|
|
||||||
int res;
|
|
||||||
|
|
||||||
pthread_mutex_lock(&atomic_lock);
|
|
||||||
*ptr += inc;
|
|
||||||
res = *ptr;
|
|
||||||
pthread_mutex_unlock(&atomic_lock);
|
|
||||||
|
|
||||||
return res;
|
|
||||||
}
|
|
||||||
|
|
||||||
void *avpriv_atomic_ptr_cas(void * volatile *ptr, void *oldval, void *newval)
|
|
||||||
{
|
|
||||||
void *ret;
|
|
||||||
pthread_mutex_lock(&atomic_lock);
|
|
||||||
ret = *ptr;
|
|
||||||
if (*ptr == oldval)
|
|
||||||
*ptr = newval;
|
|
||||||
pthread_mutex_unlock(&atomic_lock);
|
|
||||||
return ret;
|
|
||||||
}
|
|
||||||
|
|
||||||
#elif !HAVE_THREADS
|
|
||||||
|
|
||||||
int avpriv_atomic_int_get(volatile int *ptr)
|
|
||||||
{
|
|
||||||
return *ptr;
|
|
||||||
}
|
|
||||||
|
|
||||||
void avpriv_atomic_int_set(volatile int *ptr, int val)
|
|
||||||
{
|
|
||||||
*ptr = val;
|
|
||||||
}
|
|
||||||
|
|
||||||
int avpriv_atomic_int_add_and_fetch(volatile int *ptr, int inc)
|
|
||||||
{
|
|
||||||
*ptr += inc;
|
|
||||||
return *ptr;
|
|
||||||
}
|
|
||||||
|
|
||||||
void *avpriv_atomic_ptr_cas(void * volatile *ptr, void *oldval, void *newval)
|
|
||||||
{
|
|
||||||
if (*ptr == oldval) {
|
|
||||||
*ptr = newval;
|
|
||||||
return oldval;
|
|
||||||
}
|
|
||||||
return *ptr;
|
|
||||||
}
|
|
||||||
|
|
||||||
#else /* HAVE_THREADS */
|
|
||||||
|
|
||||||
/* This should never trigger, unless a new threading implementation
|
|
||||||
* without correct atomics dependencies in configure or a corresponding
|
|
||||||
* atomics implementation is added. */
|
|
||||||
#error "Threading is enabled, but there is no implementation of atomic operations available"
|
|
||||||
|
|
||||||
#endif /* HAVE_PTHREADS */
|
|
||||||
|
|
||||||
#endif /* !HAVE_ATOMICS_NATIVE */
|
|
||||||
@ -1,79 +0,0 @@
|
|||||||
/*
|
|
||||||
* Copyright (c) 2012 Ronald S. Bultje <rsbultje@gmail.com>
|
|
||||||
*
|
|
||||||
* This file is part of Libav.
|
|
||||||
*
|
|
||||||
* Libav is free software; you can redistribute it and/or
|
|
||||||
* modify it under the terms of the GNU Lesser General Public
|
|
||||||
* License as published by the Free Software Foundation; either
|
|
||||||
* version 2.1 of the License, or (at your option) any later version.
|
|
||||||
*
|
|
||||||
* Libav is distributed in the hope that it will be useful,
|
|
||||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
||||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
|
||||||
* Lesser General Public License for more details.
|
|
||||||
*
|
|
||||||
* You should have received a copy of the GNU Lesser General Public
|
|
||||||
* License along with Libav; if not, write to the Free Software
|
|
||||||
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
|
|
||||||
*/
|
|
||||||
|
|
||||||
#ifndef AVUTIL_ATOMIC_H
|
|
||||||
#define AVUTIL_ATOMIC_H
|
|
||||||
|
|
||||||
#include "config.h"
|
|
||||||
|
|
||||||
#if HAVE_ATOMICS_NATIVE
|
|
||||||
|
|
||||||
#if HAVE_ATOMICS_GCC
|
|
||||||
#include "atomic_gcc.h"
|
|
||||||
#elif HAVE_ATOMICS_WIN32
|
|
||||||
#include "atomic_win32.h"
|
|
||||||
#elif HAVE_ATOMICS_SUNCC
|
|
||||||
#include "atomic_suncc.h"
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#else
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Load the current value stored in an atomic integer.
|
|
||||||
*
|
|
||||||
* @param ptr atomic integer
|
|
||||||
* @return the current value of the atomic integer
|
|
||||||
* @note This acts as a memory barrier.
|
|
||||||
*/
|
|
||||||
int avpriv_atomic_int_get(volatile int *ptr);
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Store a new value in an atomic integer.
|
|
||||||
*
|
|
||||||
* @param ptr atomic integer
|
|
||||||
* @param val the value to store in the atomic integer
|
|
||||||
* @note This acts as a memory barrier.
|
|
||||||
*/
|
|
||||||
void avpriv_atomic_int_set(volatile int *ptr, int val);
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Add a value to an atomic integer.
|
|
||||||
*
|
|
||||||
* @param ptr atomic integer
|
|
||||||
* @param inc the value to add to the atomic integer (may be negative)
|
|
||||||
* @return the new value of the atomic integer.
|
|
||||||
* @note This does NOT act as a memory barrier. This is primarily
|
|
||||||
* intended for reference counting.
|
|
||||||
*/
|
|
||||||
int avpriv_atomic_int_add_and_fetch(volatile int *ptr, int inc);
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Atomic pointer compare and swap.
|
|
||||||
*
|
|
||||||
* @param ptr pointer to the pointer 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
|
|
||||||
*/
|
|
||||||
void *avpriv_atomic_ptr_cas(void * volatile *ptr, void *oldval, void *newval);
|
|
||||||
|
|
||||||
#endif /* HAVE_ATOMICS_NATIVE */
|
|
||||||
|
|
||||||
#endif /* AVUTIL_ATOMIC_H */
|
|
||||||
@ -1,61 +0,0 @@
|
|||||||
/*
|
|
||||||
* Copyright (c) 2012 Ronald S. Bultje <rsbultje@gmail.com>
|
|
||||||
*
|
|
||||||
* This file is part of Libav.
|
|
||||||
*
|
|
||||||
* Libav is free software; you can redistribute it and/or
|
|
||||||
* modify it under the terms of the GNU Lesser General Public
|
|
||||||
* License as published by the Free Software Foundation; either
|
|
||||||
* version 2.1 of the License, or (at your option) any later version.
|
|
||||||
*
|
|
||||||
* Libav is distributed in the hope that it will be useful,
|
|
||||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
||||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
|
||||||
* Lesser General Public License for more details.
|
|
||||||
*
|
|
||||||
* You should have received a copy of the GNU Lesser General Public
|
|
||||||
* License along with Libav; if not, write to the Free Software
|
|
||||||
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
|
|
||||||
*/
|
|
||||||
|
|
||||||
#ifndef AVUTIL_ATOMIC_GCC_H
|
|
||||||
#define AVUTIL_ATOMIC_GCC_H
|
|
||||||
|
|
||||||
#include <stdint.h>
|
|
||||||
|
|
||||||
#include "atomic.h"
|
|
||||||
|
|
||||||
#define avpriv_atomic_int_get atomic_int_get_gcc
|
|
||||||
static inline int atomic_int_get_gcc(volatile int *ptr)
|
|
||||||
{
|
|
||||||
__sync_synchronize();
|
|
||||||
return *ptr;
|
|
||||||
}
|
|
||||||
|
|
||||||
#define avpriv_atomic_int_set atomic_int_set_gcc
|
|
||||||
static inline void atomic_int_set_gcc(volatile int *ptr, int val)
|
|
||||||
{
|
|
||||||
*ptr = val;
|
|
||||||
__sync_synchronize();
|
|
||||||
}
|
|
||||||
|
|
||||||
#define avpriv_atomic_int_add_and_fetch atomic_int_add_and_fetch_gcc
|
|
||||||
static inline int atomic_int_add_and_fetch_gcc(volatile int *ptr, int inc)
|
|
||||||
{
|
|
||||||
return __sync_add_and_fetch(ptr, inc);
|
|
||||||
}
|
|
||||||
|
|
||||||
#define avpriv_atomic_ptr_cas atomic_ptr_cas_gcc
|
|
||||||
static inline void *atomic_ptr_cas_gcc(void * volatile *ptr,
|
|
||||||
void *oldval, void *newval)
|
|
||||||
{
|
|
||||||
#ifdef __ARMCC_VERSION
|
|
||||||
// armcc will throw an error if ptr is not an integer type
|
|
||||||
volatile uintptr_t *tmp = (volatile uintptr_t*)ptr;
|
|
||||||
return (void*)__sync_val_compare_and_swap(tmp, oldval, newval);
|
|
||||||
#else
|
|
||||||
return __sync_val_compare_and_swap(ptr, oldval, newval);
|
|
||||||
#endif
|
|
||||||
}
|
|
||||||
|
|
||||||
#endif /* AVUTIL_ATOMIC_GCC_H */
|
|
||||||
@ -1,54 +0,0 @@
|
|||||||
/*
|
|
||||||
* This file is part of Libav.
|
|
||||||
*
|
|
||||||
* Libav is free software; you can redistribute it and/or
|
|
||||||
* modify it under the terms of the GNU Lesser General Public
|
|
||||||
* License as published by the Free Software Foundation; either
|
|
||||||
* version 2.1 of the License, or (at your option) any later version.
|
|
||||||
*
|
|
||||||
* Libav is distributed in the hope that it will be useful,
|
|
||||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
||||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
|
||||||
* Lesser General Public License for more details.
|
|
||||||
*
|
|
||||||
* You should have received a copy of the GNU Lesser General Public
|
|
||||||
* License along with Libav; if not, write to the Free Software
|
|
||||||
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
|
|
||||||
*/
|
|
||||||
|
|
||||||
#ifndef AVUTIL_ATOMIC_SUNCC_H
|
|
||||||
#define AVUTIL_ATOMIC_SUNCC_H
|
|
||||||
|
|
||||||
#include <atomic.h>
|
|
||||||
#include <mbarrier.h>
|
|
||||||
|
|
||||||
#include "atomic.h"
|
|
||||||
|
|
||||||
#define avpriv_atomic_int_get atomic_int_get_suncc
|
|
||||||
static inline int atomic_int_get_suncc(volatile int *ptr)
|
|
||||||
{
|
|
||||||
__machine_rw_barrier();
|
|
||||||
return *ptr;
|
|
||||||
}
|
|
||||||
|
|
||||||
#define avpriv_atomic_int_set atomic_int_set_suncc
|
|
||||||
static inline void atomic_int_set_suncc(volatile int *ptr, int val)
|
|
||||||
{
|
|
||||||
*ptr = val;
|
|
||||||
__machine_rw_barrier();
|
|
||||||
}
|
|
||||||
|
|
||||||
#define avpriv_atomic_int_add_and_fetch atomic_int_add_and_fetch_suncc
|
|
||||||
static inline int atomic_int_add_and_fetch_suncc(volatile int *ptr, int inc)
|
|
||||||
{
|
|
||||||
return atomic_add_int_nv(ptr, inc);
|
|
||||||
}
|
|
||||||
|
|
||||||
#define avpriv_atomic_ptr_cas atomic_ptr_cas_suncc
|
|
||||||
static inline void *atomic_ptr_cas_suncc(void * volatile *ptr,
|
|
||||||
void *oldval, void *newval)
|
|
||||||
{
|
|
||||||
return atomic_cas_ptr(ptr, oldval, newval);
|
|
||||||
}
|
|
||||||
|
|
||||||
#endif /* AVUTIL_ATOMIC_SUNCC_H */
|
|
||||||
@ -1,53 +0,0 @@
|
|||||||
/*
|
|
||||||
* Copyright (c) 2012 Ronald S. Bultje <rsbultje@gmail.com>
|
|
||||||
*
|
|
||||||
* This file is part of Libav.
|
|
||||||
*
|
|
||||||
* Libav is free software; you can redistribute it and/or
|
|
||||||
* modify it under the terms of the GNU Lesser General Public
|
|
||||||
* License as published by the Free Software Foundation; either
|
|
||||||
* version 2.1 of the License, or (at your option) any later version.
|
|
||||||
*
|
|
||||||
* Libav is distributed in the hope that it will be useful,
|
|
||||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
||||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
|
||||||
* Lesser General Public License for more details.
|
|
||||||
*
|
|
||||||
* You should have received a copy of the GNU Lesser General Public
|
|
||||||
* License along with Libav; if not, write to the Free Software
|
|
||||||
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
|
|
||||||
*/
|
|
||||||
|
|
||||||
#ifndef AVUTIL_ATOMIC_WIN32_H
|
|
||||||
#define AVUTIL_ATOMIC_WIN32_H
|
|
||||||
|
|
||||||
#include <windows.h>
|
|
||||||
|
|
||||||
#define avpriv_atomic_int_get atomic_int_get_win32
|
|
||||||
static inline int atomic_int_get_win32(volatile int *ptr)
|
|
||||||
{
|
|
||||||
MemoryBarrier();
|
|
||||||
return *ptr;
|
|
||||||
}
|
|
||||||
|
|
||||||
#define avpriv_atomic_int_set atomic_int_set_win32
|
|
||||||
static inline void atomic_int_set_win32(volatile int *ptr, int val)
|
|
||||||
{
|
|
||||||
*ptr = val;
|
|
||||||
MemoryBarrier();
|
|
||||||
}
|
|
||||||
|
|
||||||
#define avpriv_atomic_int_add_and_fetch atomic_int_add_and_fetch_win32
|
|
||||||
static inline int atomic_int_add_and_fetch_win32(volatile int *ptr, int inc)
|
|
||||||
{
|
|
||||||
return inc + InterlockedExchangeAdd(ptr, inc);
|
|
||||||
}
|
|
||||||
|
|
||||||
#define avpriv_atomic_ptr_cas atomic_ptr_cas_win32
|
|
||||||
static inline void *atomic_ptr_cas_win32(void * volatile *ptr,
|
|
||||||
void *oldval, void *newval)
|
|
||||||
{
|
|
||||||
return InterlockedCompareExchangePointer(ptr, newval, oldval);
|
|
||||||
}
|
|
||||||
|
|
||||||
#endif /* AVUTIL_ATOMIC_WIN32_H */
|
|
||||||
@ -1,35 +0,0 @@
|
|||||||
/*
|
|
||||||
* This file is part of Libav.
|
|
||||||
*
|
|
||||||
* Libav is free software; you can redistribute it and/or
|
|
||||||
* modify it under the terms of the GNU Lesser General Public
|
|
||||||
* License as published by the Free Software Foundation; either
|
|
||||||
* version 2.1 of the License, or (at your option) any later version.
|
|
||||||
*
|
|
||||||
* Libav is distributed in the hope that it will be useful,
|
|
||||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
||||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
|
||||||
* Lesser General Public License for more details.
|
|
||||||
*
|
|
||||||
* You should have received a copy of the GNU Lesser General Public
|
|
||||||
* License along with Libav; if not, write to the Free Software
|
|
||||||
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
|
|
||||||
*/
|
|
||||||
|
|
||||||
#include <assert.h>
|
|
||||||
|
|
||||||
#include "libavutil/atomic.h"
|
|
||||||
|
|
||||||
int main(void)
|
|
||||||
{
|
|
||||||
volatile int val = 1;
|
|
||||||
int res;
|
|
||||||
|
|
||||||
res = avpriv_atomic_int_add_and_fetch(&val, 1);
|
|
||||||
assert(res == 2);
|
|
||||||
avpriv_atomic_int_set(&val, 3);
|
|
||||||
res = avpriv_atomic_int_get(&val);
|
|
||||||
assert(res == 3);
|
|
||||||
|
|
||||||
return 0;
|
|
||||||
}
|
|
||||||
@ -8,11 +8,6 @@ fate-aes: libavutil/tests/aes$(EXESUF)
|
|||||||
fate-aes: CMD = run libavutil/tests/aes
|
fate-aes: CMD = run libavutil/tests/aes
|
||||||
fate-aes: REF = /dev/null
|
fate-aes: REF = /dev/null
|
||||||
|
|
||||||
FATE_LIBAVUTIL += fate-atomic
|
|
||||||
fate-atomic: libavutil/tests/atomic$(EXESUF)
|
|
||||||
fate-atomic: CMD = run libavutil/tests/atomic
|
|
||||||
fate-atomic: REF = /dev/null
|
|
||||||
|
|
||||||
FATE_LIBAVUTIL += fate-avstring
|
FATE_LIBAVUTIL += fate-avstring
|
||||||
fate-avstring: libavutil/tests/avstring$(EXESUF)
|
fate-avstring: libavutil/tests/avstring$(EXESUF)
|
||||||
fate-avstring: CMD = run libavutil/tests/avstring
|
fate-avstring: CMD = run libavutil/tests/avstring
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user