Mesa (master): egl/display: make platform detection thread-safe

[Eric Engeström]

Module: Mesa
Branch: master
Commit: 311c09165881111c4a596ca7e7b4bce89b059e0f
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=311c09165881111c4a596ca7e7b4bce89b059e0f

Author: Eric Engestrom <eric at engestrom.ch>
Date:   Thu Jun 15 23:53:55 2017 +0100

egl/display: make platform detection thread-safe

Imagine there are 2 threads that both call _eglGetNativePlatform()
simultaneously:
- thread 1 completes the first "if (native_platform ==
  _EGL_INVALID_PLATFORM)" check and is preempted to do something else
- thread 2 executes the whole function, does "native_platform =
  _EGL_NATIVE_PLATFORM" and just before returning it's preempted
- thread 1 wakes up and calls _eglGetNativePlatformFromEnv() which
  returns _EGL_INVALID_PLATFORM because no env vars are set, updates
  native_platform and then gets preempted again
- thread 2 wakes up and returns wrong _EGL_INVALID_PLATFORM

Solve this by doing the detection in a local var and only overwriting
the global one at the end, if no other thread has updated it since.

This means the platform detected in the thread might not be the platform
returned by the function, but this is a different issue that will need
to be discussed when this becomes possible.

Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=101252
Signed-off-by: Eric Engestrom <eric at engestrom.ch>
Reviewed-by: Grazvydas Ignotas <notasas at gmail.com>
Acked-by: Emil Velikov <emil.l.velikov at gmail.com>

---

 src/egl/main/egldisplay.c | 19 ++++++++++++-------
 1 file changed, 12 insertions(+), 7 deletions(-)

diff --git a/src/egl/main/egldisplay.c b/src/egl/main/egldisplay.c
index 53c6e6346d..6eeaa35eb6 100644
--- a/src/egl/main/egldisplay.c
+++ b/src/egl/main/egldisplay.c
@@ -36,6 +36,7 @@
 #include <stdlib.h>
 #include <string.h>
 #include "c11/threads.h"
+#include "util/u_atomic.h"
 
 #include "eglcontext.h"
 #include "eglcurrent.h"
@@ -181,25 +182,29 @@ _EGLPlatformType
 _eglGetNativePlatform(void *nativeDisplay)
 {
    static _EGLPlatformType native_platform = _EGL_INVALID_PLATFORM;
+   _EGLPlatformType detected_platform = native_platform;
 
-   if (native_platform == _EGL_INVALID_PLATFORM) {
+   if (detected_platform == _EGL_INVALID_PLATFORM) {
       const char *detection_method;
 
-      native_platform = _eglGetNativePlatformFromEnv();
+      detected_platform = _eglGetNativePlatformFromEnv();
       detection_method = "environment overwrite";
 
-      if (native_platform == _EGL_INVALID_PLATFORM) {
-         native_platform = _eglNativePlatformDetectNativeDisplay(nativeDisplay);
+      if (detected_platform == _EGL_INVALID_PLATFORM) {
+         detected_platform = _eglNativePlatformDetectNativeDisplay(nativeDisplay);
          detection_method = "autodetected";
       }
 
-      if (native_platform == _EGL_INVALID_PLATFORM) {
-         native_platform = _EGL_NATIVE_PLATFORM;
+      if (detected_platform == _EGL_INVALID_PLATFORM) {
+         detected_platform = _EGL_NATIVE_PLATFORM;
          detection_method = "build-time configuration";
       }
 
       _eglLog(_EGL_DEBUG, "Native platform type: %s (%s)",
-              egl_platforms[native_platform].name, detection_method);
+              egl_platforms[detected_platform].name, detection_method);
+
+      p_atomic_cmpxchg(&native_platform, _EGL_INVALID_PLATFORM,
+                       detected_platform);
    }
 
    return native_platform;