Attachment 2426 Details for Bug 3024 – Patch to use pthreads or TLS for per-thread GLX context, version 01

[patch] Patch to use pthreads or TLS for per-thread GLX context, version 01

libGL_threads-01.patch (text/plain), 5.01 KB, created by Ian Romanick on 2005-04-14 13:58:06 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Ian Romanick

Created: 2005-04-14 13:58:06 UTC

Size: 5.01 KB

patch

obsolete

>Index: src/glx/x11/glxclient.h
>===================================================================
>RCS file: /cvs/mesa/Mesa/src/glx/x11/glxclient.h,v
>retrieving revision 1.5
>diff -u -d -r1.5 glxclient.h
>--- src/glx/x11/glxclient.h	22 Feb 2005 22:36:31 -0000	1.5
>+++ src/glx/x11/glxclient.h	14 Apr 2005 20:37:29 -0000
>@@ -60,8 +60,10 @@
> #include "GL/internal/glcore.h"
> #include "glapitable.h"
> #include "glxextensions.h"
>-#ifdef XTHREADS
>-#include "Xthreads.h"
>+#if defined( XTHREADS )
>+# include "Xthreads.h"
>+#elif defined( PTHREADS )
>+# include <pthread.h>
> #endif
> #ifdef GLX_BUILT_IN_XMESA
> #include "realglx.h"  /* just silences prototype warnings */
>@@ -625,24 +627,44 @@
> extern int __glXDebug;
> 
> /* This is per-thread storage in an MT environment */
>-#if defined(GLX_DIRECT_RENDERING) && defined(XTHREADS)
>-extern __GLXcontext *__glXGetCurrentContext(void);
>+#if defined( XTHREADS ) || defined( PTHREADS )
>+
> extern void __glXSetCurrentContext(__GLXcontext *c);
>+
>+# if defined( GLX_USE_TLS )
>+
>+extern __thread void * __glX_tls_Context
>+    __attribute__((tls_model("initial-exec")));
>+
>+#  define __glXGetCurrentContext()	__glX_tls_Context
>+
>+# else
>+
>+extern __GLXcontext *__glXGetCurrentContext(void);
>+
>+# endif /* defined( GLX_USE_TLS ) */
>+
> #else
>+
> extern __GLXcontext *__glXcurrentContext;
> #define __glXGetCurrentContext()	__glXcurrentContext
> #define __glXSetCurrentContext(gc)	__glXcurrentContext = gc
>-#endif
>+
>+#endif /* defined( XTHREADS ) || defined( PTHREADS ) */
> 
> 
> /*
> ** Global lock for all threads in this address space using the GLX
> ** extension
> */
>-#if defined(GLX_DIRECT_RENDERING) && defined(XTHREADS)
>+#if defined( XTHREADS )
> extern xmutex_rec __glXmutex;
> #define __glXLock()    xmutex_lock(&__glXmutex)
> #define __glXUnlock()  xmutex_unlock(&__glXmutex)
>+#elif defined( PTHREADS )
>+extern pthread_mutex_t __glXmutex;
>+#define __glXLock()    pthread_mutex_lock(&__glXmutex)
>+#define __glXUnlock()  pthread_mutex_unlock(&__glXmutex)
> #else
> #define __glXLock()
> #define __glXUnlock()
>Index: src/glx/x11/glxext.c
>===================================================================
>RCS file: /cvs/mesa/Mesa/src/glx/x11/glxext.c,v
>retrieving revision 1.7
>diff -u -d -r1.7 glxext.c
>--- src/glx/x11/glxext.c	17 Mar 2005 20:13:09 -0000	1.7
>+++ src/glx/x11/glxext.c	14 Apr 2005 20:37:29 -0000
>@@ -52,7 +52,9 @@
> #include "indirect_init.h"
> #include "glapi.h"
> #ifdef XTHREADS
>-#include "Xthreads.h"
>+# include "Xthreads.h"
>+#elif defined(PTHREADS)
>+# include <pthread.h>
> #endif
> #include "glxextensions.h"
> #include "glcontextmodes.h"
>@@ -138,7 +140,7 @@
>  * Current context management and locking
>  */
> 
>-#if defined(GLX_DIRECT_RENDERING) && defined(XTHREADS)
>+#if defined( XTHREADS )
> 
> /* thread safe */
> static GLboolean TSDinitialized = GL_FALSE;
>@@ -174,6 +176,77 @@
> /* Used by the __glXLock() and __glXUnlock() macros */
> xmutex_rec __glXmutex;
> 
>+#elif defined( PTHREADS )
>+
>+pthread_mutex_t __glXmutex = PTHREAD_MUTEX_INITIALIZER;
>+
>+# if defined( GLX_USE_TLS )
>+
>+/**
>+ * Per-thread GLX context pointer.
>+ * 
>+ * \c __glXSetCurrentContext is written is such a way that this pointer can
>+ * \b never be \c NULL.  This is important!  Because of this
>+ * \c __glXGetCurrentContext can be implemented as trivial macro.
>+ */
>+__thread void * __glX_tls_Context __attribute__((tls_model("initial-exec")))
>+    = &dummyContext;
>+
>+void __glXSetCurrentContext( __GLXcontext * c )
>+{
>+    __glX_tls_Context = (c != NULL) ? c : &dummyContext;
>+}
>+
>+# else
>+
>+static pthread_once_t once_control = PTHREAD_ONCE_INIT;
>+
>+/**
>+ * Per-thread data key.
>+ * 
>+ * Once \c init_thread_data has been called, the per-thread data key will
>+ * take a value of \c NULL.  As each new thread is created the default
>+ * value, in that thread, will be \c NULL.
>+ */
>+static pthread_key_t ContextTSD;
>+
>+/**
>+ * Initialize the per-thread data key.
>+ * 
>+ * This function is called \b exactly once per-process (not per-thread!) to
>+ * initialize the per-thread data key.  This is ideally done using the
>+ * \c pthread_once mechanism.
>+ */
>+static void init_thread_data( void )
>+{
>+    if ( pthread_key_create( & ContextTSD, NULL ) != 0 ) {
>+	perror( "pthread_key_create" );
>+	exit( -1 );
>+    }
>+}
>+
>+void __glXSetCurrentContext( __GLXcontext * c )
>+{
>+    pthread_once( & once_control, init_thread_data );
>+    pthread_setspecific( ContextTSD, c );
>+}
>+
>+__GLXcontext * __glXGetCurrentContext( void )
>+{
>+    void * v;
>+
>+    pthread_once( & once_control, init_thread_data );
>+
>+    v = pthread_getspecific( ContextTSD );
>+    return (v == NULL) ? & dummyContext : (__GLXcontext *) v;
>+}
>+
>+# endif /* defined( GLX_USE_TLS ) */
>+
>+#elif defined( THREADS )
>+
>+#error Unknown threading type specified.
>+
> #else
> 
> /* not thread safe */
>@@ -1119,7 +1192,7 @@
>     XEDataObject dataObj;
>     int major, minor;
> 
>-#if defined(GLX_DIRECT_RENDERING) && defined(XTHREADS)
>+#if defined(XTHREADS)
>     {
>         static int firstCall = 1;
>         if (firstCall) {
>@@ -1128,6 +1201,7 @@
>             firstCall = 0;
>         }
>     }
>+#elif defined ( PTHREADS ) && !defined( GLX_USE_TLS )
> #endif
> 
>     INIT_MESA_SPARC

Actions: View | Splinter Review

Attachments on bug 3024: 2426

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.