summaryrefslogtreecommitdiff
path: root/libavutil/tests
diff options
context:
space:
mode:
authorWan-Teh Chang <wtc@google.com>2016-12-07 16:16:02 -0800
committerVittorio Giovara <vittorio.giovara@gmail.com>2016-12-08 15:53:58 -0500
commit2170017a1cd033b6f28e16476921022712a522d8 (patch)
treecfcbe102ef4c0fcddd52e2b51b9fca5a850db146 /libavutil/tests
parentd5759701a82926059ae3e2530805e900041a5419 (diff)
avutil: fix data race in av_get_cpu_flags()
Make the one-time initialization in av_get_cpu_flags() thread-safe. The static variables |flags|, |cpuflags_mask|, and |checked| in libavutil/cpu.c are read and written using normal load and store operations. These are considered as data races. The fix is to use atomic load and store operations. Remove the |checked| variable because the invalid value of -1 for |flags| can be used to indicate the same condition. Rename |flags| to |cpu_flags| and move it to file scope. The fix can be verified by running the libavutil/tests/cpu_init.c test program under ThreadSanitizer: ./configure --toolchain=clang-tsan make libavutil/tests/cpu_init libavutil/tests/cpu_init There should be no warnings from ThreadSanitizer. Co-author: Dmitry Vyukov of Google, who suggested the data race fix. Signed-off-by: Wan-Teh Chang <wtc@google.com>
Diffstat (limited to 'libavutil/tests')
-rw-r--r--libavutil/tests/.gitignore1
-rw-r--r--libavutil/tests/cpu_init.c65
2 files changed, 66 insertions, 0 deletions
diff --git a/libavutil/tests/.gitignore b/libavutil/tests/.gitignore
index c4d1d065fb..c8f37a7f90 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 0000000000..beb95c911f
--- /dev/null
+++ b/libavutil/tests/cpu_init.c
@@ -0,0 +1,65 @@
+/*
+ * 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 "libavutil/cpu.h"
+#include "libavutil/thread.h"
+
+static void *thread_main(void *arg)
+{
+ int *flags = arg;
+
+ *flags = av_get_cpu_flags();
+ return NULL;
+}
+
+int main(void)
+{
+ 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;
+
+ return 0;
+}