cpu_init.c checks whether the one-time initialization in av_get_cpu_flags() has data races. When running under ThreadSanitizer, this test program demonstrates the current av_get_cpu_flags() code has data races: ./configure --toolchain=clang-tsan make libavutil/tests/cpu_init ./libavutil/tests/cpu_init
This patch merges the following FFmpeg commits: d84a21207ea83055dc9b6dc1cd6a379f2ea756e7 048b46b4e294e8bea4ab381e5e5080a4ca31bf35 Signed-off-by: Wan-Teh Chang <w...@google.com> --- libavutil/Makefile | 1 + libavutil/tests/.gitignore | 1 + libavutil/tests/cpu_init.c | 72 ++++++++++++++++++++++++++++++++++++++++++++++ tests/fate/libavutil.mak | 5 ++++ 4 files changed, 79 insertions(+) create mode 100644 libavutil/tests/cpu_init.c diff --git a/libavutil/Makefile b/libavutil/Makefile index fbcf1a7..413e46a 100644 --- a/libavutil/Makefile +++ b/libavutil/Makefile @@ -129,6 +129,7 @@ TESTPROGS = adler32 \ base64 \ blowfish \ cpu \ + cpu_init \ crc \ des \ eval \ diff --git a/libavutil/tests/.gitignore b/libavutil/tests/.gitignore index c4d1d06..c8f37a7 100644 --- a/libavutil/tests/.gitignore +++ b/libavutil/tests/.gitignore @@ -5,6 +5,7 @@ /base64 /blowfish /cpu +/cpu_init /crc /des /eval diff --git a/libavutil/tests/cpu_init.c b/libavutil/tests/cpu_init.c new file mode 100644 index 0000000..2d98cab --- /dev/null +++ b/libavutil/tests/cpu_init.c @@ -0,0 +1,72 @@ +/* + * 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 + */ + +/* + * This test program tests whether the one-time initialization in + * av_get_cpu_flags() has data races. + */ + +#include <stdio.h> +#include <string.h> + +#include "config.h" + +#include "libavutil/cpu.h" +#include "libavutil/thread.h" + +#if HAVE_THREADS +static void *thread_main(void *arg) +{ + int *flags = arg; + + *flags = av_get_cpu_flags(); + return NULL; +} +#endif + + +int main(void) +{ +#if HAVE_THREADS + int cpu_flags1; + int cpu_flags2; + int ret; + pthread_t thread1; + pthread_t thread2; + + if ((ret = pthread_create(&thread1, NULL, thread_main, &cpu_flags1))) { + fprintf(stderr, "pthread_create failed: %s.\n", strerror(ret)); + return 1; + } + if ((ret = pthread_create(&thread2, NULL, thread_main, &cpu_flags2))) { + fprintf(stderr, "pthread_create failed: %s.\n", strerror(ret)); + return 1; + } + pthread_join(thread1, NULL); + pthread_join(thread2, NULL); + + if (cpu_flags1 < 0) + return 2; + if (cpu_flags2 < 0) + return 2; + if (cpu_flags1 != cpu_flags2) + return 3; +#endif + + return 0; +} diff --git a/tests/fate/libavutil.mak b/tests/fate/libavutil.mak index 2824e08..8ee171c 100644 --- a/tests/fate/libavutil.mak +++ b/tests/fate/libavutil.mak @@ -25,6 +25,11 @@ fate-cpu: libavutil/tests/cpu$(EXESUF) fate-cpu: CMD = run libavutil/tests/cpu $(CPUFLAGS:%=-c%) $(THREADS:%=-t%) fate-cpu: REF = /dev/null +FATE_LIBAVUTIL += fate-cpu_init +fate-cpu_init: libavutil/tests/cpu_init$(EXESUF) +fate-cpu_init: CMD = run libavutil/tests/cpu_init +fate-cpu_init: REF = /dev/null + FATE_LIBAVUTIL += fate-crc fate-crc: libavutil/tests/crc$(EXESUF) fate-crc: CMD = run libavutil/tests/crc -- 2.8.0.rc3.226.g39d4020 _______________________________________________ libav-devel mailing list libav-devel@libav.org https://lists.libav.org/mailman/listinfo/libav-devel