Browse Source

avutil/cpu: Fix race condition in av_cpu_count()

av_cpu_count() intends to emit a debug message containing the number of
logical cores when called the first time. The check currently works with
a static volatile int; yet this does not help at all in case of
concurrent accesses by multiple threads. So replace this with an
atomic_int.

Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@gmail.com>
master
Andreas Rheinhardt Andreas Rheinhardt 4 years ago
parent
commit
a2a38b1606
1 changed files with 2 additions and 4 deletions
  1. +2
    -4
      libavutil/cpu.c

+ 2
- 4
libavutil/cpu.c View File

@@ -274,7 +274,7 @@ int av_parse_cpu_caps(unsigned *flags, const char *s)


int av_cpu_count(void) int av_cpu_count(void)
{ {
static volatile int printed;
static atomic_int printed = ATOMIC_VAR_INIT(0);


int nb_cpus = 1; int nb_cpus = 1;
#if HAVE_WINRT #if HAVE_WINRT
@@ -306,10 +306,8 @@ int av_cpu_count(void)
nb_cpus = sysinfo.dwNumberOfProcessors; nb_cpus = sysinfo.dwNumberOfProcessors;
#endif #endif


if (!printed) {
if (!atomic_exchange_explicit(&printed, 1, memory_order_relaxed))
av_log(NULL, AV_LOG_DEBUG, "detected %d logical cores\n", nb_cpus); av_log(NULL, AV_LOG_DEBUG, "detected %d logical cores\n", nb_cpus);
printed = 1;
}


return nb_cpus; return nb_cpus;
} }


Loading…
Cancel
Save